This commit was manufactured by cvs2svn to create tag 'AFTER_COMPAQ_PATCH'.

Compaq sent a rather large patch, and here are the contents, adapted
where necessary to the main trunk (0.9.8-dev). This does not include rearrangements and work I've been doing, that'll come in the next bunch of commits to this branch. This set of changes can't be expected to work on any VMS system, there are changes in here that are very specific to Compaq's building system. This set of changes will be surrounded by the tags BEFORE_COMPAQ_PATCH and AFTER_COMPAQ_PATCH.
2002-05-22 11:27:43 +00:00 · 2002-05-22 11:27:42 +00:00 · 2002-05-21 08:59:58 +00:00
711 changed files with 31649 additions and 25370 deletions
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,4 +1,3 @@
-openssl.pc
 Makefile.ssl
 MINFO
 makefile.one
--- a/409
+++ b/409
@@ -2,203 +2,58 @@
 OpenSSL CHANGES
 _______________

- Changes between 0.9.6h and 0.9.7  [31 Dec 2002]
+ Changes between 0.9.7 and 0.9.8  [xx XXX 2002]

-  *) Fix session ID handling in SSLv2 client code: the SERVER FINISHED
-     code (06) was taken as the first octet of the session ID and the last
-     octet was ignored consequently. As a result SSLv2 client side session
-     caching could not have worked due to the session ID mismatch between
-     client and server.
-     Behaviour observed by Crispin Flowerday <crispin@flowerday.cx> as
-     PR #377.
-     [Lutz Jaenicke]
+  *) Change internals of the EC library so that the functions
+          EC_GROUP_set_generator()
+          EC_GROUP_get_generator()
+          EC_GROUP_get_order()
+          EC_GROUP_get_cofactor()
+     are implemented directly in crypto/ec/ec_lib.c and not dispatched
+     to methods, which would lead to unnecessary code duplication when
+     adding different types of curves.
+     [Nils Larsch with input by Bodo Moeller]

-  *) Change the declaration of needed Kerberos libraries to use EX_LIBS
-     instead of the special (and badly supported) LIBKRB5.  LIBKRB5 is
-     removed entirely.
-     [Richard Levitte]
+  *) Implement compute_wNAF (crypto/ec/ec_mult.c) without BIGNUM
+     arithmetic, and such that modified wNAFs are generated
+     (which avoid length expansion in many cases).
+     [Bodo Moeller]

-  *) The hw_ncipher.c engine requires dynamic locks.  Unfortunately, it
-     seems that in spite of existing for more than a year, many application
-     author have done nothing to provide the necessary callbacks, which
-     means that this particular engine will not work properly anywhere.
-     This is a very unfortunate situation which forces us, in the name
-     of usability, to give the hw_ncipher.c a static lock, which is part
-     of libcrypto.
-     NOTE: This is for the 0.9.7 series ONLY.  This hack will never
-     appear in 0.9.8 or later.  We EXPECT application authors to have
-     dealt properly with this when 0.9.8 is released (unless we actually
-     make such changes in the libcrypto locking code that changes will
-     have to be made anyway).
-     [Richard Levitte]
+  *) Add a function EC_GROUP_check_discriminant() (defined via
+     EC_METHOD) that verifies that the curve discriminant is non-zero.

-  *) In asn1_d2i_read_bio() repeatedly call BIO_read() until all content
-     octets have been read, EOF or an error occurs. Without this change
-     some truncated ASN1 structures will not produce an error.
-     [Steve Henson]
+     Add a function EC_GROUP_check() that makes some sanity tests
+     on a EC_GROUP, its generator and order.  This includes
+     EC_GROUP_check_discriminant().
+     [Nils Larsch <nla@trustcenter.de>]

-  *) Disable Heimdal support, since it hasn't been fully implemented.
-     Still give the possibility to force the use of Heimdal, but with
-     warnings and a request that patches get sent to openssl-dev.
-     [Richard Levitte]
+  *) Add ECDSA in new directory crypto/ecdsa/.

-  *) Add the VC-CE target, introduce the WINCE sysname, and add
-     INSTALL.WCE and appropriate conditionals to make it build.
-     [Steven Reddie <smr@essemer.com.au> via Richard Levitte]
+     Add applications 'openssl ecdsaparam' and 'openssl ecdsa'
+     (these are variants of 'openssl dsaparam' and 'openssl dsa').

-  *) Change the DLL names for Cygwin to cygcrypto-x.y.z.dll and
-     cygssl-x.y.z.dll, where x, y and z are the major, minor and
-     edit numbers of the version.
-     [Corinna Vinschen <vinschen@redhat.com> and Richard Levitte]
+     ECDSA support is also included in various other files across the
+     library.  Most notably,
+     - 'openssl req' now has a '-newkey ecdsa:file' option;
+     - EVP_PKCS82PKEY (crypto/evp/evp_pkey.c) now can handle ECDSA;
+     - X509_PUBKEY_get (crypto/asn1/x_pubkey.c) and
+       d2i_PublicKey (crypto/asn1/d2i_pu.c) have been modified to make
+       them suitable for ECDSA where domain parameters must be
+       extracted before the specific public key.
+     [Nils Larsch <nla@trustcenter.de>]

-  *) Introduce safe string copy and catenation functions
-     (BUF_strlcpy() and BUF_strlcat()).
-     [Ben Laurie (CHATS) and Richard Levitte]
-
-  *) Avoid using fixed-size buffers for one-line DNs.
-     [Ben Laurie (CHATS)]
-
-  *) Add BUF_MEM_grow_clean() to avoid information leakage when
-     resizing buffers containing secrets, and use where appropriate.
-     [Ben Laurie (CHATS)]
-
-  *) Avoid using fixed size buffers for configuration file location.
-     [Ben Laurie (CHATS)]
-
-  *) Avoid filename truncation for various CA files.
-     [Ben Laurie (CHATS)]
-
-  *) Use sizeof in preference to magic numbers.
-     [Ben Laurie (CHATS)]
-
-  *) Avoid filename truncation in cert requests.
-     [Ben Laurie (CHATS)]
-
-  *) Add assertions to check for (supposedly impossible) buffer
-     overflows.
-     [Ben Laurie (CHATS)]
-
-  *) Don't cache truncated DNS entries in the local cache (this could
-     potentially lead to a spoofing attack).
-     [Ben Laurie (CHATS)]
-
-  *) Fix various buffers to be large enough for hex/decimal
-     representations in a platform independent manner.
-     [Ben Laurie (CHATS)]
-
-  *) Add CRYPTO_realloc_clean() to avoid information leakage when
-     resizing buffers containing secrets, and use where appropriate.
-     [Ben Laurie (CHATS)]
-
-  *) Add BIO_indent() to avoid much slightly worrying code to do
-     indents.
-     [Ben Laurie (CHATS)]
-
-  *) Convert sprintf()/BIO_puts() to BIO_printf().
-     [Ben Laurie (CHATS)]
-
-  *) buffer_gets() could terminate with the buffer only half
-     full. Fixed.
-     [Ben Laurie (CHATS)]
-
-  *) Add assertions to prevent user-supplied crypto functions from
-     overflowing internal buffers by having large block sizes, etc.
-     [Ben Laurie (CHATS)]
-
-  *) New OPENSSL_assert() macro (similar to assert(), but enabled
-     unconditionally).
-     [Ben Laurie (CHATS)]
-
-  *) Eliminate unused copy of key in RC4.
-     [Ben Laurie (CHATS)]
-
-  *) Eliminate unused and incorrectly sized buffers for IV in pem.h.
-     [Ben Laurie (CHATS)]
-
-  *) Fix off-by-one error in EGD path.
-     [Ben Laurie (CHATS)]
-
-  *) If RANDFILE path is too long, ignore instead of truncating.
-     [Ben Laurie (CHATS)]
-
-  *) Eliminate unused and incorrectly sized X.509 structure
-     CBCParameter.
-     [Ben Laurie (CHATS)]
-
-  *) Eliminate unused and dangerous function knumber().
-     [Ben Laurie (CHATS)]
-
-  *) Eliminate unused and dangerous structure, KSSL_ERR.
-     [Ben Laurie (CHATS)]
-
-  *) Protect against overlong session ID context length in an encoded
-     session object. Since these are local, this does not appear to be
-     exploitable.
-     [Ben Laurie (CHATS)]
-
-  *) Change from security patch (see 0.9.6e below) that did not affect
-     the 0.9.6 release series:
-
-     Remote buffer overflow in SSL3 protocol - an attacker could
-     supply an oversized master key in Kerberos-enabled versions.
-     (CAN-2002-0657)
-     [Ben Laurie (CHATS)]
-
-  *) Change the SSL kerb5 codes to match RFC 2712.
-     [Richard Levitte]
-
-  *) Make -nameopt work fully for req and add -reqopt switch.
-     [Michael Bell <michael.bell@rz.hu-berlin.de>, Steve Henson]
-
-  *) The "block size" for block ciphers in CFB and OFB mode should be 1.
-     [Steve Henson, reported by Yngve Nysaeter Pettersen <yngve@opera.com>]
-
-  *) Make sure tests can be performed even if the corresponding algorithms
-     have been removed entirely.  This was also the last step to make
-     OpenSSL compilable with DJGPP under all reasonable conditions.
-     [Richard Levitte, Doug Kaufman <dkaufman@rahul.net>]
-
-  *) Add cipher selection rules COMPLEMENTOFALL and COMPLEMENTOFDEFAULT
-     to allow version independent disabling of normally unselected ciphers,
-     which may be activated as a side-effect of selecting a single cipher.
-
-     (E.g., cipher list string "RSA" enables ciphersuites that are left
-     out of "ALL" because they do not provide symmetric encryption.
-     "RSA:!COMPLEMEMENTOFALL" avoids these unsafe ciphersuites.)
-     [Lutz Jaenicke, Bodo Moeller]
-
-  *) Add appropriate support for separate platform-dependent build
-     directories.  The recommended way to make a platform-dependent
-     build directory is the following (tested on Linux), maybe with
-     some local tweaks:
-
-	# Place yourself outside of the OpenSSL source tree.  In
-	# this example, the environment variable OPENSSL_SOURCE
-	# is assumed to contain the absolute OpenSSL source directory.
-	mkdir -p objtree/"`uname -s`-`uname -r`-`uname -m`"
-	cd objtree/"`uname -s`-`uname -r`-`uname -m`"
-	(cd $OPENSSL_SOURCE; find . -type f -o -type l) | while read F; do
-		mkdir -p `dirname $F`
-		ln -s $OPENSSL_SOURCE/$F $F
-	done
-
-     To be absolutely sure not to disturb the source tree, a "make clean"
-     is a good thing.  If it isn't successfull, don't worry about it,
-     it probably means the source directory is very clean.
-     [Richard Levitte]
-
-  *) Make sure any ENGINE control commands make local copies of string
-     pointers passed to them whenever necessary. Otherwise it is possible
-     the caller may have overwritten (or deallocated) the original string
-     data when a later ENGINE operation tries to use the stored values.
-     [G<>tz Babin-Ebell <babinebell@trustcenter.de>]
-
-  *) Improve diagnostics in file reading and command-line digests.
-     [Ben Laurie aided and abetted by Solar Designer <solar@openwall.com>]
-
-  *) Add AES modes CFB and OFB to the object database.  Correct an
-     error in AES-CFB decryption.
-     [Richard Levitte]
+  *) Include some named elliptic curves, and add OIDs from X9.62,
+     SECG, and WAP/WTLS.  The curves can be obtained from the new
+     functions
+          EC_GROUP_new_by_nid()
+          EC_GROUP_new_by_name()
+     Also add a 'nid' field to EC_GROUP objects, which can be accessed
+     via
+         EC_GROUP_set_nid()
+         EC_GROUP_get_nid()
+     [Nils Larsch <nla@trustcenter.de, Bodo Moeller]
+ 
+ Changes between 0.9.6d and 0.9.7  [XX xxx 2002]

  *) Remove most calls to EVP_CIPHER_CTX_cleanup() in evp_enc.c, this 
     allows existing EVP_CIPHER_CTX structures to be reused after
@@ -221,8 +76,6 @@
     form for "surname", serialNumber has no short form.
     Use "mail" as the short name for "rfc822Mailbox" according to RFC2798;
     therefore remove "mail" short name for "internet 7".
-     The OID for unique identifiers in X509 certificates is
-     x500UniqueIdentifier, not uniqueIdentifier.
     Some more OID additions. (Michael Bell <michael.bell@rz.hu-berlin.de>)
     [Lutz Jaenicke]

@@ -529,10 +382,6 @@
     By default, clients may request session resumption even during
     renegotiation (if session ID contexts permit); with this option,
     session resumption is possible only in the first handshake.
-
-     SSL_OP_ALL is now 0x00000FFFL instead of 0x000FFFFFL.  This makes
-     more bits available for options that should not be part of
-     SSL_OP_ALL (such as SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION).
     [Bodo Moeller]

  *) Add some demos for certificate and certificate request creation.
@@ -653,8 +502,8 @@
     [Bodo Moeller, Lutz Jaenicke]

  *) Rationalise EVP so it can be extended: don't include a union of
-     cipher/digest structures, add init/cleanup functions for EVP_MD_CTX
-     (similar to those existing for EVP_CIPHER_CTX).
+     cipher/digest structures, add init/cleanup functions. This also reduces
+     the number of header dependencies.
     Usage example:

         EVP_MD_CTX md;
@@ -1238,15 +1087,14 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
     handle the new API. Currently only ECB, CBC modes supported. Add new
     AES OIDs.

-     Add TLS AES ciphersuites as described in RFC3268, "Advanced
-     Encryption Standard (AES) Ciphersuites for Transport Layer
-     Security (TLS)".  (In beta versions of OpenSSL 0.9.7, these were
-     not enabled by default and were not part of the "ALL" ciphersuite
-     alias because they were not yet official; they could be
-     explicitly requested by specifying the "AESdraft" ciphersuite
-     group alias.  In the final release of OpenSSL 0.9.7, the group
-     alias is called "AES" and is part of "ALL".)
-     [Ben Laurie, Steve  Henson, Bodo Moeller]
+     Add TLS AES ciphersuites as described in the "AES Ciphersuites
+     for TLS" draft-ietf-tls-ciphersuite-06.txt. As these are not yet
+     official, they are not enabled by default and are not even part
+     of the "ALL" ciphersuite alias; for now, they must be explicitly
+     requested by specifying the new "AESdraft" ciphersuite alias. If
+     you want the default ciphersuite list plus the new ciphersuites,
+     use "DEFAULT:AESdraft:@STRENGTH".
+     [Ben Laurie, Steve Henson, Bodo Moeller]

  *) New function OCSP_copy_nonce() to copy nonce value (if present) from
     request to response.
@@ -1816,152 +1664,11 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
  *) Clean old EAY MD5 hack from e_os.h.
     [Richard Levitte]

- Changes between 0.9.6g and 0.9.6h  [5 Dec 2002]
-
-  *) New function OPENSSL_cleanse(), which is used to cleanse a section of
-     memory from it's contents.  This is done with a counter that will
-     place alternating values in each byte.  This can be used to solve
-     two issues: 1) the removal of calls to memset() by highly optimizing
-     compilers, and 2) cleansing with other values than 0, since those can
-     be read through on certain media, for example a swap space on disk.
-     [Geoff Thorpe]
-
-  *) Bugfix: client side session caching did not work with external caching,
-     because the session->cipher setting was not restored when reloading
-     from the external cache. This problem was masked, when
-     SSL_OP_NETSCAPE_REUSE_CIPHER_CHANGE_BUG (part of SSL_OP_ALL) was set.
-     (Found by Steve Haslam <steve@araqnid.ddts.net>.)
-     [Lutz Jaenicke]
-
-  *) Fix client_certificate (ssl/s2_clnt.c): The permissible total
-     length of the REQUEST-CERTIFICATE message is 18 .. 34, not 17 .. 33.
-     [Zeev Lieber <zeev-l@yahoo.com>]
-
-  *) Undo an undocumented change introduced in 0.9.6e which caused
-     repeated calls to OpenSSL_add_all_ciphers() and 
-     OpenSSL_add_all_digests() to be ignored, even after calling
-     EVP_cleanup().
-     [Richard Levitte]
-
-  *) Change the default configuration reader to deal with last line not
-     being properly terminated.
-     [Richard Levitte]
-
-  *) Change X509_NAME_cmp() so it applies the special rules on handling
-     DN values that are of type PrintableString, as well as RDNs of type
-     emailAddress where the value has the type ia5String.
-     [stefank@valicert.com via Richard Levitte]
-
-  *) Add a SSL_SESS_CACHE_NO_INTERNAL_STORE flag to take over half
-     the job SSL_SESS_CACHE_NO_INTERNAL_LOOKUP was inconsistently
-     doing, define a new flag (SSL_SESS_CACHE_NO_INTERNAL) to be
-     the bitwise-OR of the two for use by the majority of applications
-     wanting this behaviour, and update the docs. The documented
-     behaviour and actual behaviour were inconsistent and had been
-     changing anyway, so this is more a bug-fix than a behavioural
-     change.
-     [Geoff Thorpe, diagnosed by Nadav Har'El]
-
-  *) Don't impose a 16-byte length minimum on session IDs in ssl/s3_clnt.c
-     (the SSL 3.0 and TLS 1.0 specifications allow any length up to 32 bytes).
-     [Bodo Moeller]
-
-  *) Fix initialization code race conditions in
-        SSLv23_method(),  SSLv23_client_method(),   SSLv23_server_method(),
-        SSLv2_method(),   SSLv2_client_method(),    SSLv2_server_method(),
-        SSLv3_method(),   SSLv3_client_method(),    SSLv3_server_method(),
-        TLSv1_method(),   TLSv1_client_method(),    TLSv1_server_method(),
-        ssl2_get_cipher_by_char(),
-        ssl3_get_cipher_by_char().
-     [Patrick McCormick <patrick@tellme.com>, Bodo Moeller]
-
-  *) Reorder cleanup sequence in SSL_CTX_free(): only remove the ex_data after
-     the cached sessions are flushed, as the remove_cb() might use ex_data
-     contents. Bug found by Sam Varshavchik <mrsam@courier-mta.com>
-     (see [openssl.org #212]).
-     [Geoff Thorpe, Lutz Jaenicke]
-
-  *) Fix typo in OBJ_txt2obj which incorrectly passed the content
-     length, instead of the encoding length to d2i_ASN1_OBJECT.
-     [Steve Henson]
-
- Changes between 0.9.6f and 0.9.6g  [9 Aug 2002]
-
-  *) [In 0.9.6g-engine release:]
-     Fix crypto/engine/vendor_defns/cswift.h for WIN32 (use '_stdcall').
-     [Lynn Gazis <lgazis@rainbow.com>]
-
- Changes between 0.9.6e and 0.9.6f  [8 Aug 2002]
-
-  *) Fix ASN1 checks. Check for overflow by comparing with LONG_MAX
-     and get fix the header length calculation.
-     [Florian Weimer <Weimer@CERT.Uni-Stuttgart.DE>,
-	Alon Kantor <alonk@checkpoint.com> (and others),
-	Steve Henson]
-
-  *) Use proper error handling instead of 'assertions' in buffer
-     overflow checks added in 0.9.6e.  This prevents DoS (the
-     assertions could call abort()).
-     [Arne Ansper <arne@ats.cyber.ee>, Bodo Moeller]
-
- Changes between 0.9.6d and 0.9.6e  [30 Jul 2002]
-
-  *) Add various sanity checks to asn1_get_length() to reject
-     the ASN1 length bytes if they exceed sizeof(long), will appear
-     negative or the content length exceeds the length of the
-     supplied buffer.
-     [Steve Henson, Adi Stav <stav@mercury.co.il>, James Yonan <jim@ntlp.com>]
-
-  *) Fix cipher selection routines: ciphers without encryption had no flags
-     for the cipher strength set and where therefore not handled correctly
-     by the selection routines (PR #130).
-     [Lutz Jaenicke]
+ Changes between 0.9.6d and 0.9.6e  [XX xxx XXXX]

  *) Fix EVP_dsa_sha macro.
     [Nils Larsch]

-  *) New option
-          SSL_OP_DONT_INSERT_EMPTY_FRAGMENTS
-     for disabling the SSL 3.0/TLS 1.0 CBC vulnerability countermeasure
-     that was added in OpenSSL 0.9.6d.
-
-     As the countermeasure turned out to be incompatible with some
-     broken SSL implementations, the new option is part of SSL_OP_ALL.
-     SSL_OP_ALL is usually employed when compatibility with weird SSL
-     implementations is desired (e.g. '-bugs' option to 's_client' and
-     's_server'), so the new option is automatically set in many
-     applications.
-     [Bodo Moeller]
-
-  *) Changes in security patch:
-
-     Changes marked "(CHATS)" were sponsored by the Defense Advanced
-     Research Projects Agency (DARPA) and Air Force Research Laboratory,
-     Air Force Materiel Command, USAF, under agreement number
-     F30602-01-2-0537.
-
-  *) Add various sanity checks to asn1_get_length() to reject
-     the ASN1 length bytes if they exceed sizeof(long), will appear
-     negative or the content length exceeds the length of the
-     supplied buffer. (CAN-2002-0659)
-     [Steve Henson, Adi Stav <stav@mercury.co.il>, James Yonan <jim@ntlp.com>]
-
-  *) Assertions for various potential buffer overflows, not known to
-     happen in practice.
-     [Ben Laurie (CHATS)]
-
-  *) Various temporary buffers to hold ASCII versions of integers were
-     too small for 64 bit platforms. (CAN-2002-0655)
-     [Matthew Byng-Maddick <mbm@aldigital.co.uk> and Ben Laurie (CHATS)>
-
-  *) Remote buffer overflow in SSL3 protocol - an attacker could
-     supply an oversized session ID to a client. (CAN-2002-0656)
-     [Ben Laurie (CHATS)]
-
-  *) Remote buffer overflow in SSL2 protocol - an attacker could
-     supply an oversized client master key. (CAN-2002-0656)
-     [Ben Laurie (CHATS)]
-
 Changes between 0.9.6c and 0.9.6d  [9 May 2002]

  *) Fix crypto/asn1/a_sign.c so that 'parameters' is omitted (not
@@ -2048,13 +1755,13 @@ des-cbc           3624.96k     5258.21k     5530.91k     5624.30k     5628.26k
     value is 0.
     [Richard Levitte]

+  *) Add the configuration target linux-s390x.
+     [Neale Ferguson <Neale.Ferguson@SoftwareAG-USA.com> via Richard Levitte]
+
  *) [In 0.9.6d-engine release:]
     Fix a crashbug and a logic bug in hwcrhk_load_pubkey().
     [Toomas Kiisk <vix@cyber.ee> via Richard Levitte]

-  *) Add the configuration target linux-s390x.
-     [Neale Ferguson <Neale.Ferguson@SoftwareAG-USA.com> via Richard Levitte]
-
  *) The earlier bugfix for the SSL3_ST_SW_HELLO_REQ_C case of
     ssl3_accept (ssl/s3_srvr.c) incorrectly used a local flag
     variable as an indication that a ClientHello message has been
--- a/208
+++ b/208
@@ -120,7 +120,7 @@ my $alpha_asm="::::::::";
 # -DB_ENDIAN slows things down on a sparc for md5, but helps sha1.
 # So the md5_locl.h file has an undef B_ENDIAN if sun is defined

-#config-string	$cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $bn_obj : $des_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib : $arflags
+#config-string	$cc : $cflags : $unistd : $thread_cflag : $sys_id : $lflags : $bn_ops : $bn_obj : $des_obj : $bf_obj : $md5_obj : $sha1_obj : $cast_obj : $rc4_obj : $rmd160_obj : $rc5_obj : $dso_scheme : $shared_target : $shared_cflag : $shared_ldflag : $shared_extension : $ranlib

 my %table=(
 # File 'TABLE' (created by 'make TABLE') contains the data from this list,
@@ -134,7 +134,7 @@ my %table=(

 # Our development configs
 "purify",	"purify gcc:-g -DPURIFY -Wall::(unknown)::-lsocket -lnsl::::",
-"debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror::(unknown)::-lefence::::",
+"debug",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -ggdb -g2 -Wformat -Wshadow -Wmissing-prototypes -Wmissing-declarations -Werror::(unknown)::-lefence::::",
 "debug-ben",	"gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -O2 -pedantic -Wall -Wshadow -Werror -pipe::(unknown)::::asm/bn86-elf.o asm/co86-elf.o",
 "debug-ben-openbsd","gcc:-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::(unknown)::::",
 "debug-ben-openbsd-debug","gcc:-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::(unknown)::::",
@@ -145,10 +145,8 @@ my %table=(
 "debug-ulf",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT:::${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}",
 "debug-steve",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -mcpu=i486 -pedantic -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
 "debug-steve-linux-pseudo64",	"gcc:-DL_ENDIAN -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DDEBUG_SAFESTACK -DCRYPTO_MDEBUG_ALL -DOPENSSL_NO_ASM -g -mcpu=i486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::-rdynamic -ldl:SIXTY_FOUR_BIT::dlfcn",
-"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-elf-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-levitte-linux-noasm-extreme","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -W -Wundef -Wshadow -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wconversion -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-levitte-linux-elf","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wid-clash-31 -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-levitte-linux-noasm","gcc:-DLEVITTE_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DOPENSSL_NO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -DPEDANTIC -ggdb -g3 -mcpu=i486 -pedantic -ansi -Wall -Wshadow -Wid-clash-31 -Wno-long-long -pipe::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "dist",		"cc:-O::(unknown)::::::",

 # Basic configs that should work on any (32 and less bit) box
@@ -161,25 +159,24 @@ my %table=(
 # surrounds it with #APP #NO_APP comment pair which (at least Solaris
 # 7_x86) /usr/ccs/bin/as fails to assemble with "Illegal mnemonic"
 # error message.
-"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-x86-gcc","gcc:-O3 -fomit-frame-pointer -m486 -Wall -DL_ENDIAN -DOPENSSL_NO_INLINE_ASM::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_sol_asm}:dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

 #### Solaris x86 with Sun C setups
 "solaris-x86-cc","cc:-fast -O -Xa::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-KPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

 #### SPARC Solaris with GNU C setups
-"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv7-gcc","gcc:-O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv8-gcc","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # -m32 should be safe to add as long as driver recognizes -mcpu=ultrasparc
-"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-sparcv9-gcc31","gcc:-mcpu=ultrasparc -m64 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv9-gcc","gcc:-m32 -mcpu=ultrasparc -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 # gcc pre-2.8 doesn't understand -mcpu=ultrasparc, so fall down to -mv8
 # but keep the assembler modules.
-"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-fPIC:-m64 -shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris-sparcv9-gcc27","gcc:-mv8 -O3 -fomit-frame-pointer -Wall -DB_ENDIAN -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus-gcc27.o:::asm/md5-sparcv8plus-gcc27.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"solaris64-sparcv9-gcc","gcc:-m64 -mcpu=ultrasparc -O3 -Wall -DB_ENDIAN::-D_REENTRANT:ULTRASPARC:-lsocket -lnsl -ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

 ####
-"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC:-shared:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-solaris-sparcv8-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mv8 -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-solaris-sparcv9-gcc","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -O -g -mcpu=ultrasparc -Wall -DB_ENDIAN::-D_REENTRANT::-lsocket -lnsl -ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::::::::dlfcn:solaris-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

 #### SPARC Solaris with Sun C setups
 # DO NOT use /xO[34] on sparc with SC3.0.  It is broken, and will not pass the tests
@@ -199,16 +196,17 @@ my %table=(
 "linux-sparcv7","gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::",
 # Ray Miller <ray.miller@computing-services.oxford.ac.uk> has patiently
 # assisted with debugging of following two configs.
-"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv8","gcc:-mv8 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8.o::::",
 # it's a real mess with -mcpu=ultrasparc option under Linux, but
 # -Wa,-Av8plus should do the trick no matter what.
-"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC:-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-# GCC 3.1 is a requirement
-"linux64-sparcv9","gcc:-m64 -mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:ULTRASPARC:-ldl:SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-sparcv9","gcc:-mcpu=ultrasparc -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -Wa,-Av8plus -DBN_DIV2W::-D_REENTRANT:ULTRASPARC::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:asm/sparcv8plus.o:::asm/md5-sparcv8plus.o::::::dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+# !!!Folowing can't be even tested yet!!!
+#    We have to wait till 64-bit glibc for SPARC is operational!!!
+#"linux64-sparcv9","sparc64-linux-gcc:-m64 -mcpu=v9 -DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall -DBN_DIV2W::-D_REENTRANT:ULTRASPARC::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::asm/md5-sparcv9.o:",

 # Sunos configs, assuming sparc for the gcc one.
-##"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):SUNOS::DES_UNROLL:::",
-"sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):SUNOS::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:::",
+##"sunos-cc", "cc:-O4 -DNOPROTO -DNOCONST::(unknown):::DES_UNROLL:::",
+"sunos-gcc","gcc:-O3 -mv8 -Dssize_t=int::(unknown):::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL DES_PTR DES_RISC1:::",

 #### IRIX 5.x configs
 # -mips2 flag is added by ./config when appropriate.
@@ -257,9 +255,6 @@ my %table=(
 "hpux-parisc-cc-o4","cc:-Ae +O4 +ESlit -z -DB_ENDIAN -DBN_DIV2W -DMD32_XARRAY::::-ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "hpux-parisc-gcc","gcc:-O3 -DB_ENDIAN -DBN_DIV2W::::-Wl,+s -ldld:BN_LLONG DES_PTR DES_UNROLL DES_RISC1::::::::::dl:hpux-shared:-fPIC::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "hpux64-parisc-cc","cc:-Ae +DD64 +O3 +ESlit -z -DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:+Z::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-# 64bit PARISC for GCC without optimization, which seems to make problems.
-# Submitted by <ross.alexander@uk.neceur.com>
-"hpux64-parisc-gcc","gcc:-DB_ENDIAN -DMD32_XARRAY::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG MD2_CHAR RC4_INDEX RC4_CHAR DES_UNROLL DES_RISC1 DES_INT::::::::::dlfcn:hpux64-shared:-fpic::.sl.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

 # IA-64 targets
 # I have no idea if this one actually works, feedback needed. <appro>
@@ -381,17 +376,16 @@ my %table=(
 "linux-k6",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -mcpu=k6 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-linux-pentium","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentium -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
 "debug-linux-ppro","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -mcpu=pentiumpro -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
-"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"debug-linux-elf","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-lefence -ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:linux-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "debug-linux-elf-noefence","gcc:-DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DL_ENDIAN -DTERMIO -g -m486 -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn",
 "linux-aout",	"gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}",
 "linux-mipsel",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG:::",
 "linux-mips",   "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::(unknown):::BN_LLONG:::",
 "linux-ppc",    "gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_RISC1 DES_UNROLL::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-m68k",   "gcc:-DB_ENDIAN -DTERMIO -O2 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",
-"linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-s390x",	"gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"linux-s390",	"gcc:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::",
+"linux-s390x", "gcc:-DB_ENDIAN -DTERMIO -DNO_ASM -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG:::::::::::linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "linux-ia64",   "gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR:asm/ia64.o:::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"linux-x86_64", "gcc:-m64 -DL_ENDIAN -DTERMIO -O3 -Wall -DMD32_REG_T=int::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC4_CHUNK RC4_CHAR BF_PTR2 DES_INT DES_UNROLL:asm/x86_64-gcc.o:::::::::dlfcn:linux-shared:-fPIC:-m64:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "NetBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -mv8 -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "NetBSD-m68",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):::BN_LLONG MD2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "NetBSD-x86",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer -m486 -Wall::(unknown):::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -415,13 +409,13 @@ my %table=(
 "linux-elf-arm","gcc:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT:::BN_LLONG::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

 # UnixWare 2.0x fails destest with -O
-"unixware-2.0","cc:-DFILIO_H -DNO_STRINGS_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
-"unixware-2.0-pentium","cc:-DFILIO_H -DNO_STRINGS_H -Kpentium::-Kthread::-lsocket -lnsl -lresolv -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
+"unixware-2.0","cc:-DFILIO_H::-Kthread::-lsocket -lnsl -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
+"unixware-2.0-pentium","cc:-DFILIO_H -Kpentium::-Kthread::-lsocket -lnsl -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",

 # UnixWare 2.1
-"unixware-2.1","cc:-O -DFILIO_H::-Kthread::-lsocket -lnsl -lresolv -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
-"unixware-2.1-pentium","cc:-O -DFILIO_H -Kpentium::-Kthread::-lsocket -lnsl -lresolv -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
-"unixware-2.1-p6","cc:-O -DFILIO_H -Kp6::-Kthread::-lsocket -lnsl -lresolv -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
+"unixware-2.1","cc:-O -DFILIO_H::-Kthread::-lsocket -lnsl -lx:${x86_gcc_des} ${x86_gcc_opts}:::",
+"unixware-2.1-pentium","cc:-O -DFILIO_H -Kpentium::-Kthread::-lsocket -lnsl -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",
+"unixware-2.1-p6","cc:-O -DFILIO_H -Kp6::-Kthread::-lsocket -lnsl -lx:MD2_CHAR RC4_INDEX ${x86_gcc_des}::",

 # UnixWare 7
 "unixware-7","cc:-O -DFILIO_H -Kalloca::-Kthread::-lsocket -lnsl:BN_LLONG MD2_CHAR RC4_INDEX ${x86_gcc_des}::::::::::dlfcn:svr5-shared:-Kpic::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
@@ -439,8 +433,7 @@ my %table=(
 "aix-cc",   "cc:-O -DB_ENDIAN -qmaxmem=16384::(unknown):AIX::BN_LLONG RC4_CHAR:::",
 "aix-gcc",  "gcc:-O3 -DB_ENDIAN::(unknown):AIX::BN_LLONG RC4_CHAR:::",
 "aix43-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384::(unknown):::BN_LLONG RC4_CHAR::::::::::dlfcn:",
-"aix43-gcc",  "gcc:-O1 -DAIX -DB_ENDIAN::(unknown):::BN_LLONG RC4_CHAR::::::::::dlfcn:",
-"aix64-cc",   "cc:-O -DAIX -DB_ENDIAN -qmaxmem=16384 -q64::(unknown):::SIXTY_FOUR_BIT_LONG RC4_CHAR::::::::::dlfcn::::::-X 64",
+"aix43-gcc",  "gcc:-O3 -DAIX -DB_ENDIAN::(unknown):::BN_LLONG RC4_CHAR::::::::::dlfcn:",

 #
 # Cray T90 and similar (SDSC)
@@ -480,11 +473,11 @@ my %table=(
 # SCO cc.
 "sco5-cc",  "cc:-belf::(unknown)::-lsocket -lresolv -lnsl:${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-Kpic", # des options?
 "sco5-cc-pentium",  "cc:-Kpentium::(unknown)::-lsocket:${x86_gcc_des} ${x86_gcc_opts}:::", # des options?
-"sco5-gcc",  "gcc:-O3 -fomit-frame-pointer::(unknown)::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::dlfcn:svr3-shared:-fPIC",
+"sco5-gcc",  "gcc:-O3 -fomit-frame-pointer::(unknown)::-lsocket -lresolv -lnsl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_elf_asm}:dlfcn:svr3-shared:-fPIC", # the SCO assembler doesn't seem to like our assembler files ...

 # Sinix/ReliantUNIX RM400
 # NOTE: The CDS++ Compiler up to V2.0Bsomething has the IRIX_CC_BUG optimizer problem. Better use -g  */
-"ReliantUNIX","cc:-KPIC -g -DTERMIOS -DB_ENDIAN::-Kthread:SNI:-lsocket -lnsl -lc -L/usr/ucblib -lucb:BN_LLONG DES_PTR DES_RISC2 DES_UNROLL BF_PTR::::::::::dlfcn:reliantunix-shared:::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"ReliantUNIX","cc:-KPIC -g -DTERMIOS -DB_ENDIAN::-Kthread:SNI:-lsocket -lnsl -lc -L/usr/ucblib -lucb:BN_LLONG DES_PTR DES_RISC2 DES_UNROLL BF_PTR::::::::::dlfcn:reliantunix-shared::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "SINIX","cc:-O::(unknown):SNI:-lsocket -lnsl -lc -L/usr/ucblib -lucb:RC4_INDEX RC4_CHAR:::",
 "SINIX-N","/usr/ucb/cc:-O2 -misaligned::(unknown)::-lucb:RC4_INDEX RC4_CHAR:::",

@@ -500,7 +493,6 @@ my %table=(
 # Windows NT, Microsoft Visual C++ 4.0

 "VC-NT","cl::::WINNT::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}::::::::::win32",
-"VC-CE","cl::::WINCE::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}::::::::::win32",
 "VC-WIN32","cl::::WIN32::BN_LLONG RC4_INDEX EXPORT_VAR_AS_FN ${x86_gcc_opts}::::::::::win32",
 "VC-WIN16","cl:::(unknown):WIN16::MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX THIRTY_TWO_BIT:::",
 "VC-W31-16","cl:::(unknown):WIN16::BN_LLONG MD2_CHAR DES_UNROLL DES_PTR RC4_INDEX SIXTEEN_BIT:::",
@@ -516,18 +508,12 @@ my %table=(
 # and its library files in util/pl/*)
 "Mingw32", "gcc:-DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",

-# UWIN 
-"UWIN", "cc:-DTERMIOS -DL_ENDIAN -O -Wall:::UWIN::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
-
 # Cygwin
 "Cygwin-pre1.3", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall::(unknown):CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32",
-"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -march=i486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:${x86_out_asm}:win32:cygwin-shared:::.dll",
-
-# DJGPP
-"DJGPP", "gcc:-I/dev/env/WATT_ROOT/inc -DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O2 -Wall:::MSDOS:-L/dev/env/WATT_ROOT/lib -lwatt:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::",
+"Cygwin", "gcc:-DTERMIOS -DL_ENDIAN -fomit-frame-pointer -O3 -m486 -Wall:::CYGWIN32::BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}::::::::::win32:cygwin-shared:::.dll",

 # Ultrix from Bernhard Simon <simon@zid.tuwien.ac.at>
-"ultrix-cc","cc:-std1 -O -Olimit 2500 -DL_ENDIAN::(unknown):::::::",
+"ultrix-cc","cc:-std1 -O -Olimit 1000 -DL_ENDIAN::(unknown):::::::",
 "ultrix-gcc","gcc:-O3 -DL_ENDIAN::(unknown):::::::",
 # K&R C is no longer supported; you need gcc on old Ultrix installations
 ##"ultrix","cc:-O2 -DNOPROTO -DNOCONST -DL_ENDIAN::(unknown):::::::",
@@ -543,15 +529,12 @@ my %table=(
 "OpenBSD-sparc",	"gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "OpenBSD-sparc64",	"gcc:-DB_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::(unknown):::SIXTY_FOUR_BIT_LONG DES_INT DES_PTR DES_RISC2 BF_PTR::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
 "OpenBSD-vax",		"gcc:-DL_ENDIAN -DTERMIOS -O3 -fomit-frame-pointer::(unknown):::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-"OpenBSD-hppa",		"gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+"OpenBSD-hppa",		"gcc:-DTERMIOS -O3 -fomit-frame-pointer::(unknown):::BN_LLONG RC2_CHAR RC4_INDEX DES_UNROLL::::::::::dlfcn:bsd-gcc-shared:-fPIC:.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",

 ##### MacOS X (a.k.a. Rhapsody or Darwin) setup
-"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX_RHAPSODY::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
-"darwin-ppc-cc","cc:-O3 -fomit-frame-pointer -fno-common -DB_ENDIAN::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-"darwin-i386-cc","cc:-O3 -fomit-frame-pointer -fno-common -DB_ENDIAN::-D_REENTRANT:MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC::.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
-
-##### A/UX
-"aux3-gcc","gcc:-O2 -DTERMIO::(unknown):AUX:-lbsd:RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
+"rhapsody-ppc-cc","cc:-O3 -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::",
+"darwin-ppc-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR:::::::::::darwin-shared:-fPIC:.\$(SHLIB_MAJOR).\$(SHLIB_MINOR).dylib",
+"darwin-i386-cc","cc:-O3 -nostdinc -I/System/Library/Frameworks/System.framework/Headers -I/System/Library/Frameworks/System.frameworks/Headers/bsd -I/usr/include -fomit-frame-pointer -Wall -DB_ENDIAN::(unknown):MACOSX::BN_LLONG RC4_CHAR RC4_CHUNK DES_UNROLL BF_PTR::::::::::::-fPIC",

 ##### Sony NEWS-OS 4.x
 "newsos4-gcc","gcc:-O -DB_ENDIAN::(unknown):NEWS4:-lmld -liberty:BN_LLONG RC4_CHAR RC4_CHUNK DES_PTR DES_RISC1 DES_UNROLL BF_PTR::::",
@@ -564,16 +547,11 @@ my %table=(

 ##### VxWorks for various targets
 "vxworks-ppc405","ccppc:-g -msoft-float -mlongcall -DCPU=PPC405 -I\$(WIND_BASE)/target/h:::VXWORKS:-r:::::",
-"vxworks-ppc750","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h \$(DEBUG_FLAG):::VXWORKS:-r:::::",
-"vxworks-ppc750-debug","ccppc:-ansi -nostdinc -DPPC750 -D_REENTRANT -fvolatile -fno-builtin -fno-for-scope -fsigned-char -Wall -msoft-float -mlongcall -DCPU=PPC604 -I\$(WIND_BASE)/target/h -DBN_DEBUG -DREF_CHECK -DCONF_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DPEDANTIC -DDEBUG_SAFESTACK -DDEBUG -g:::VXWORKS:-r:::::",
-
-##### Compaq Non-Stop Kernel (Tandem)
-"tandem-c89","c89:-Ww -D__TANDEM -D_XOPEN_SOURCE -D_XOPEN_SOURCE_EXTENDED=1 -D_TANDEM_SOURCE -DB_ENDIAN::(unknown):::THIRTY_TWO_BIT:::",

 );

-my @WinTargets=qw(VC-NT VC-CE VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS
-	BC-32 BC-16 Mingw32 OS2-EMX);
+my @WinTargets=qw(VC-NT VC-WIN32 VC-WIN16 VC-W31-16 VC-W31-32 VC-MSDOS BC-32
+	BC-16 Mingw32 OS2-EMX);

 my $idx = 0;
 my $idx_cc = $idx++;
@@ -598,7 +576,6 @@ my $idx_shared_cflag = $idx++;
 my $idx_shared_ldflag = $idx++;
 my $idx_shared_extension = $idx++;
 my $idx_ranlib = $idx++;
-my $idx_arflags = $idx++;

 my $prefix="";
 my $openssldir="";
@@ -659,7 +636,6 @@ my $libs;
 my $target;
 my $options;
 my $symlink;
-my $make_depend=0;
 my %withargs=();

 my @argvcopy=@ARGV;
@@ -718,7 +694,7 @@ PROCESS_ARGS:
 			{ $threads=1; }
 		elsif (/^no-shared$/)
 			{ $no_shared=1; }
-		elsif (/^shared$/ || /^-shared$/ || /^--shared$/)
+		elsif (/^shared$/)
 			{ $no_shared=0; }
 		elsif (/^no-zlib$/)
 			{ $zlib=0; }
@@ -746,7 +722,6 @@ PROCESS_ARGS:
 			$openssl_algorithm_defines .= "#define OPENSSL_NO_$algo\n";
 			if ($algo eq "RIJNDAEL")
 				{
-				push @skip, "aes";
 				$flags .= "-DOPENSSL_NO_AES ";
 				$depflags .= "-DOPENSSL_NO_AES ";
 				$openssl_algorithm_defines .= "#define OPENSSL_NO_AES\n";
@@ -759,6 +734,14 @@ PROCESS_ARGS:
 				$depflags .= "-DOPENSSL_NO_MDC2 ";
 				$openssl_algorithm_defines .= "#define OPENSSL_NO_MDC2\n";
 				}
+			if ($algo eq "EC" || $algo eq "SHA" || $algo eq "SHA1")
+				{
+				push @skip, "ecdsa";
+				$options .= " no-ecdsa";
+				$flags .= "-DOPENSSL_NO_ECDSA ";
+				$depflags .= "-DOPENSSL_NO_ECDSA ";
+				$openssl_algorithm_defines .= "#define OPENSSL_NO_ECDSA\n";
+				}
 			if ($algo eq "MD5")
 				{
 				$no_md5 = 1;
@@ -918,7 +901,6 @@ print "Configuring for $target\n";
 my $IsWindows=scalar grep /^$target$/,@WinTargets;

 $exe_ext=".exe" if ($target eq "Cygwin");
-$exe_ext=".exe" if ($target eq "DJGPP");
 $openssldir="/usr/local/ssl" if ($openssldir eq "" and $prefix eq "");
 $prefix=$openssldir if $prefix eq "";

@@ -926,7 +908,7 @@ chop $openssldir if $openssldir =~ /\/$/;
 chop $prefix if $prefix =~ /\/$/;

 $openssldir=$prefix . "/ssl" if $openssldir eq "";
-$openssldir=$prefix . "/" . $openssldir if $openssldir !~ /(^\/|^[a-zA-Z]:[\\\/])/;
+$openssldir=$prefix . "/" . $openssldir if $openssldir !~ /^\//;


 print "IsWindows=$IsWindows\n";
@@ -954,7 +936,6 @@ my $shared_cflag = $fields[$idx_shared_cflag];
 my $shared_ldflag = $fields[$idx_shared_ldflag];
 my $shared_extension = $fields[$idx_shared_extension];
 my $ranlib = $fields[$idx_ranlib];
-my $arflags = $fields[$idx_arflags];

 $cflags="$flags$cflags" if ($flags ne "");

@@ -973,17 +954,6 @@ else
 	my ($lresolv, $lpath, $lext);
 	if ($withargs{"krb5-flavor"} =~ /^[Hh]eimdal$/)
 		{
-		die "Sorry, Heimdal is currently not supported\n";
-		}
-	##### HACK to force use of Heimdal.
-	##### WARNING: Since we don't really have adequate support for Heimdal,
-	#####          using this will break the build.  You'll have to make
-	#####          changes to the source, and if you do, please send
-	#####          patches to openssl-dev@openssl.org
-	if ($withargs{"krb5-flavor"} =~ /^force-[Hh]eimdal$/)
-		{
-		warn "Heimdal isn't really supported.  Your build WILL break\n";
-		warn "If you fix the problems, please send a patch to openssl-dev\@openssl.org\n";
 		$withargs{"krb5-dir"} = "/usr/heimdal"
 			if $withargs{"krb5-dir"} eq "";
 		$withargs{"krb5-lib"} = "-L".$withargs{"krb5-dir"}.
@@ -1016,12 +986,10 @@ else
 			}
 		}
 	$withargs{"krb5-lib"} .= " -lresolv"
-		if ("$lresolv" ne "");
+		if ("$lresolv");
 	$withargs{"krb5-include"} = "-I".$withargs{"krb5-dir"}."/include"
 		if $withargs{"krb5-include"} eq "" &&
 		   $withargs{"krb5-dir"} ne "";
-
-	$libs.=$withargs{"krb5-lib"}." " if $withargs{"krb5-lib"} ne "";
 	}

 # The DSO code currently always implements all functions so that no
@@ -1077,7 +1045,7 @@ else
 #		}
 	}	

-$lflags="$libs$lflags" if ($libs ne "");
+$lflags="$libs$lflags"if ($libs ne "");

 if ($no_asm)
 	{
@@ -1085,11 +1053,6 @@ if ($no_asm)
 	$sha1_obj=$md5_obj=$rmd160_obj="";
 	}

-if (!$no_shared)
-	{
-	$cast_obj="";	# CAST assembler is not PIC
-	}
-
 if ($threads)
 	{
 	$cflags=$thread_cflags;
@@ -1100,21 +1063,25 @@ if ($zlib)
 	{
 	$cflags = "-DZLIB $cflags";
 	$cflags = "-DZLIB_SHARED $cflags" if $zlib == 2;
-	$lflags = "$lflags -lz" if $zlib == 1;
+	$lflags = "$lflags -lz" if $zlib == 2;
 	}

 # You will find shlib_mark1 and shlib_mark2 explained in Makefile.org
 my $shared_mark = "";
-if ($shared_target eq "")
-	{
-	$no_shared = 1;
-	}
-if (!$no_shared)
+if ($shared_target ne "")
 	{
 	if ($shared_cflag ne "")
 		{
 		$cflags = "$shared_cflag $cflags";
 		}
+	if (!$no_shared)
+		{
+		#$shared_mark = "\$(SHARED_LIBS)";
+		}
+	}
+else
+	{
+	$no_shared = 1;
 	}

 if ($sys_id ne "")
@@ -1156,10 +1123,6 @@ if ($rmd160_obj =~ /\.o$/)
 	$cflags.=" -DRMD160_ASM";
 	}

-# "Stringify" the C flags string.  This permits it to be made part of a string
-# and works as well on command lines.
-$cflags =~ s/([\\\"])/\\\1/g;
-
 my $version = "unknown";
 my $major = "unknown";
 my $minor = "unknown";
@@ -1191,8 +1154,7 @@ if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/)
 	}

 open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";
-unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";
-open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";
+open(OUT,">$Makefile") || die "unable to create $Makefile:$!\n";
 print OUT "### Generated automatically from Makefile.org by Configure.\n\n";
 my $sdirs=0;
 while (<IN>)
@@ -1237,37 +1199,27 @@ while (<IN>)
 	s/^RMD160_ASM_OBJ=.*$/RMD160_ASM_OBJ= $rmd160_obj/;
 	s/^PROCESSOR=.*/PROCESSOR= $processor/;
 	s/^RANLIB=.*/RANLIB= $ranlib/;
-	s/^ARFLAGS=.*/ARFLAGS= $arflags/;
 	s/^PERL=.*/PERL= $perl/;
 	s/^KRB5_INCLUDES=.*/KRB5_INCLUDES=$withargs{"krb5-include"}/;
+	s/^LIBKRB5=.*/LIBKRB5=$withargs{"krb5-lib"}/;
 	s/^SHLIB_TARGET=.*/SHLIB_TARGET=$shared_target/;
 	s/^SHLIB_MARK=.*/SHLIB_MARK=$shared_mark/;
 	s/^SHARED_LIBS=.*/SHARED_LIBS=\$(SHARED_CRYPTO) \$(SHARED_SSL)/ if (!$no_shared);
 	if ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*$/)
 		{
 		my $sotmp = $1;
-		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/;
-		}
-	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.dylib$/)
-		{
-		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.dylib/;
+		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp/
 		}
 	elsif ($shared_extension ne "" && $shared_extension =~ /^\.s([ol])\.[^\.]*\.[^\.]*$/)
 		{
 		my $sotmp = $1;
 		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.s$sotmp.\$(SHLIB_MAJOR) .s$sotmp/;
 		}
-	elsif ($shared_extension ne "" && $shared_extension =~ /^\.[^\.]*\.[^\.]*\.dylib$/)
-		{
-		s/^SHARED_LIBS_LINK_EXTS=.*/SHARED_LIBS_LINK_EXTS=.\$(SHLIB_MAJOR).dylib .dylib/;
-		}
 	s/^SHARED_LDFLAGS=.*/SHARED_LDFLAGS=$shared_ldflag/;
 	print OUT $_."\n";
 	}
 close(IN);
 close(OUT);
-rename($Makefile,"$Makefile.bak") || die "unable to rename $Makefile\n" if -e $Makefile;
-rename("$Makefile.new",$Makefile) || die "unable to rename $Makefile.new\n";

 print "CC            =$cc\n";
 print "CFLAG         =$cflags\n";
@@ -1283,10 +1235,11 @@ print "SHA1_OBJ_ASM  =$sha1_obj\n";
 print "RMD160_OBJ_ASM=$rmd160_obj\n";
 print "PROCESSOR     =$processor\n";
 print "RANLIB        =$ranlib\n";
-print "ARFLAGS       =$arflags\n";
 print "PERL          =$perl\n";
 print "KRB5_INCLUDES =",$withargs{"krb5-include"},"\n"
 	if $withargs{"krb5-include"} ne "";
+print "LIBKRB5       =",$withargs{"krb5-lib"},"\n"
+	if $withargs{"krb5-lib"} ne "";

 my $des_ptr=0;
 my $des_risc1=0;
@@ -1337,8 +1290,7 @@ foreach (sort split(/\s+/,$bn_ops))
 	}

 open(IN,'<crypto/opensslconf.h.in') || die "unable to read crypto/opensslconf.h.in:$!\n";
-unlink("crypto/opensslconf.h.new") || die "unable to remove old crypto/opensslconf.h.new:$!\n" if -e "crypto/opensslconf.h.new";
-open(OUT,'>crypto/opensslconf.h.new') || die "unable to create crypto/opensslconf.h.new:$!\n";
+open(OUT,'>crypto/opensslconf.h') || die "unable to create crypto/opensslconf.h:$!\n";
 print OUT "/* opensslconf.h */\n";
 print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n";

@@ -1432,8 +1384,6 @@ while (<IN>)
 	}
 close(IN);
 close(OUT);
-rename("crypto/opensslconf.h","crypto/opensslconf.h.bak") || die "unable to rename crypto/opensslconf.h\n" if -e "crypto/opensslconf.h";
-rename("crypto/opensslconf.h.new","crypto/opensslconf.h") || die "unable to rename crypto/opensslconf.h.new\n";


 # Fix the date
@@ -1473,13 +1423,11 @@ if($IsWindows) {
 EOF
 	close(OUT);
 } else {
-	my $make_command = "make -f Makefile.ssl PERL=\'$perl\'";
-	my $make_targets = "";
-	$make_targets .= " links" if $symlink;
-	$make_targets .= " depend" if $depflags ne "" && $make_depend;
-	$make_targets .= " gentests" if $symlink;
-	(system $make_command.$make_targets) == 0 or exit $?
-		if $make_targets ne "";
+	(system "make -f Makefile.ssl PERL=\'$perl\' links") == 0 or exit $?
+		if $symlink;
+	### (system 'make depend') == 0 or exit $? if $depflags ne "";
+	# Run "make depend" manually if you want to be able to delete
+	# the source code files of ciphers you left out.
 	if ( $perl =~ m@^/@) {
 	    &dofile("tools/c_rehash",$perl,'^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";');
 	    &dofile("apps/der_chop",$perl,'^#!/', '#!%s');
@@ -1489,16 +1437,7 @@ EOF
 	    &dofile("tools/c_rehash",'/usr/local/bin/perl','^#!/', '#!%s','^my \$dir;$', 'my $dir = "' . $openssldir . '";');
 	    &dofile("apps/der_chop",'/usr/local/bin/perl','^#!/', '#!%s');
 	    &dofile("apps/CA.pl",'/usr/local/bin/perl','^#!/', '#!%s');
-	}
-	if ($depflags ne "" && !$make_depend) {
-		print <<EOF;
-
-Since you've disabled at least one algorithm, you need to do the following
-before building:
-
-	make depend
-EOF
-	}
+	}	    
 }

 print <<EOF;
@@ -1589,7 +1528,7 @@ sub print_table_entry
 	my $bn_ops,my $bn_obj,my $des_obj,my $bf_obj,
 	my $md5_obj,my $sha1_obj,my $cast_obj,my $rc4_obj,my $rmd160_obj,
 	my $rc5_obj,my $dso_scheme,my $shared_target,my $shared_cflag,
-	my $shared_ldflag,my $shared_extension,my $ranlib,my $arflags)=
+	my $shared_ldflag,my $shared_extension,my $ranlib)=
 	split(/\s*:\s*/,$table{$target} . ":" x 30 , -1);
 			
 	print <<EOF
@@ -1617,7 +1556,6 @@ sub print_table_entry
 \$shared_ldflag = $shared_ldflag
 \$shared_extension = $shared_extension
 \$ranlib       = $ranlib
-\$arflags      = $arflags
 EOF
 	}

--- a/137
+++ b/137
@@ -9,7 +9,6 @@ OpenSSL  -  Frequently Asked Questions
 * 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

@@ -37,15 +36,9 @@ OpenSSL  -  Frequently Asked Questions
 * Why does the linker complain about undefined symbols?
 * Why does the OpenSSL test fail with "bc: command not found"?
 * Why does the OpenSSL test fail with "bc: 1 no implemented"?
-* Why does the OpenSSL test fail with "bc: stack empty"?
 * Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
 * Why does the OpenSSL compilation fail with "ar: command not found"?
 * Why does the OpenSSL compilation fail on Win32 with VC++?
-* What is special about OpenSSL on Redhat?
-* Why does the OpenSSL compilation fail on MacOS X?
-* Why does the OpenSSL test suite fail on MacOS X?
-* Why does the OpenSSL test suite fail in BN_sqr test [on a 64-bit platform]?
-* Why does OpenBSD-i386 build fail on des-586.s with "Unimplemented segment type"?

 [PROG] Questions about programming with OpenSSL

@@ -59,7 +52,6 @@ OpenSSL  -  Frequently Asked Questions
 * 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?

 ===============================================================================

@@ -68,7 +60,7 @@ OpenSSL  -  Frequently Asked Questions
 * Which is the current version of OpenSSL?

 The current version is available from <URL: http://www.openssl.org>.
-OpenSSL 0.9.7 was released on December 31, 2002.
+OpenSSL 0.9.6d was released on May 9, 2002.

 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
@@ -139,19 +131,6 @@ hardware. This was realized in a special release '0.9.6-engine'. With
 version 0.9.7 (not yet released) the changes were merged into the main
 development line, so that the special release is no longer necessary.

-* How do I check the authenticity of the OpenSSL distribution?
-
-We provide MD5 digests and ASC signatures of each tarball.
-Use MD5 to check that a tarball from a mirror site is identical:
-
-   md5sum TARBALL | awk '{print $1;}' | cmp - TARBALL.md5
-
-You can check authenticity using pgp or gpg. You need the OpenSSL team
-member public key used to sign it (download it from a key server). Then
-just do:
-
-   pgp TARBALL.asc
-
 [LEGAL] =======================================================================

 * Do I need patent licenses to use OpenSSL?
@@ -237,13 +216,8 @@ For Solaris 2.6, Tim Nibbe <tnibbe@sprint.net> and others have suggested
 installing the SUNski package from Sun patch 105710-01 (Sparc) which
 adds a /dev/random device and make sure it gets used, usually through
 $RANDFILE.  There are probably similar patches for the other Solaris
-versions.  An official statement from Sun with respect to /dev/random
-support can be found at
-  http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsrdb/27606&zone_32=SUNWski
-However, be warned that /dev/random is usually a blocking device, which
-may have some effects on OpenSSL.
-A third party /dev/random solution for Solaris is available at
-  http://www.cosy.sbg.ac.at/~andi/
+versions.  However, be warned that /dev/random is usually a blocking
+device, which may have some effects on OpenSSL.


 * Why do I get an "unable to write 'random state'" error message?
@@ -421,17 +395,6 @@ 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
@@ -496,92 +459,6 @@ under 'Program Files').  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 upgrade /usr/bin/as.
-For your convenience a pre-compiled replacement binary is provided at
-http://www.openssl.org/~appro/i386-openbsd3-as, which is compiled from
-binutils-2.8 released in 1997.
-
 [PROG] ========================================================================

 * Is OpenSSL thread-safe?
@@ -747,13 +624,5 @@ 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.
-
-
 ===============================================================================

--- a/28
+++ b/28
@@ -2,10 +2,8 @@
 INSTALLATION ON THE UNIX PLATFORM
 ---------------------------------

- [Installation on DOS (with djgpp), Windows, OpenVMS and MacOS (before MacOS X)
-  is described in INSTALL.DJGPP, INSTALL.W32, INSTALL.VMS and INSTALL.MacOS.
-  This document describes installation on operating systems in the Unix
-  family.]
+ [Installation on Windows, OpenVMS and MacOS (before MacOS X) is described
+  in INSTALL.W32, INSTALL.VMS and INSTALL.MacOS.]

 To install OpenSSL, you will need:

@@ -139,11 +137,8 @@
     the failure that aren't problems in OpenSSL itself (like missing
     standard headers).  If it is a problem with OpenSSL itself, please
     report the problem to <openssl-bugs@openssl.org> (note that your
-     message will be recorded in the request tracker publicly readable
-     via http://www.openssl.org/support/rt2.html and will be forwarded to a
-     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.
+     message will be forwarded to a public mailing list).  Include the
+     output of "make report" in your message.

     [If you encounter assembler error messages, try the "no-asm"
     configuration option as an immediate fix.]
@@ -161,8 +156,7 @@
     try removing any compiler optimization flags from the CFLAGS line
     in Makefile.ssl and run "make clean; make". Please send a bug
     report to <openssl-bugs@openssl.org>, including the output of
-     "make report" in order to be added to the request tracker at
-     http://www.openssl.org/support/rt2.html.
+     "make report".

  4. If everything tests ok, install OpenSSL with

@@ -296,15 +290,3 @@
 targets for shared library creation, like linux-shared.  Those targets
 can currently be used on their own just as well, but this is expected
 to change in future versions of OpenSSL.
-
- Note on random number generation
- --------------------------------
-
- Availability of cryptographically secure random numbers is required for
- secret key generation. OpenSSL provides several options to seed the
- internal PRNG. If not properly seeded, the internal PRNG will refuse
- to deliver random bytes and a "PRNG not seeded error" will occur.
- On systems without /dev/urandom (or similar) device, it may be necessary
- to install additional support software to obtain random seed.
- Please check out the manual pages for RAND_add(), RAND_bytes(), RAND_egd(),
- and the FAQ for more information.
--- a/INSTALL.DJGPP
+++ b/INSTALL.DJGPP
@@ -1,34 +0,0 @@
-
- 
- INSTALLATION ON THE DOS PLATFORM WITH DJGPP
- -------------------------------------------
-
- Openssl has been ported to DOS, but only with long filename support. If
- you wish to compile on native DOS with 8+3 filenames, you will have to
- tweak the installation yourself, including renaming files with illegal
- or duplicate names.
-
- You should have a full DJGPP environment installed, including the
- latest versions of DJGPP, GCC, BINUTILS, BASH, etc. This package
- requires that PERL and BC also be installed.
-
- All of these can be obtained from the usual DJGPP mirror sites, such
- as "ftp://ftp.simtel.net/pub/simtelnet/gnu/djgpp". You also need to
- have the WATT-32 networking package installed before you try to compile
- openssl. This can be obtained from "http://www.bgnett.no/~giva/".
- The Makefile assumes that the WATT-32 code is in the directory
- specified by the environment variable WATT_ROOT. If you have watt-32
- in directory "watt32" under your main DJGPP directory, specify
- WATT_ROOT="/dev/env/DJDIR/watt32".
-
- To compile openssl, start your BASH shell. Then configure for DOS by
- running "./Configure" with appropriate arguments. The basic syntax for
- DOS is:
- ./Configure no-threads --prefix=/dev/env/DJDIR DJGPP
- 
- You may run out of DPMI selectors when running in a DOS box under
- Windows. If so, just close the BASH shell, go back to Windows, and
- restart BASH. Then run "make" again.
-
- Building openssl under DJGPP has been tested with DJGPP 2.03,
- GCC 2.952, GCC 2.953, perl 5.005_02 and perl 5.006_01.
--- a/INSTALL.OS2
+++ b/INSTALL.OS2
@@ -20,12 +20,3 @@

 If that finishes successfully you will find the libraries and programs in the
 "out" directory.
-
- Alternatively, you can make a dynamic build that puts the library code into
- crypto.dll and ssl.dll by running
-
- > make -f os2-emx-dll.mak
-
- This will build the above mentioned dlls and a matching pair of import
- libraries in the "out_dll" directory along with the set of test programs
- and the openssl application.
--- a/INSTALL.W32
+++ b/INSTALL.W32
@@ -2,8 +2,6 @@
 INSTALLATION ON THE WIN32 PLATFORM
 ----------------------------------

- [Instructions for building for Windows CE can be found in INSTALL.WCE]
-
 Heres a few comments about building OpenSSL in Windows environments.  Most
 of this is tested on Win32 but it may also work in Win 3.1 with some
 modification.
@@ -84,8 +82,7 @@
 There are various changes you can make to the Win32 compile environment. By
 default the library is not compiled with debugging symbols. If you add 'debug'
 to the mk1mf.pl lines in the do_* batch file then debugging symbols will be
- 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.
+ compiled in.

 The default Win32 environment is to leave out any Windows NT specific
 features.
@@ -97,18 +94,6 @@
 You can also build a static version of the library using the Makefile
 ms\nt.mak

- Borland C++ builder 5
- ---------------------
-
- * Configure for building with Borland Builder:
-   > perl Configure BC-32
-
- * Create the appropriate makefile
-   > ms\do_nasm
-
- * Build
-   > make -f ms\bcb.mak
-
 Borland C++ builder 3 and 4
 ---------------------------

@@ -155,17 +140,17 @@
 GNU C (Cygwin)
 --------------

- Cygwin provides a bash shell and GNU tools environment running
- on NT 4.0, Windows 9x, Windows ME, Windows 2000, and Windows XP.
- Consequently, a make of OpenSSL with Cygwin is closer to a GNU
- bash environment such as Linux than to other W32 makes which are
- based on a single makefile approach. Cygwin implements Posix/Unix
- calls through cygwin1.dll, and is contrasted to Mingw32 which links
- dynamically to msvcrt.dll or crtdll.dll.
+ Cygwin provides a bash shell and GNU tools environment running on
+ NT 4.0, Windows 9x and Windows 2000. Consequently, a make of OpenSSL
+ with Cygwin is closer to a GNU bash environment such as Linux rather
+ than other W32 makes that are based on a single makefile approach.
+ Cygwin implements Posix/Unix calls through cygwin1.dll, and is
+ contrasted to Mingw32 which links dynamically to msvcrt.dll or
+ crtdll.dll.

 To build OpenSSL using Cygwin:

- * Install Cygwin (see http://cygwin.com/)
+ * Install Cygwin (see http://sourceware.cygnus.com/cygwin)

 * Install Perl and ensure it is in the path (recent Cygwin perl 
   (version 5.6.1-2 of the latter has been reported to work) or
@@ -191,9 +176,13 @@
 stripping of carriage returns. To avoid this ensure that a binary
 mount is used, e.g. mount -b c:\somewhere /home.

- "bc" is not provided in older Cygwin distribution.  This causes a
+ As of version 1.1.1 Cygwin is relatively unstable in its handling
+ of cr/lf issues. These make procedures succeeded with versions 1.1 and
+ the snapshot 20000524 (Slow!).
+
+ "bc" is not provided in the Cygwin distribution.  This causes a
 non-fatal error in "make test" but is otherwise harmless.  If
- desired and needed, GNU bc can be built with Cygwin without change.
+ desired, GNU bc can be built with Cygwin without change.


 Installation
--- a/INSTALL.WCE
+++ b/INSTALL.WCE
@@ -1,71 +0,0 @@
- 
- INSTALLATION FOR THE WINDOWS CE PLATFORM
- ----------------------------------------
-
- Building OpenSSL for Windows CE requires the following external tools:
-
-  * Microsoft eMbedded Visual C++ 3.0
-  * wcecompat compatibility library (www.essemer.com.au)
-  * Optionally ceutils for running automated tests (www.essemer.com.au)
-
- You also need Perl for Win32.  You will need ActiveState Perl, available
- from http://www.activestate.com/ActivePerl.
-
- Windows CE support in OpenSSL relies on wcecompat.  All Windows CE specific
- issues should be directed to www.essemer.com.au.
-
- The C Runtime Library implementation for Windows CE that is included with
- Microsoft eMbedded Visual C++ 3.0 is incomplete and in some places
- 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
- and provides low-level IO and stream IO support for stdin/stdout/stderr
- (which Windows CE does not provide).  This IO functionality is not needed
- by the OpenSSL library itself but is used for the tests and openssl.exe.
- More information is available at www.essemer.com.au.
-
- Building
- --------
-
- Setup the eMbedded Visual C++ environment.  There are batch files for doing
- this installed with eVC++.  For an ARM processor, for example, execute:
-
- > "C:\Program Files\Microsoft eMbedded Tools\EVC\WCE300\BIN\WCEARM.BAT"
-
- Next indicate where wcecompat is located:
-
- > set WCECOMPAT=C:\wcecompat
-
- Next you should run Configure:
-
- > perl Configure VC-CE
-
- Next you need to build the Makefiles:
-
- > ms\do_ms
-
- If you get errors about things not having numbers assigned then check the
- troubleshooting section in INSTALL.W32: you probably won't be able to compile
- it as it stands.
-
- 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
-
- 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
- to try the tests then make sure the ceutils are in the path and do:
- 
- > cd out32
- > ..\ms\testce
-
- This will copy each of the test programs to the Windows CE device and execute
- them, displaying the output of the tests on this computer.  The output should
- look similar to the output produced by running the tests for a regular Windows
- build.
-
--- a/MacOS/GetHTTPS.src/MacSocket.cpp
+++ b/MacOS/GetHTTPS.src/MacSocket.cpp
@@ -1287,7 +1287,7 @@ EXITPOINT:

 //	Send some bytes

-int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength)
+int MacSocket_send(const int inSocketNum,void *inBuff,int inBuffLength)
 {
 OSErr			errCode = noErr;
 int				bytesSent = 0;
@@ -1604,4 +1604,4 @@ EPInfo* epi = (EPInfo*) context;
 		}
 	}
 }
-*/
+*/
--- a/MacOS/GetHTTPS.src/MacSocket.h
+++ b/MacOS/GetHTTPS.src/MacSocket.h
@@ -62,7 +62,7 @@ int MacSocket_recv(const int inSocketNum,void *outBuff,int outBuffLength,const B

 //	Call this to send data on a socket

-int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength);
+int MacSocket_send(const int inSocketNum,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
--- a/Makefile.org
+++ b/Makefile.org
@@ -15,11 +15,6 @@ OPTIONS=
 CONFIGURE_ARGS=
 SHLIB_TARGET=

-# HERE indicates where this Makefile lives.  This can be used to indicate
-# where sub-Makefiles are expected to be.  Currently has very limited usage,
-# and should probably not be bothered with at all.
-HERE=.
-
 # INSTALL_PREFIX is for package builders so that they can configure
 # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/.
 # Normally it is left empty.
@@ -64,8 +59,7 @@ DEPFLAG=
 PEX_LIBS= 
 EX_LIBS= 
 EXE_EXT= 
-ARFLAGS=
-AR=ar $(ARFLAGS) r
+AR=ar r
 RANLIB= ranlib
 PERL= perl
 TAR= tar
@@ -159,6 +153,7 @@ RMD160_ASM_OBJ= asm/rm86-out.o

 # KRB5 stuff
 KRB5_INCLUDES=
+LIBKRB5=

 # When we're prepared to use shared libraries in the programs we link here
 # we might set SHLIB_MARK to '$(SHARED_LIBS)'.
@@ -171,7 +166,7 @@ SHLIBDIRS= crypto ssl
 SDIRS=  \
 	md2 md4 md5 sha mdc2 hmac ripemd \
 	des rc2 rc4 rc5 idea bf cast \
-	bn ec rsa dsa dh dso engine aes \
+	bn ec rsa dsa ecdsa dh dso engine aes \
 	buffer bio stack lhash rand err objects \
 	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5

@@ -209,7 +204,7 @@ HEADER=         e_os.h
 # When we're prepared to use shared libraries in the programs we link here
 # we might remove 'clean-shared' from the targets to perform at this stage

-all: Makefile.ssl sub_all openssl.pc
+all: Makefile.ssl sub_all

 sub_all:
 	@for i in $(DIRS); \
@@ -246,7 +241,7 @@ clean-shared:
 		fi; \
 		( set -x; rm -f lib$$i$(SHLIB_EXT) ); \
 		if [ "$(PLATFORM)" = "Cygwin" ]; then \
-			( set -x; rm -f cyg$$i-$(SHLIB_VERSION_NUMBER)$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
+			( set -x; rm -f cyg$$i$(SHLIB_EXT) lib$$i$(SHLIB_EXT).a ); \
 		fi; \
 	done

@@ -256,8 +251,7 @@ link-shared:
 		for i in $(SHLIBDIRS); do \
 			prev=lib$$i$(SHLIB_EXT); \
 			for j in $${tmp:-x}; do \
-				( set -x; \
-				rm -f lib$$i$$j; ln -s $$prev lib$$i$$j ); \
+				( set -x; ln -f -s $$prev lib$$i$$j ); \
 				prev=lib$$i$$j; \
 			done; \
 		done; \
@@ -278,7 +272,12 @@ do_gnu-shared:
 	libs="$$libs -l$$i"; \
 	done

-DETECT_GNU_LD=(${CC} -Wl,-V /dev/null 2>&1 | grep '^GNU ld' )>/dev/null
+DETECT_GNU_LD=${CC} -v 2>&1 | grep '^gcc' >/dev/null 2>&1 && \
+	collect2=`gcc -print-prog-name=collect2 2>&1` && \
+	[ -n "$$collect2" ] && \
+	my_ld=`$$collect2 --help 2>&1 | grep Usage: | sed 's/^Usage: *\([^ ][^ ]*\).*/\1/'` && \
+	[ -n "$$my_ld" ] && \
+	$$my_ld -v 2>&1 | grep 'GNU ld' >/dev/null 2>&1

 # For Darwin AKA Mac OS/X (dyld)
 do_darwin-shared: 
@@ -293,7 +292,7 @@ do_darwin-shared:

 do_cygwin-shared:
 	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-	( set -x; ${CC}  -shared -o cyg$$i-$(SHLIB_VERSION_NUMBER).dll \
+	( set -x; ${CC}  -shared -o cyg$$i.dll \
 		-Wl,-Bsymbolic \
 		-Wl,--whole-archive lib$$i.a \
 		-Wl,--out-implib,lib$$i.dll.a \
@@ -356,13 +355,10 @@ do_solaris-shared:
 	else \
 		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
 		( PATH=/usr/ccs/bin:$$PATH ; export PATH; \
-		  MINUSZ='-z '; \
-		  (${CC} -v 2>&1 | grep gcc) > /dev/null && MINUSZ='-Wl,-z,'; \
-		  set -x; ${CC} ${SHARED_LDFLAGS} -G -dy -z text \
-			-o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+		  set -x; ${CC} ${SHARED_LDFLAGS} \
+			-G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-			$${MINUSZ}allextract lib$$i.a $${MINUSZ}defaultextract \
-			$$libs ${EX_LIBS} -lc ) || exit 1; \
+			-z allextract lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
 		libs="$$libs -l$$i"; \
 		done; \
 	fi
@@ -439,7 +435,6 @@ do_hpux-shared:
 		-o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 		+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 		-Fl lib$$i.a -ldld -lc ) || exit 1; \
-	chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR}; \
 	done

 # This assumes that GNU utilities are *not* used
@@ -458,7 +453,6 @@ do_hpux64-shared:
 		-o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 		+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 		+forceload lib$$i.a -ldl -lc ) || exit 1; \
-	chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR}; \
 	done

 # The following method is said to work on all platforms.  Tests will
@@ -518,19 +512,6 @@ do_reliantunix-shared:
 	libs="$$libs -l$$i"; \
 	done

-openssl.pc: Makefile.ssl
-	@ ( echo 'prefix=$(INSTALLTOP)'; \
-	    echo 'exec_prefix=$${prefix}'; \
-	    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: '; \
-	    echo 'Libs: -L$${libdir} -lssl -lcrypto $(EX_LIBS)'; \
-	    echo 'Cflags: -I$${includedir} $(KRB5_INCLUDES)' ) > openssl.pc
-
 Makefile.ssl: Makefile.org
 	@echo "Makefile.ssl is older than Makefile.org."
 	@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
@@ -549,7 +530,6 @@ clean:
 		rm -f $(LIBS); \
 	fi; \
 	done;
-	rm -f openssl.pc
 	rm -f *.a *.o speed.* *.map *.so .pure core
 	rm -f $(TARFILE)
 	@for i in $(ONEDIRS) ;\
@@ -582,10 +562,6 @@ links:
 	fi; \
 	done;

-gentests:
-	@(cd test && echo "generating dummy tests (if needed)..." && \
-	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on generate );
-
 dclean:
 	rm -f *.bak
 	@for i in $(DIRS) ;\
@@ -600,10 +576,8 @@ rehash: rehash.time
 rehash.time: certs
 	@(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \
 		export OPENSSL OPENSSL_DEBUG_MEMORY; \
-		LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \
-		if [ "$(PLATFORM)" = "DJGPP" ]; then PATH="`pwd`\;$$PATH";  \
-		elif [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
-		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
+		LD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \
+		export LD_LIBRARY_PATH SHLIB_PATH LIBPATH; \
 		$(PERL) tools/c_rehash certs)
 	touch rehash.time

@@ -611,11 +585,9 @@ test:   tests

 tests: rehash
 	@(cd test && echo "testing..." && \
-	$(MAKE) CC='${CC}' PLATFORM='${PLATFORM}' CFLAG='${CFLAG}' SDIRS='$(SDIRS)' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PROCESSOR='${PROCESSOR}' PERL='${PERL}' RANLIB='${RANLIB}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' TESTS='${TESTS}' OPENSSL_DEBUG_MEMORY=on tests );
-	@LD_LIBRARY_PATH="`pwd`"; DYLD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \
-		if [ "$(PLATFORM)" = "DJGPP" ]; then PATH="`pwd`\;$$PATH";  \
-		elif [ "$(PLATFORM)" = "Cygwin" ]; then PATH="`pwd`:$$PATH"; fi; \
-		export LD_LIBRARY_PATH DYLD_LIBRARY_PATH SHLIB_PATH LIBPATH PATH; \
+	$(MAKE) CC='${CC}' CFLAG='${CFLAG}' INSTALLTOP='${INSTALLTOP}' PEX_LIBS='${PEX_LIBS}' EX_LIBS='${EX_LIBS}' BN_ASM='${BN_ASM}' DES_ENC='${DES_ENC}' BF_ENC='${BF_ENC}' CAST_ENC='${CAST_ENC}' RC4_ENC='${RC4_ENC}' RC5_ENC='${RC5_ENC}' SDIRS='${SDIRS}' SHA1_ASM_OBJ='${SHA1_ASM_OBJ}' MD5_ASM_OBJ='${MD5_ASM_OBJ}' RMD160_ASM_OBJ='${RMD160_ASM_OBJ}' AR='${AR}' PERL='${PERL}' TESTS='${TESTS}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' OPENSSL_DEBUG_MEMORY=on tests );
+	@LD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \
+		export LD_LIBRARY_PATH SHLIB_PATH LIBPATH; \
 		apps/openssl version -a

 report:
@@ -626,7 +598,7 @@ depend:
 	do \
 	if [ -d "$$i" ]; then \
 		(cd $$i && echo "making dependencies $$i..." && \
-		$(MAKE) SDIRS='${SDIRS}' CFLAG='${CFLAG}' DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' PERL='${PERL}' depend ) || exit 1; \
+		$(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' depend ) || exit 1; \
 	fi; \
 	done;

@@ -672,22 +644,13 @@ TABLE: Configure

 update: depend errors stacks util/libeay.num util/ssleay.num crypto/objects/obj_dat.h TABLE

-# 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:
-	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
-	find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort > ../$(TARFILE).list; \
-	$(TAR) $(TARFLAGS) --files-from ../$(TARFILE).list -cvf - | \
+	@$(TAR) $(TARFLAGS) -cvf - \
+		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort` |\
 	tardy --user_number=0  --user_name=openssl \
 	      --group_number=0 --group_name=openssl \
 	      --prefix=openssl-$(VERSION) - |\
 	gzip --best >../$(TARFILE).gz; \
-	rm -f ../$(TARFILE).list; \
 	ls -l ../$(TARFILE).gz

 tar-snap:
@@ -702,7 +665,7 @@ dist:
 	$(PERL) Configure dist
 	@$(MAKE) dist_pem_h
 	@$(MAKE) SDIRS='${SDIRS}' clean
-	@$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar
+	@$(MAKE) tar

 dist_pem_h:
 	(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
@@ -710,7 +673,6 @@ dist_pem_h:
 install: all install_docs
 	@$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
 		$(INSTALL_PREFIX)$(INSTALLTOP)/lib \
-		$(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
 		$(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
 		$(INSTALL_PREFIX)$(OPENSSLDIR)/certs \
@@ -732,10 +694,9 @@ install: all install_docs
 	do \
 		if [ -f "$$i" ]; then \
 		(       echo installing $$i; \
-			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
-			mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
+			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
+			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
+			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
 		fi; \
 	done;
 	@if [ -n "$(SHARED_LIBS)" ]; then \
@@ -745,26 +706,21 @@ install: all install_docs
 			if [ -f "$$i" -o -f "$$i.a" ]; then \
 			(       echo installing $$i; \
 				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; \
+					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
+					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
 				else \
-					c=`echo $$i | sed 's/^lib\(.*\)/cyg\1-$(SHLIB_VERSION_NUMBER)/'`; \
-					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.a $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
-					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new; \
-					mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \
+					c=`echo $$i | sed 's/^lib/cyg/'`; \
+					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
+					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c; \
+					cp $$i.a $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \
+					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \
 				fi ); \
 			fi; \
 		done; \
 		(	here="`pwd`"; \
 			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
-			set $(MAKE); \
-			$$1 -f $$here/Makefile link-shared ); \
+			make -f $$here/Makefile link-shared ); \
 	fi
-	cp openssl.pc $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig

 install_docs:
 	@$(PERL) $(TOP)/util/mkdir-p.pl \
@@ -772,43 +728,23 @@ install_docs:
 		$(INSTALL_PREFIX)$(MANDIR)/man3 \
 		$(INSTALL_PREFIX)$(MANDIR)/man5 \
 		$(INSTALL_PREFIX)$(MANDIR)/man7
-	@pod2man="`cd util; ./pod2mantest $(PERL)`"; \
-	here="`pwd`"; \
-	filecase=; \
-	if [ "$(PLATFORM)" = "DJGPP" -o "$(PLATFORM)" = "Cygwin" ]; then \
-		filecase=-i; \
-	fi; \
-	for i in doc/apps/*.pod; do \
+	@for i in doc/apps/*.pod; do \
 		fn=`basename $$i .pod`; \
 		if [ "$$fn" = "config" ]; then sec=5; else sec=1; fi; \
-		echo "installing man$$sec/$$fn.$$sec"; \
-		(cd `$(PERL) util/dirname.pl $$i`; \
-		sh -c "$$pod2man \
-			--section=$$sec --center=OpenSSL \
-			--release=$(VERSION) `basename $$i`") \
-			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \
-		$(PERL) util/extract-names.pl < $$i | \
-			grep -v $$filecase "^$$fn\$$" | \
-			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
-			 while read n; do \
-				$$here/util/point.sh $$fn.$$sec $$n.$$sec; \
-			 done); \
-	done; \
-	for i in doc/crypto/*.pod doc/ssl/*.pod; do \
+		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
+		(cd `dirname $$i`; \
+		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
+			 --release=$(VERSION) `basename $$i`) \
+			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
+	done
+	@for i in doc/crypto/*.pod doc/ssl/*.pod; do \
 		fn=`basename $$i .pod`; \
 		if [ "$$fn" = "des_modes" ]; then sec=7; else sec=3; fi; \
-		echo "installing man$$sec/$$fn.$$sec"; \
-		(cd `$(PERL) util/dirname.pl $$i`; \
-		sh -c "$$pod2man \
-			--section=$$sec --center=OpenSSL \
-			--release=$(VERSION) `basename $$i`") \
-			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/$$fn.$$sec; \
-		$(PERL) util/extract-names.pl < $$i | \
-			grep -v $$filecase "^$$fn\$$" | \
-			(cd $(INSTALL_PREFIX)$(MANDIR)/man$$sec/; \
-			 while read n; do \
-				$$here/util/point.sh $$fn.$$sec $$n.$$sec; \
-			 done); \
+		echo "installing man$$sec/`basename $$i .pod`.$$sec"; \
+		(cd `dirname $$i`; \
+		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
+			--release=$(VERSION) `basename $$i`) \
+			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
 	done

 # DO NOT DELETE THIS LINE -- make depend depends on it.
--- a/48
+++ b/48
@@ -17,21 +17,13 @@
        a separate distribution.
      o New elliptic curve library section.
      o New AES (Rijndael) library section.
-      o Support for new platforms: Windows CE, Tandem OSS, A/UX, AIX 64-bit,
-        Linux x86_64, Linux 64-bit on Sparc v9
-      o Extended support for some platforms: VxWorks
-      o Enhanced support for shared libraries.
-      o Now only builds PIC code when shared library support is requested.
-      o Support for pkg-config.
-      o Lots of new manuals.
-      o Makes symbolic links to or copies of manuals to cover all described
-        functions.
      o Change DES API to clean up the namespace (some applications link also
        against libdes providing similar functions having the same name).
        Provide macros for backward compatibility (will be removed in the
        future).
-      o Unify handling of cryptographic algorithms (software and engine)
-        to be available via EVP routines for asymmetric and symmetric ciphers.
+      o Unifiy handling of cryptographic algorithms (software and
+        engine) to be available via EVP routines for asymmetric and
+        symmetric ciphers.
      o NCONF: new configuration handling routines.
      o Change API to use more 'const' modifiers to improve error checking
        and help optimizers.
@@ -39,44 +31,14 @@
      o Reworked parts of the BIGNUM code.
      o Support for new engines: Broadcom ubsec, Accelerated Encryption
        Processing, IBM 4758.
-      o A few new engines added in the demos area.
-      o Extended and corrected OID (object identifier) table.
      o PRNG: query at more locations for a random device, automatic query for
        EGD style random sources at several locations.
      o SSL/TLS: allow optional cipher choice according to server's preference.
      o SSL/TLS: allow server to explicitly set new session ids.
      o SSL/TLS: support Kerberos cipher suites (RFC2712).
-	Only supports MIT Kerberos for now.
      o SSL/TLS: allow more precise control of renegotiations and sessions.
      o SSL/TLS: add callback to retrieve SSL/TLS messages.
-      o SSL/TLS: support AES cipher suites (RFC3268).
-
-  Major changes between OpenSSL 0.9.6g and OpenSSL 0.9.6h:
-
-      o New configuration targets for Tandem OSS and A/UX.
-      o New OIDs for Microsoft attributes.
-      o Better handling of SSL session caching.
-      o Better comparison of distinguished names.
-      o Better handling of shared libraries in a mixed GNU/non-GNU environment.
-      o Support assembler code with Borland C.
-      o Fixes for length problems.
-      o Fixes for uninitialised variables.
-      o Fixes for memory leaks, some unusual crashes and some race conditions.
-      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:
-
-      o Important building fixes on Unix.
-
-  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:
-
-      o Important security related bugfixes.
-      o Various SSL/TLS library bugfixes.
+      o SSL/TLS: add draft AES ciphersuites (disabled unless explicitly requested).

  Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d:

@@ -129,7 +91,7 @@
      o Bug fixes for Win32, HP/UX and Irix.
      o Bug fixes in BIGNUM, SSL, PKCS#7, PKCS#12, X.509, CONF and
        memory checking routines.
-      o Bug fixes for RSA operations in threaded environments.
+      o Bug fixes for RSA operations in threaded enviroments.
      o Bug fixes in misc. openssl applications.
      o Remove a few potential memory leaks.
      o Add tighter checks of BIGNUM routines.
--- a/72
+++ b/72
@@ -1,72 +0,0 @@
-* System libcrypto.dylib and libssl.dylib are used by system ld on MacOS X.
-
-
-    NOTE: The problem described here only applies when OpenSSL isn't built
-    with shared library support (i.e. without the "shared" configuration
-    option).  If you build with shared library support, you will have no
-    problems as long as you set up DYLD_LIBRARY_PATH properly at all times.
-
-
-This is really a misfeature in ld, which seems to look for .dylib libraries
-along the whole library path before it bothers looking for .a libraries.  This
-means that -L switches won't matter unless OpenSSL is built with shared
-library support.
-
-The workaround may be to change the following lines in apps/Makefile.ssl and
-test/Makefile.ssl:
-
-  LIBCRYPTO=-L.. -lcrypto
-  LIBSSL=-L.. -lssl
-
-to:
-
-  LIBCRYPTO=../libcrypto.a
-  LIBSSL=../libssl.a
-
-It's possible that something similar is needed for shared library support
-as well.  That hasn't been well tested yet.
-
-
-Another solution that many seem to recommend is to move the libraries
-/usr/lib/libcrypto.0.9.dylib, /usr/lib/libssl.0.9.dylib to a different
-directory, build and install OpenSSL and anything that depends on your
-build, then move libcrypto.0.9.dylib and libssl.0.9.dylib back to their
-original places.  Note that the version numbers on those two libraries
-may differ on your machine.
-
-
-As long as Apple doesn't fix the problem with ld, this problem building
-OpenSSL will remain as is.
-
-
-* Parallell make leads to errors
-
-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 parallell make when testing.
-
-
-* Bugs in gcc 3.0 triggered
-
-According to a problem report, there are bugs in gcc 3.0 that are
-triggered by some of the code in OpenSSL, more specifically in
-PEM_get_EVP_CIPHER_INFO().  The triggering code is the following:
-
-	header+=11;
-	if (*header != '4') return(0); header++;
-	if (*header != ',') return(0); header++;
-
-What happens is that gcc might optimize a little too agressively, and
-you end up with an extra incrementation when *header != '4'.
-
-We recommend that you upgrade gcc to as high a 3.x version as you can.
-
-* solaris64-sparcv9-cc SHA-1 performance with WorkShop 6 compiler.
-
-As subject suggests SHA-1 might perform poorly (4 times slower)
-if compiled with WorkShop 6 compiler and -xarch=v9. The cause for
-this seems to be the fact that compiler emits multiplication to
-perform shift operations:-( To work the problem around configure
-with './Configure solaris64-sparcv9-cc -DMD32_REG_T=int'.
--- a/19
+++ b/19
@@ -1,5 +1,5 @@

- OpenSSL 0.9.7 31 Dec 2002
+ OpenSSL 0.9.8-dev XX xxx XXXX

 Copyright (c) 1998-2002 The OpenSSL Project
 Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
@@ -122,13 +122,6 @@
 lists the functions; you will probably have to look at the code to work out
 how to use them. Look at the example programs.

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

@@ -153,13 +146,11 @@
    - Problem Description (steps that will reproduce the problem, if known)
    - Stack Traceback (if the application dumps core)

- Report the bug to the OpenSSL project via the Request Tracker
- (http://www.openssl.org/support/rt2.html) by mail to:
+ Report the bug to the OpenSSL project at:

    openssl-bugs@openssl.org

- Note that mail to openssl-bugs@openssl.org is recorded in the publicly
- readable request tracker database and is forwarded to a public
+ Note that mail to openssl-bugs@openssl.org is forwarded to a public
 mailing list. Confidential mail may be sent to openssl-security@openssl.org
 (PGP key available from the key servers).

@@ -173,9 +164,7 @@
 textual explanation of what your patch does.

 Note: For legal reasons, contributions from the US can be accepted only
- if a TSA notification and a copy of the patch is sent to crypt@bis.doc.gov;
- see 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)).
+ if a copy of the patch is sent to crypt@bxa.doc.gov

 The preferred format for changes is "diff -u" output. You might
 generate it like this:
--- a/README.ENGINE
+++ b/README.ENGINE
@@ -154,7 +154,7 @@
    shared-library that contains the ENGINE implementation, and "NO_VCHECK"
    might possibly be useful if there is a minor version conflict and you
    (or a vendor helpdesk) is convinced you can safely ignore it.
-    "ID" is probably only needed if a shared-library implements
+    "ENGINE_ID" is probably only needed if a shared-library implements
    multiple ENGINEs, but if you know the engine id you expect to be using,
    it doesn't hurt to specify it (and this provides a sanity check if
    nothing else). "LIST_ADD" is only required if you actually wish the
@@ -174,7 +174,7 @@

       ENGINE *e = ENGINE_by_id("dynamic");
       ENGINE_ctrl_cmd_string(e, "SO_PATH", "/lib/libfoo.so", 0);
-       ENGINE_ctrl_cmd_string(e, "ID", "foo", 0);
+       ENGINE_ctrl_cmd_string(e, "ENGINE_ID", "foo", 0);
       ENGINE_ctrl_cmd_string(e, "LOAD", NULL, 0);
       ENGINE_ctrl_cmd_string(e, "CMD_FOO", "some input data", 0);

@@ -184,7 +184,7 @@

       openssl engine dynamic \
                 -pre SO_PATH:/lib/libfoo.so \
-                 -pre ID:foo \
+                 -pre ENGINE_ID:foo \
                 -pre LOAD \
                 -pre "CMD_FOO:some input data"

@@ -192,7 +192,7 @@

       openssl engine -vvvv dynamic \
                 -pre SO_PATH:/lib/libfoo.so \
-                 -pre ID:foo \
+                 -pre ENGINE_ID:foo \
                 -pre LOAD

    Applications that support the ENGINE API and more specifically, the
--- a/28
+++ b/28
@@ -1,15 +1,10 @@

  OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2002/12/30 23:54:11 $
+  ______________                           $Date: 2002/05/16 10:01:53 $

  DEVELOPMENT STATE

-    o  OpenSSL 0.9.8:  Under development...
-    o  OpenSSL 0.9.7:  Released on December  31st, 2002
-    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.7:  Under development...
    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
@@ -27,17 +22,8 @@

  RELEASE SHOWSTOPPERS

-    o [2002-11-21]
-      PR 343 mentions that scrubbing memory with 'memset(ptr, 0, n)' may
-      be optimized away in modern compilers.  This is definitely not good
-      and needs to be fixed immediately.  The formula to use is presented
-      in:
-
-      http://online.securityfocus.com/archive/82/297918/2002-10-27/2002-11-02/0
-
-      The problem report that mentions this is:
-
-      https://www.aet.TU-Cottbus.DE/rt2/Ticket/Display.html?id=343
+    o BN_mod_mul verification fails for mips3-sgi-irix
+      unless configured with no-asm

  AVAILABLE PATCHES

@@ -60,8 +46,9 @@
 	UTIL (a new set of library functions to support some higher level
 	      functionality that is currently missing).
 	Shared library support for VMS.
-	Kerberos 5 authentication (Heimdal)
+	Kerberos 5 authentication
 	Constification
+	OCSP

  NEEDS PATCH

@@ -71,6 +58,9 @@

  OPEN ISSUES

+    o  Do we want the EVP API changes in 0.9.7?
+       Can compatibility be improved?
+
    o  The Makefile hierarchy and build mechanism is still not a round thing:

       1. The config vs. Configure scripts
--- a/681
+++ b/681
--- a/VMS/cert_tool/hostaddr.c
+++ b/VMS/cert_tool/hostaddr.c
@@ -0,0 +1,477 @@
+
+#ifdef VMS
+#pragma module HOSTADDR "X-1"
+
+/*
+**
+** Copyright (c) 2000 Compaq Computer Corporation
+** COMPAQ Registered in U.S. Patent and Trademark Office.
+**
+** Confidential computer software. Valid license from Compaq or
+** authorized sublicensor required for possession, use or copying.
+** Consistent with FAR 12.211 and 12.212, Commercial Computer Software,
+** Computer Software Documentation, and Technical Data for Commercial
+** Items are licensed to the U.S. Government under vendor's standard
+** commercial license.
+**
+*/
+
+/*
+**++
+**
+**  FACILITY:  Apache Web Server
+**
+**  ABSTRACT:
+**
+**	This program determine the hostaddr of the default node or of
+**	a given hostname.
+**
+**	The command line syntax is:
+**
+**	    HOSTADDR [-l log-name] [-s sym-name] [host-name]
+**
+**	where:
+**
+**	    -l log-name	    specifies an optional logical name to receive hostname.
+**
+**	    -c sym-name	    specifies an optional symbol name to receive hostname.
+**
+**	    host-name	    specifies an optional host name to resolve.
+**
+**  AUTHOR:  Matthew Doremus			CREATION DATE:  07-Jul-2000
+**
+**  Modification History:
+**
+**	X-1	Matthew Doremus				07-Jul-2000
+**		Initial development
+**
+**--
+**
+**  Compile/Link instructions:
+**
+**	OpenVMS Alpha/VAX:
+**	    $ CC HOSTADDR+SYS$LIBRARY:SYS$LIB_C/LIBRARY
+**	    $ LINK HOSTADDR
+**
+*/
+
+/*
+** Define __NEW_STARLET if it's not already defined
+*/
+#ifndef __NEW_STARLET
+#define __NEW_STARLET
+#define __NEW_STARLET_SET
+#endif
+
+/*
+** Include the necessary header files
+*/
+#include <lib$routines>
+#include <libclidef>
+#include <descrip>
+#include <stdlib>
+#include <string>
+#include <stdio>
+#include <netdb>
+#include <in>
+
+/*
+** Undefine __NEW_STARLET if we had defined it
+*/
+#ifndef __NEW_STARLET_SET
+#undef  __NEW_STARLET_SET
+#undef  __NEW_STARLET
+#endif
+
+/*
+** Option Data Structure
+*/
+typedef struct _opt_data {
+    char		*log_name;
+    char		*sym_name;
+    char		*host_name; 
+    } OPT_DATA;
+
+/*
+** Local Routine Prototypes
+*/
+static void 
+ParseCmdLine (
+    int,
+    char *[],
+    OPT_DATA *);
+
+static void
+SetLogName (
+    char *,
+    char *);
+
+static void
+SetSymName (
+    char *,
+    char *);
+
+static void 
+Usage ();
+
+/*
+**
+**  main - Main processing routine for the HOSTADDR utility
+**
+**  Functional Description:
+**
+**	This routine controls overall program execution.
+**
+**  Usage:
+**
+**      main argc, argv, envp
+**
+**  Formal parameters:
+**
+**      argc 		- (IN) argument count
+**      argv         	- (IN) address of an argument array 
+**      envp         	- (IN) address of an environment string 
+**
+**  Implicit Parameters:
+**
+**      None
+**
+**  Routine Value:
+**
+**      None
+**
+**  Side Effects:
+**
+**      None
+**
+*/
+int
+main (
+    int		argc,
+    char	*argv[],
+    char	*envp[]
+    )
+{
+struct in_addr *addr_ptr;
+char hostname[512+1];
+struct hostent *hp;
+OPT_DATA OptData;
+char *hostaddr;
+int addr_max,
+    i;
+
+/*
+** Parse the command line
+*/
+ParseCmdLine (argc, argv, &OptData);
+
+/*
+** If no host name was given, then use gethostname otherwise
+** use the host name given.
+*/
+if (! OptData.host_name)
+    {
+    if (gethostname (hostname, sizeof (hostname) - 1))
+        {
+        perror ("gethostname");
+        exit (1);
+        }
+    }
+else
+    strcpy (hostname, OptData.host_name);
+
+/*
+** Get the host address using gethostbyname
+*/
+if (! (hp = gethostbyname (hostname)))
+    {
+    perror ("gethostbyname");
+    exit (1);
+    }
+
+/*
+** Format the host address(es) into a comma separated list
+*/
+addr_max = hp->h_length / sizeof (struct in_addr);
+hostaddr = malloc ((addr_max * (15 + 1)) + 1);
+addr_ptr = (struct in_addr *) hp->h_addr;
+for (i = 0; i < addr_max; i++)
+    {
+    if (i > 0)
+	strcat (hostaddr, ",");
+    addr_ptr = addr_ptr + (i * sizeof (struct in_addr));
+    sprintf (hostaddr + strlen (hostaddr), "%d.%d.%d.%d",
+	addr_ptr->s_net, addr_ptr->s_host, 
+	addr_ptr->s_lh, addr_ptr->s_impno);
+    }
+
+/*
+** Define a logical name if one was provided
+*/
+if (OptData.log_name)
+    SetLogName (OptData.log_name, hostaddr);
+
+/*
+** Define a symbol name if one was provided
+*/
+if (OptData.sym_name)
+    SetSymName (OptData.sym_name, hostaddr);
+
+/*
+** print the host address if no logical or symbol name was provided
+*/
+if (! OptData.log_name && ! OptData.sym_name)
+    printf ("%s\n", hostaddr);
+
+}
+
+/*
+**
+**  ParseCmdLine - Parse the command line options
+**
+**  Functional Description:
+**
+**      This routine parses the command line options.
+**
+**  Usage:
+**
+**      ParseCmdLine argc, argv, OptData
+**
+**  Formal parameters:
+**
+**      argc 		- (IN) argument count
+**      argv         	- (IN) address of an argument array 
+**      OptData		- (OUT) address of command option data structure 
+**			  which will contain the parsed input.
+**
+**  Implicit Parameters:
+**
+**      None
+**
+**  Routine Value:
+**
+**      None
+**
+**  Side Effects:
+**
+**      None
+**
+*/
+static void
+ParseCmdLine (
+    int			argc,
+    char		*argv[],
+    OPT_DATA		*OptData
+    )
+{
+int option,
+    i;
+
+/*
+** Initialize the option data
+*/
+OptData->log_name = NULL;
+OptData->sym_name = NULL;
+OptData->host_name = NULL;
+
+/*
+** Process the command line options
+*/
+while ((option = getopt (argc, argv, "l:s:?")) != EOF) 
+    {
+    switch (option) 
+	{
+	/* 
+	** Output to logical name ?
+	*/
+	case 'l':
+	    OptData->log_name = strdup (optarg);
+	    break;
+
+	/* 
+	** Output to symbol name ?
+	*/
+	case 's':
+	    OptData->sym_name = strdup (optarg);
+	    break;
+
+	/* 
+	** Invalid argument ?
+	*/
+	case '?':
+	default:
+	    Usage ();
+	    exit (1);
+	    break;
+	}
+    }
+
+/*
+** Are the number of parameters correct ?
+*/
+if (argc - optind > 1)
+    {
+    Usage ();
+    exit (1);
+    }
+
+/*
+** Host Name provided ?
+*/
+if (argc - optind == 1)
+    OptData->host_name = strdup (argv[optind]);
+
+}
+
+/*
+**
+**  SetLogName - Set a logical name & value
+**
+**  Functional Description:
+**
+**      This routine sets a logical name & value.
+**
+**  Usage:
+**
+**      SetLogName LogName, LogValue
+**
+**  Formal parameters:
+**
+**      LogName		- (IN) address of the logical name
+**      LogValue       	- (IN) address of the logical value
+**
+**  Implicit Parameters:
+**
+**      None
+**
+**  Routine Value:
+**
+**      None
+**
+**  Side Effects:
+**
+**      None
+**
+*/
+static void
+SetLogName (
+    char 		*LogName,
+    char		*LogValue
+    )
+{
+struct dsc$descriptor_s log_nam_desc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
+struct dsc$descriptor_s log_val_desc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
+int status;
+
+/*
+** Setup the logical name & value descriptors
+*/
+log_nam_desc.dsc$w_length = strlen (LogName);
+log_nam_desc.dsc$a_pointer = LogName;
+log_val_desc.dsc$w_length = strlen (LogValue);
+log_val_desc.dsc$a_pointer = LogValue;
+
+/*
+** Set the logical name & value
+*/
+status = lib$set_logical (&log_nam_desc, &log_val_desc, 0, 0, 0);
+if (! (status & 1))
+    exit (status);
+
+}
+
+/*
+**
+**  SetSymName - Set a symbol name & value
+**
+**  Functional Description:
+**
+**      This routine sets a symbol name & value.
+**
+**  Usage:
+**
+**      SetSymName SymName, SymValue
+**
+**  Formal parameters:
+**
+**      SymName		- (IN) address of the symbol name
+**      SymValue       	- (IN) address of the Symbol value
+**
+**  Implicit Parameters:
+**
+**      None
+**
+**  Routine Value:
+**
+**      None
+**
+**  Side Effects:
+**
+**      None
+**
+*/
+static void
+SetSymName (
+    char 		*SymName,
+    char		*SymValue
+    )
+{
+struct dsc$descriptor_s sym_nam_desc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
+struct dsc$descriptor_s sym_val_desc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
+int status;
+
+/*
+** Setup the symbol name & value descriptors
+*/
+sym_nam_desc.dsc$w_length = strlen (SymName);
+sym_nam_desc.dsc$a_pointer = SymName;
+sym_val_desc.dsc$w_length = strlen (SymValue);
+sym_val_desc.dsc$a_pointer = SymValue;
+
+/*
+** Set the symbol name & value
+*/
+status = lib$set_symbol (&sym_nam_desc, &sym_val_desc, &LIB$K_CLI_LOCAL_SYM);
+if (! (status & 1))
+    exit (status);
+
+}
+
+/*
+**
+**  Usage - Display the acceptable unix style command usage
+**
+**  Functional Description:
+**
+**      This routine displays to standard output the appropriate unix style 
+**	command usage.
+**
+**  Usage:
+**
+**      Usage 
+**
+**  Formal parameters:
+**
+**      None
+**
+**  Implicit Parameters:
+**
+**      None
+**
+**  Routine Value:
+**
+**      None
+**
+**  Side Effects:
+**
+**      None
+**
+*/
+static void
+Usage ()
+{
+
+fprintf (stdout, "Usage: HOSTADDR [-l log-name] [-s sym-name] [host-name]\n");
+
+}
+#endif    /* #ifdef VMS */
--- a/VMS/cert_tool/hostname.c
+++ b/VMS/cert_tool/hostname.c
@@ -0,0 +1,513 @@
+
+#ifdef VMS
+#pragma module HOSTNAME "X-1"
+
+/*
+**
+** Copyright (c) 2000 Compaq Computer Corporation
+** COMPAQ Registered in U.S. Patent and Trademark Office.
+**
+** Confidential computer software. Valid license from Compaq or
+** authorized sublicensor required for possession, use or copying.
+** Consistent with FAR 12.211 and 12.212, Commercial Computer Software,
+** Computer Software Documentation, and Technical Data for Commercial
+** Items are licensed to the U.S. Government under vendor's standard
+** commercial license.
+**
+*/
+
+/*
+**++
+**
+**  FACILITY:  Apache Web Server
+**
+**  ABSTRACT:
+**
+**	This program determine the hostname of the default node or of
+**	a given hostaddr.
+**
+**	The command line syntax is:
+**
+**	    HOSTNAME [-l log-name] [-s sym-name] [host-addr]
+**
+**	where:
+**
+**	    -l log-name	    specifies an optional logical name to receive hostname.
+**
+**	    -c sym-name	    specifies an optional symbol name to receive hostname.
+**
+**	    host-addr	    specifies an optional host address to resolve.
+**
+**  AUTHOR:  Matthew Doremus			CREATION DATE:  07-Jul-2000
+**
+**  Modification History:
+**
+**	X-1	Matthew Doremus				07-Jul-2000
+**		Initial development
+**
+**--
+**
+**  Compile/Link instructions:
+**
+**	OpenVMS Alpha/VAX:
+**	    $ CC HOSTNAME+SYS$LIBRARY:SYS$LIB_C/LIBRARY
+**	    $ LINK HOSTNAME
+**
+*/
+
+/*
+** Define __NEW_STARLET if it's not already defined
+*/
+#ifndef __NEW_STARLET
+#define __NEW_STARLET
+#define __NEW_STARLET_SET
+#endif
+
+/*
+** Include the necessary header files
+*/
+#include <lib$routines>
+#include <libclidef>
+#include <descrip>
+#include <stdlib>
+#include <string>
+#include <stdio>
+#include <netdb>
+#include <in>
+#include <socket>
+
+/*
+** Undefine __NEW_STARLET if we had defined it
+*/
+#ifndef __NEW_STARLET_SET
+#undef  __NEW_STARLET_SET
+#undef  __NEW_STARLET
+#endif
+
+/*
+** Option Data Structure
+*/
+typedef struct _opt_data {
+    char		*log_name;
+    char		*sym_name;
+    unsigned char	host_addr[4]; 
+    } OPT_DATA;
+
+/*
+** Local Routine Prototypes
+*/
+static void 
+ParseCmdLine (
+    int,
+    char *[],
+    OPT_DATA *);
+
+static void
+SetLogName (
+    char *,
+    char *);
+
+static void
+SetSymName (
+    char *,
+    char *);
+
+static void 
+Usage ();
+
+/*
+**
+**  main - Main processing routine for the HOSTNAME utility
+**
+**  Functional Description:
+**
+**	This routine controls overall program execution.
+**
+**  Usage:
+**
+**      main argc, argv, envp
+**
+**  Formal parameters:
+**
+**      argc 		- (IN) argument count
+**      argv         	- (IN) address of an argument array 
+**      envp         	- (IN) address of an environment string 
+**
+**  Implicit Parameters:
+**
+**      None
+**
+**  Routine Value:
+**
+**      None
+**
+**  Side Effects:
+**
+**      None
+**
+*/
+int
+main (
+    int		argc,
+    char	*argv[],
+    char	*envp[]
+    )
+{
+struct in_addr host_addr;
+char hostname[512+1];
+struct hostent *hp;
+OPT_DATA OptData;
+int i;
+
+/*
+** Parse the command line
+*/
+ParseCmdLine (argc, argv, &OptData);
+
+/*
+** If no host address was given, then use gethostname otherwise
+** use gethostbyaddr.
+*/
+if (! OptData.host_addr[0] && ! OptData.host_addr[1] && 
+    ! OptData.host_addr[2] && ! OptData.host_addr[3])
+    {
+    if (gethostname (hostname, sizeof (hostname) - 1))
+        {
+        perror ("gethostname");
+        exit (1);
+        }
+
+    if (! (hp = gethostbyname (hostname)))
+	{
+        perror ("gethostbyname");
+	exit (1);
+	}
+    }
+else
+    {
+    host_addr.s_net = OptData.host_addr[0];
+    host_addr.s_host = OptData.host_addr[1];
+    host_addr.s_lh = OptData.host_addr[2];
+    host_addr.s_impno = OptData.host_addr[3];
+    	
+    if (! (hp = gethostbyaddr (&host_addr, sizeof (host_addr), AF_INET)))
+	{
+        perror ("gethostbyaddr");
+	exit (1);
+	}
+    }
+
+/*
+** Let's try to determine the best available fully qualified hostname.
+*/
+if (hp->h_name)
+    {
+    strcpy (hostname, hp->h_name);
+    if (! strchr (hostname, '.'))
+	{
+	for (i = 0; hp->h_aliases[i]; i++)
+	    {
+	    if (strchr (hp->h_aliases[i], '.') && 
+	        ! strncasecmp (hp->h_aliases[i], hostname, strlen (hostname)))
+		{     
+		strcpy (hostname, hp->h_aliases[i]);
+		break;
+		}
+	    }
+	}
+    }
+else
+    strcpy (hostname, "(unavailable)");
+
+/*
+** Define a logical name if one was provided
+*/
+if (OptData.log_name)
+    SetLogName (OptData.log_name, hostname);
+
+/*
+** Define a symbol name if one was provided
+*/
+if (OptData.sym_name)
+    SetSymName (OptData.sym_name, hostname);
+
+/*
+** print the host name if no logical or symbol name was provided
+*/
+if (! OptData.log_name && ! OptData.sym_name)
+    printf ("%s\n", hostname);
+
+}
+
+/*
+**
+**  ParseCmdLine - Parse the command line options
+**
+**  Functional Description:
+**
+**      This routine parses the command line options.
+**
+**  Usage:
+**
+**      ParseCmdLine argc, argv, OptData
+**
+**  Formal parameters:
+**
+**      argc 		- (IN) argument count
+**      argv         	- (IN) address of an argument array 
+**      OptData		- (OUT) address of command option data structure 
+**			  which will contain the parsed input.
+**
+**  Implicit Parameters:
+**
+**      None
+**
+**  Routine Value:
+**
+**      None
+**
+**  Side Effects:
+**
+**      None
+**
+*/
+static void
+ParseCmdLine (
+    int			argc,
+    char		*argv[],
+    OPT_DATA		*OptData
+    )
+{
+int option,
+    i;
+
+/*
+** Initialize the option data
+*/
+OptData->log_name = NULL;
+OptData->sym_name = NULL;
+OptData->host_addr[0] = 0;
+OptData->host_addr[1] = 0;
+OptData->host_addr[2] = 0;
+OptData->host_addr[3] = 0;
+
+/*
+** Process the command line options
+*/
+while ((option = getopt (argc, argv, "l:s:?")) != EOF) 
+    {
+    switch (option) 
+	{
+	/* 
+	** Output to logical name ?
+	*/
+	case 'l':
+	    OptData->log_name = strdup (optarg);
+	    break;
+
+	/* 
+	** Output to symbol name ?
+	*/
+	case 's':
+	    OptData->sym_name = strdup (optarg);
+	    break;
+
+	/* 
+	** Invalid argument ?
+	*/
+	case '?':
+	default:
+	    Usage ();
+	    exit (1);
+	    break;
+	}
+    }
+
+/*
+** Are the number of parameters correct ?
+*/
+if (argc - optind > 1)
+    {
+    Usage ();
+    exit (1);
+    }
+
+/*
+** Host Address provided ?
+*/
+if (argc - optind == 1)
+    {
+    char *addr_ptr = argv[optind],
+         *addr_sep;
+
+    for (i = 0; i < 4; i++)
+	{
+        if ((addr_sep = strchr (addr_ptr, '.')) && (i < 3))
+	    *addr_sep = '\0';
+
+	if (strlen (addr_ptr) == 0 || atoi (addr_ptr) > 255 ||
+	    strspn (addr_ptr, "0123456789") != strlen (addr_ptr))
+	    {
+	    printf ("Invalid TCP/IP address format.\n");
+	    exit (1);
+	    }
+
+	OptData->host_addr[i] = atoi (addr_ptr);
+	if (addr_sep)
+	    addr_ptr = addr_sep + 1;
+	}    
+    }
+}
+
+/*
+**
+**  SetLogName - Set a logical name & value
+**
+**  Functional Description:
+**
+**      This routine sets a logical name & value.
+**
+**  Usage:
+**
+**      SetLogName LogName, LogValue
+**
+**  Formal parameters:
+**
+**      LogName		- (IN) address of the logical name
+**      LogValue       	- (IN) address of the logical value
+**
+**  Implicit Parameters:
+**
+**      None
+**
+**  Routine Value:
+**
+**      None
+**
+**  Side Effects:
+**
+**      None
+**
+*/
+static void
+SetLogName (
+    char 		*LogName,
+    char		*LogValue
+    )
+{
+struct dsc$descriptor_s log_nam_desc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
+struct dsc$descriptor_s log_val_desc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
+int status;
+
+/*
+** Setup the logical name & value descriptors
+*/
+log_nam_desc.dsc$w_length = strlen (LogName);
+log_nam_desc.dsc$a_pointer = LogName;
+log_val_desc.dsc$w_length = strlen (LogValue);
+log_val_desc.dsc$a_pointer = LogValue;
+
+/*
+** Set the logical name & value
+*/
+status = lib$set_logical (&log_nam_desc, &log_val_desc, 0, 0, 0);
+if (! (status & 1))
+    exit (status);
+
+}
+
+/*
+**
+**  SetSymName - Set a symbol name & value
+**
+**  Functional Description:
+**
+**      This routine sets a symbol name & value.
+**
+**  Usage:
+**
+**      SetSymName SymName, SymValue
+**
+**  Formal parameters:
+**
+**      SymName		- (IN) address of the symbol name
+**      SymValue       	- (IN) address of the Symbol value
+**
+**  Implicit Parameters:
+**
+**      None
+**
+**  Routine Value:
+**
+**      None
+**
+**  Side Effects:
+**
+**      None
+**
+*/
+static void
+SetSymName (
+    char 		*SymName,
+    char		*SymValue
+    )
+{
+struct dsc$descriptor_s sym_nam_desc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
+struct dsc$descriptor_s sym_val_desc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, 0};
+int status;
+
+/*
+** Setup the symbol name & value descriptors
+*/
+sym_nam_desc.dsc$w_length = strlen (SymName);
+sym_nam_desc.dsc$a_pointer = SymName;
+sym_val_desc.dsc$w_length = strlen (SymValue);
+sym_val_desc.dsc$a_pointer = SymValue;
+
+/*
+** Set the symbol name & value
+*/
+status = lib$set_symbol (&sym_nam_desc, &sym_val_desc, &LIB$K_CLI_LOCAL_SYM);
+if (! (status & 1))
+    exit (status);
+
+}
+
+/*
+**
+**  Usage - Display the acceptable unix style command usage
+**
+**  Functional Description:
+**
+**      This routine displays to standard output the appropriate unix style 
+**	command usage.
+**
+**  Usage:
+**
+**      Usage 
+**
+**  Formal parameters:
+**
+**      None
+**
+**  Implicit Parameters:
+**
+**      None
+**
+**  Routine Value:
+**
+**      None
+**
+**  Side Effects:
+**
+**      None
+**
+*/
+static void
+Usage ()
+{
+
+fprintf (stdout, "Usage: HOSTNAME [-l log-name] [-s sym-name] [host-addr]\n");
+
+}
+#endif      /* #ifdef VMS */
--- a/VMS/cert_tool/ssl$auth_cert.com
+++ b/VMS/cert_tool/ssl$auth_cert.com
@@ -0,0 +1,639 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$AUTH_CERT.COM - SSL Certificate Authority procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure prompts the user through creating a Server Certificate.
+$!
+$! There are no parameters used.
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ DELETE := DELETE
+$ SAY := WRITE SYS$OUTPUT
+$ ASK := READ SYS$COMMAND /END_OF_FILE=EXIT /PROMPT=
+$ PID = F$GETJPI ("","PID")
+$ TT_NOECHO = F$GETDVI ("TT:","TT_NOECHO")
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ TT_ROWS = F$GETDVI ("TT:","TT_PAGE")
+$ TT_COLS = F$GETDVI ("TT:","DEVBUFSIZ")
+$!
+$ GET_USER_DATA := CALL GET_USER_DATA
+$ SET_USER_DATA := CALL SET_USER_DATA
+$ DEL_USER_DATA := CALL DEL_USER_DATA
+$ INIT_TERM := @SSL$COM:SSL$INIT_TERM
+$ SHOW_FILE := @SSL$COM:SSL$SHOW_FILE 
+$ SSL_CONF_FILE = F$TRNLMN ("SSL$CA_CONF")
+$ GET_CONF_DATA := @SSL$COM:SSL$CONF_UTIL 'SSL_CONF_FILE' GET
+$ SET_CONF_DATA := @SSL$COM:SSL$CONF_UTIL 'SSL_CONF_FILE' SET
+$!
+$ ESC[0,8] = 27 	! Set the Escape Character
+$ BELL[0,8] = 7 	! Ring the terminal Bell
+$ RED = 1		! Color - Red
+$ FGD = 30		! Foreground
+$ BGD = 0		! Background
+$ CSCR = ESC + "[2J"	! Clear the Screen 
+$ CEOS = ESC + "[0J"	! Clear to the End of the Screen 
+$ CEOL = ESC + "[0K"	! Clear to the End of the Line
+$ NORM = ESC + "[0m"	! Turn Attributes off
+$ BLNK = ESC + "[5m"    ! Turn on BLINK Attribute
+$ WIDE = ESC + "#6"     ! Turn on WIDE Attribute
+$!
+$!------------------------------------------------------------------------------
+$! Run the SSL setup if it hasn't been run yet
+$!------------------------------------------------------------------------------
+$!
+$ IF F$TRNLNM ("SSL$CA_CONF") .EQS. ""
+$ THEN
+$     IF F$SEARCH ("SSL$COM:SSL$INIT_ENV.COM") .NES. ""
+$     THEN 
+$         @SSL$COM:SSL$INIT_ENV.COM
+$     ELSE
+$         SAY BELL, "Unable to locate SSL$COM:SSL$INIT_ENV.COM ..."
+$	  GOTO EXIT
+$     ENDIF
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Display the Page Header
+$!------------------------------------------------------------------------------
+$!
+$ INIT_TERM
+$ BCOLOR = BGD
+$ FCOLOR = FGD + RED
+$ COLOR = ESC + "[''BCOLOR';''FCOLOR'm"
+$!
+$ TEXT = "SSL Certificate Tool"
+$ COL = (TT_COLS - (F$LENGTH (TEXT) * 2)) / 4
+$!
+$ SAY ESC + "[01;01H", CSCR
+$ SAY ESC + "[02;''COL'H", COLOR, WIDE, TEXT, NORM
+$!
+$ TEXT = "Create Certification Authority"
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ SAY ESC + "[04;01H"
+$ SAY ESC + "[04;''COL'H", COLOR, TEXT, NORM
+$!
+$ ROW = 6
+$ COL = 2
+$ TOP_ROW = ROW
+$ MSG_ROW = TT_ROWS - 1
+$!
+$!------------------------------------------------------------------------------
+$! Initialize the Request Data
+$!------------------------------------------------------------------------------
+$!
+$ IF F$SEARCH ("''SSL_CONF_FILE'") .NES. ""
+$ THEN 
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Reading Configuration ...", NORM
+$ ELSE
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Initializing Configuration ...", NORM
+$ ENDIF
+$!
+$ _request_name = "req"
+$!
+$ _distinguished_name = "CA_distinguished_name"
+$ _distinguished_name_upd = "Y"
+$!
+$ _default_bits = "1024"
+$ _default_bits_upd = "Y"
+$!
+$ _default_days = "1825"
+$ _default_days_upd = "Y"
+$!
+$ _default_keyfile = "SSL$KEY:SERVER_CA.KEY"
+$ _default_keyfile_upd = "Y"
+$!
+$ _default_crtfile = "SSL$CRT:SERVER_CA.CRT"
+$ _default_crtfile_upd = "Y"
+$!
+$ _countryName_prompt = "Country Name ?"
+$ _countryName_min = "2"
+$ _countryName_max = "2"
+$ _countryName_default = "US"
+$ _countryName_upd = "Y"
+$ _countryName_cnt = 4
+$!
+$ _0organizationName_prompt = "Organization Name ?"
+$ _0organizationName_default = ""
+$ _0organizationName_upd = "Y"
+$ _0organizationName_cnt = 2
+$!
+$ _organizationalUnitName_prompt = "Organization Unit Name ?"
+$ _organizationalUnitName_default = ""
+$ _organizationalUnitName_upd = "Y"
+$ _organizationalUnitName_cnt = 2
+$!
+$ _commonName_prompt = "Common Name ?"
+$ _commonName_max = "64"
+$ _commonName_default = "CA Authority"
+$ _commonName_upd = "Y"
+$ _commonName_cnt = 3
+$!
+$ IF F$SEARCH ("''SSL_CONF_FILE'") .NES. ""
+$ THEN 
+$     GET_CONF_DATA "[''_request_name']#distinguished_name"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _distinguished_name = SSL_CONF_DATA
+$         _distinguished_name_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_request_name']#default_bits"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_bits = SSL_CONF_DATA
+$         _default_bits_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_request_name']#default_days"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_days = SSL_CONF_DATA
+$         _default_days_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_request_name']#default_keyfile"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_keyfile = F$PARSE (SSL_CONF_DATA,"SSL$ROOT:",,"DEVICE") + -
+ 		             F$PARSE (SSL_CONF_DATA,"[KEY]",,"DIRECTORY") + -
+ 		             F$PARSE (SSL_CONF_DATA,"SERVER",,"NAME") + -
+ 		             F$PARSE (SSL_CONF_DATA,".KEY",,"TYPE") 
+$         _default_keyfile_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_request_name']#default_crtfile"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_crtfile = F$PARSE (SSL_CONF_DATA,"SSL$ROOT:",,"DEVICE") + -
+ 		             F$PARSE (SSL_CONF_DATA,"[CRT]",,"DIRECTORY") + -
+ 		             F$PARSE (SSL_CONF_DATA,"SERVER",,"NAME") + -
+ 		             F$PARSE (SSL_CONF_DATA,".CRT",,"TYPE") 
+$         _default_crtfile_upd = "N"
+$     ENDIF
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#countryName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _countryName_prompt = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#countryName_min"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _countryName_min = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#countryName_max"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _countryName_max = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#countryName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _countryName_default = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     IF _countryName_cnt .EQ. CTR THEN _countryName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#0.organizationName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _0organizationName_prompt = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#0.organizationName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _0organizationName_default = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     IF _0organizationName_cnt .EQ. CTR THEN _0organizationName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#organizationalUnitName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _organizationalUnitName_prompt = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#organizationalUnitName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _organizationalUnitName_default = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     IF _organizationalUnitName_cnt .EQ. CTR THEN _organizationalUnitName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#commonName"
+$     IF SSL_CONF_DATA .NES. "" 
+$     THEN
+$         _commonName_prompt = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#commonName_max"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _commonName_max = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#commonName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _commonName_default = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     IF _commonName_cnt .EQ. CTR THEN _commonName_upd = "N"
+$ ENDIF
+$!
+$ SET_USER_DATA "[]#pem_pass_phrase#-##PEM Pass Phrase ?#P#1###Y#Y"
+$ SET_USER_DATA "[''_request_name']#default_bits#D#''_default_bits'#Encryption Bits ?#I###''_default_bits_upd'#Y#N"
+$ SET_USER_DATA "[''_request_name']#default_days#D#''_default_days'#Default Days ?#I###''_default_days_upd'#Y#N"
+$ SET_USER_DATA "[''_request_name']#default_keyfile#D#''_default_keyfile'#CA certificate Key File ?#F###''_default_keyfile_upd'#Y#N"
+$ SET_USER_DATA "[''_request_name']#default_crtfile#D#''_default_crtfile'#CA certificate File ?#F###''_default_crtfile_upd'#Y#N"
+$ SET_USER_DATA "[''_request_name']#distinguished_name#D#''_distinguished_name'##S###''_distinguished_name_upd'#N#N"
+$ SET_USER_DATA "[''_distinguished_name']#countryName#P#''_countryName_default'#''_countryName_prompt'#S#''_countryName_min'#''_countryName_max'#''_countryName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#0.organizationName#P#''_0organizationName_default'#''_0organizationName_prompt'#S###''_0organizationName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#organizationalUnitName#P#''_organizationalUnitName_default'#''_organizationalUnitName_prompt'#S###''_organizationUnitName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#commonName#P#''_commonName_default'#''_commonName_prompt'#S##''_commonName_max'#''_commonName_upd'#Y#N"
+$ SET_USER_DATA "[]#display_certificate#-#N#Display the CA certificate ?#S##1##Y#N"
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$!
+$!------------------------------------------------------------------------------
+$! Confirm/Update the SSL Configuration Data
+$!------------------------------------------------------------------------------
+$!
+$ CTR = 1
+$!
+$PROMPT_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN 
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     TYP = F$ELEMENT (5,"#",SSL_USER_DATA_'CTR') ! Value Type
+$     MIN = F$ELEMENT (6,"#",SSL_USER_DATA_'CTR') ! Value Minimum Length
+$     MAX = F$ELEMENT (7,"#",SSL_USER_DATA_'CTR') ! Value Maximum Length
+$     UPD = F$ELEMENT (8,"#",SSL_USER_DATA_'CTR') ! Entry Updated ?
+$     REQ = F$ELEMENT (9,"#",SSL_USER_DATA_'CTR') ! Entry Required for Input ?
+$     CFM = F$ELEMENT (10,"#",SSL_USER_DATA_'CTR')! Confirm Input  ?
+$     CONFIRMED = 0
+$     IF REQ .EQS. "N"
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO PROMPT_LOOP
+$     ENDIF
+$     IF ROW .GT. MSG_ROW - 2
+$     THEN 
+$         SAY ESC + "[''TOP_ROW';01H", CEOS
+$	  ROW = TOP_ROW
+$     ENDIF
+$!
+$CONFIRM_LOOP:
+$!
+$     IF PRM .EQS. "" 
+$     THEN 
+$         PROMPT = ESC + "[''ROW';''COL'H''ITM' ? [''DEF'] ''CEOL'"
+$     ELSE
+$         PROMPT = ESC + "[''ROW';''COL'H''PRM' [''DEF'] ''CEOL'"
+$     ENDIF
+$     IF TYP .EQS. "P" THEN SET TERMINAL /NOECHO
+$     ASK "''PROMPT'" ANS /END_OF_FILE=EXIT
+$     IF TYP .EQS. "P" THEN SET TERMINAL /ECHO
+$     ANS = F$EDIT (ANS,"TRIM")
+$     IF ANS .EQS. "" THEN ANS = DEF
+$     IF TYP .EQS. "F"
+$     THEN 
+$         ANS = F$PARSE ("''ANS'","''DEF'",,,"SYNTAX_ONLY")	  
+$     ENDIF
+$     IF TYP .EQS. "I" .AND. F$TYPE (ANS) .NES. "INTEGER"
+$     THEN 
+$         CALL INVALID_ENTRY
+$         SAY ESC + "[''ROW';01H", CEOS
+$         GOTO PROMPT_LOOP
+$     ENDIF
+$     IF (TYP .EQS. "S" .OR. TYP .EQS. "P") .AND. -
+         ((MIN .NES. "" .AND. F$LENGTH (ANS) .LT. F$INTEGER(MIN)) .OR. -
+          (MAX .NES. "" .AND. F$LENGTH (ANS) .GT. F$INTEGER(MAX)))
+$     THEN 
+$         CALL INVALID_ENTRY
+$         SAY ESC + "[''ROW';01H", CEOS
+$	  IF TYP .EQS. "S" THEN GOTO PROMPT_LOOP
+$         IF TYP .EQS. "P" THEN GOTO CONFIRM_LOOP
+$     ENDIF
+$     ROW = ROW + 1
+$     IF CFM .EQS. "Y"
+$     THEN
+$         IF CONFIRMED .EQ. 0
+$	  THEN
+$	      CONFIRMED = 1
+$	      CONFIRMED_ANS = ANS
+$	      PRM = "Confirm ''PRM'"
+$	      GOTO CONFIRM_LOOP
+$         ELSE
+$	      IF ANS .NES. CONFIRMED_ANS
+$	      THEN 
+$                 CALL INVALID_ENTRY
+$		  ROW = ROW - 2
+$                 SAY ESC + "[''ROW';01H", CEOS
+$                 GOTO PROMPT_LOOP
+$	      ENDIF
+$         ENDIF
+$     ENDIF
+$     IF ANS .NES. DEF THEN SSL_USER_DATA_'CTR' = "''KEY'#''ITM'#''VAL'#''ANS'#''PRM'#''TYP'#''MIN'#''MAX'#Y#''REQ'#''CFM'"
+$     CTR = CTR + 1
+$     GOTO PROMPT_LOOP
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Save the SSL Configuration Data
+$!------------------------------------------------------------------------------
+$!
+$ CTR = 1
+$ SAY ESC + "[''MSG_ROW';01H", BLNK, " Saving Configuration ...", NORM
+$!
+$SAVE_CONF_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN 
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     TYP = F$ELEMENT (5,"#",SSL_USER_DATA_'CTR') ! Value Type
+$     MIN = F$ELEMENT (6,"#",SSL_USER_DATA_'CTR') ! Value Minimum Length
+$     MAX = F$ELEMENT (7,"#",SSL_USER_DATA_'CTR') ! Value Maximum Length
+$     UPD = F$ELEMENT (8,"#",SSL_USER_DATA_'CTR') ! Entry Updated ?
+$     REQ = F$ELEMENT (9,"#",SSL_USER_DATA_'CTR') ! Entry Required for Input ?
+$     CFM = F$ELEMENT (10,"#",SSL_USER_DATA_'CTR')! Confirm Input ?
+$     IF UPD .NES. "Y" .OR. VAL .EQS. "-"
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO SAVE_CONF_LOOP
+$     ENDIF
+$     IF VAL .EQS. "D"
+$     THEN 
+$         SET_CONF_DATA "''KEY'#''ITM'" "''DEF'"
+$     ELSE
+$         SET_CONF_DATA "''KEY'#''ITM'" "''PRM'"
+$         SET_CONF_DATA "''KEY'#''ITM'_default" "''DEF'"
+$     ENDIF
+$     IF MIN .NES. "" THEN SET_CONF_DATA "''KEY'#''ITM'_min" "''MIN'"
+$     IF MAX .NES. "" THEN SET_CONF_DATA "''KEY'#''ITM'_max" "''MAX'"
+$     CTR = CTR + 1
+$     GOTO SAVE_CONF_LOOP
+$ ENDIF
+$!
+$ PURGE /NOLOG /NOCONFIRM 'SSL_CONF_FILE'
+$ RENAME 'SSL_CONF_FILE'; ;1
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$!
+$!------------------------------------------------------------------------------
+$! Create the Certificiate Authority
+$!------------------------------------------------------------------------------
+$!
+$ SAY ESC + "[''MSG_ROW';01H", BLNK, " Creating Certificate Authority ...", NORM
+$!
+$ X1 = 2
+$ Y1 = TOP_ROW
+$ X2 = TT_COLS - 2
+$ Y2 = MSG_ROW - 1
+$!
+$ GET_USER_DATA "[''_request_name']#default_days"
+$ _default_days = SSL_USER_DATA
+$ GET_USER_DATA "[''_request_name']#default_keyfile"
+$ _default_keyfile = SSL_USER_DATA
+$ GET_USER_DATA "[''_request_name']#default_crtfile"
+$ _default_crtfile = SSL_USER_DATA
+$ GET_USER_DATA "[]#pem_pass_phrase"
+$ _pem_pass_phrase = SSL_USER_DATA
+$ GET_USER_DATA "[]#display_certificate"
+$ _display_certificate = SSL_USER_DATA
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SHOW SYSTEM /FULL /OUT=SYS$LOGIN:SSL_REQ_'PID'.RND
+$!
+$ OPEN /WRITE OFILE SYS$LOGIN:SSL_REQ_'PID'.COM
+$ WRITE OFILE "$ DEFINE /USER /NOLOG RANDFILE    SYS$LOGIN:SSL_REQ_''PID'.RND"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_REQ_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_REQ_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$ WRITE OFILE "$ OPENSSL req -config ''SSL_CONF_FILE' -new -x509 -days ''_default_days' -keyout ''_default_keyfile' -out ''_default_crtfile'"
+$ WRITE OFILE "''_pem_pass_phrase'"
+$ WRITE OFILE "''_pem_pass_phrase'"
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ CLOSE OFILE
+$!
+$ @SYS$LOGIN:SSL_REQ_'PID'.COM
+$!
+$ DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.RND;*
+$ DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.COM;*
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SEARCH SYS$LOGIN:SSL_REQ_'PID'.LOG /OUT=SYS$LOGIN:SSL_REQ_'PID'.ERR ":error:"
+$ IF F$SEARCH ("SYS$LOGIN:SSL_REQ_''PID'.ERR") .NES. "" 
+$ THEN 
+$     IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_REQ_''PID'.ERR","ALQ") .NE. 0
+$     THEN 
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.ERR;*
+$         SAY ESC + "[''MSG_ROW';01H''BELL'''CEOS'"
+$         SHOW_FILE "SYS$LOGIN:SSL_REQ_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ERROR >" 
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.LOG;*
+$         GOTO EXIT
+$     ENDIF
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.ERR;*
+$ ENDIF
+$!
+$ DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.LOG;*
+$! 
+$ IF F$EDIT (_display_certificate,"TRIM,UPCASE") .EQS. "Y"
+$ THEN 
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Generating Output ...", NORM, CEOL
+$!
+$     OPEN /WRITE OFILE SYS$LOGIN:SSL_X509_'PID'.COM
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_X509_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_X509_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$     WRITE OFILE "$ OPENSSL x509 -noout -text -in ''_default_crtfile'"
+$     CLOSE OFILE
+$!
+$     @SYS$LOGIN:SSL_X509_'PID'.COM
+$!
+$     DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.COM;*
+$!
+$     DEFINE /USER /NOLOG SYS$ERROR  NL:
+$     DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$     SEARCH SYS$LOGIN:SSL_X509_'PID'.LOG /OUT=SYS$LOGIN:SSL_X509_'PID'.ERR ":error:"
+$     IF F$SEARCH ("SYS$LOGIN:SSL_X509_''PID'.ERR") .NES. "" 
+$     THEN 
+$         IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_X509_''PID'.ERR","ALQ") .NE. 0
+$         THEN 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.ERR;*
+$             SAY ESC + "[''MSG_ROW';01H''BELL'''CEOS'"
+$             SHOW_FILE "SYS$LOGIN:SSL_X509_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ERROR >" 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.LOG;*
+$             GOTO EXIT
+$         ENDIF
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.ERR;*
+$     ENDIF
+$!
+$     SAY ESC + "[''MSG_ROW';01H''CEOS'"
+$     SHOW_FILE "SYS$LOGIN:SSL_X509_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ''_default_crtfile' >" 
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.LOG;*
+$     GOTO EXIT
+$ ENDIF
+$!
+$ TEXT = "Press return to continue"
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$ PROMPT = ESC + "[''MSG_ROW';''COL'H''TEXT'"
+$ ASK "''PROMPT'" OPT
+$!
+$GOTO EXIT
+$!
+$!------------------------------------------------------------------------------
+$! Set the User Data
+$!------------------------------------------------------------------------------
+$!
+$SET_USER_DATA: SUBROUTINE
+$!
+$ IF F$TYPE (SSL_USER_DATA_MAX) .EQS. ""
+$ THEN
+$     SSL_USER_DATA_MAX == 1
+$ ELSE
+$     SSL_USER_DATA_MAX == SSL_USER_DATA_MAX + 1
+$ ENDIF
+$!
+$ SSL_USER_DATA_'SSL_USER_DATA_MAX' == "''P1'"
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Get the User Data
+$!------------------------------------------------------------------------------
+$!
+$GET_USER_DATA: SUBROUTINE
+$!
+$ CTR = 1
+$ USER_KEY = F$ELEMENT (0,"#",P1)
+$ USER_ITM = F$ELEMENT (1,"#",P1)
+$!
+$GET_USER_DATA_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     IF USER_KEY .NES. KEY .OR. USER_ITM .NES. ITM
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO GET_USER_DATA_LOOP
+$     ENDIF
+$     IF VAL .EQS. "-" THEN SSL_USER_DATA == "''DEF'"
+$     IF VAL .EQS. "D" THEN SSL_USER_DATA == "''DEF'"
+$     IF VAL .EQS. "P" THEN SSL_USER_DATA == "''PRM'"
+$ ENDIF
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Delete the User Data
+$!------------------------------------------------------------------------------
+$!
+$DEL_USER_DATA: SUBROUTINE
+$!
+$ IF F$TYPE (SSL_USER_DATA_MAX) .EQS. "" THEN GOTO DEL_USER_DATA_END
+$!
+$DEL_USER_DATA_LOOP:
+$!
+$ IF F$TYPE (SSL_USER_DATA_'SSL_USER_DATA_MAX') .NES. "" 
+$ THEN
+$     DELETE /SYMBOL /GLOBAL SSL_USER_DATA_'SSL_USER_DATA_MAX'
+$     SSL_USER_DATA_MAX == SSL_USER_DATA_MAX - 1
+$     GOTO DEL_USER_DATA_LOOP
+$ ENDIF
+$!
+$ DELETE /SYMBOL /GLOBAL SSL_USER_DATA_MAX
+$!
+$DEL_USER_DATA_END:
+$!
+$ IF F$TYPE (SSL_USER_DATA) .NES. "" THEN DELETE /SYMBOL /GLOBAL SSL_USER_DATA
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Display the invalid entry 
+$!------------------------------------------------------------------------------
+$!
+$INVALID_ENTRY: SUBROUTINE
+$!
+$ SAY ESC + "[''MSG_ROW';01H", BELL, " Invalid Entry, Try again ...''CEOL'"
+$ Wait 00:00:01.5
+$ SAY ESC + "[''MSG_ROW';01H", CEOL
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Exit the procedure
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ CLOSE OFILE
+$!
+$ DEL_USER_DATA
+$!
+$ IF F$TYPE (SSL_CONF_DATA) .NES. "" THEN DELETE /SYMBOL /GLOBAL SSL_CONF_DATA
+$!
+$ IF F$GETDVI ("TT:","TT_NOECHO") .AND. .NOT. TT_NOECHO THEN SET TERMINAL /ECHO
+$!
+$ IF F$SEARCH ("SYS$LOGIN:SSL_REQ_''PID'.%%%;*") .NES. "" THEN DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.%%%;*
+$ IF F$SEARCH ("SYS$LOGIN:SSL_X509_''PID'.%%%;*") .NES. "" THEN DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.%%%;*
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$auto_cert.com
+++ b/VMS/cert_tool/ssl$auto_cert.com
@@ -0,0 +1,101 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$AUTO_CERT.COM - SSL Automatic Self-Signed Certificate procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$!
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Define Symbols
+$!------------------------------------------------------------------------------
+$! 
+$ OPENSSL       :== $ SSL$EXE:OPENSSL
+$ HOSTNAME      :== $ SSL$EXE:SSL$HOSTNAME
+$!
+$ HOSTNAME -s HOST_NAME
+$ PID = F$GETJPI ("","PID")
+$ USER = F$EDIT (F$GETJPI ("","USERNAME"),"TRIM")
+$ KEY_FILE = "SSL$KEY:SERVER.KEY"
+$ CRT_FILE = "SSL$CRT:SERVER.CRT"
+$!
+$!------------------------------------------------------------------------------
+$! Create a Temporary SSL Configuration
+$!------------------------------------------------------------------------------
+$!
+$ OPEN /WRITE CFILE SYS$LOGIN:SSL_'PID'.CNF
+$ WRITE CFILE "[req]"
+$ WRITE CFILE "default_bits = 1024"
+$ WRITE CFILE "distinguished_name = REQ_distinguished_name"
+$ WRITE CFILE "[REQ_distinguished_name]"
+$ WRITE CFILE "countryName = Country Name ?"
+$ WRITE CFILE "countryName_default = "
+$ WRITE CFILE "stateOrProvinceName = State or Province Name ?"
+$ WRITE CFILE "stateOrProvinceName_default = "
+$ WRITE CFILE "localityName = City Name ?"
+$ WRITE CFILE "localityName_default = "
+$ WRITE CFILE "0.organizationName = Organization Name ?"
+$ WRITE CFILE "0.organizationName_default = "
+$ WRITE CFILE "organizationalUnitName = Organization Unit Name ?
+$ WRITE CFILE "organizationalUnitName_default = "
+$ WRITE CFILE "commonName = Common Name ?"
+$ WRITE CFILE "commonName_default = ''HOST_NAME'"
+$ WRITE CFILE "emailAddress = Email Address ?"
+$ WRITE CFILE "emailAddress_default = ''USER'@''HOST_NAME'"
+$ CLOSE CFILE
+$!
+$!------------------------------------------------------------------------------
+$! Create the Self-Signed Server Certificiate
+$!------------------------------------------------------------------------------
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SHOW SYSTEM /FULL /OUT=SYS$LOGIN:SSL_'PID'.RND
+$!
+$ OPEN /WRITE OFILE SYS$LOGIN:SSL_'PID'.COM
+$ WRITE OFILE "$ DEFINE /USER /NOLOG RANDFILE    SYS$LOGIN:SSL_''PID'.RND"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$ WRITE OFILE "$ OPENSSL req -nodes -new -days 30 -x509 -config SYS$LOGIN:SSL_''PID'.CNF -keyout ''KEY_FILE' -out ''CRT_FILE'"
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ CLOSE OFILE
+$!
+$ @SYS$LOGIN:SSL_'PID'.COM
+$!
+$ DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_'PID'.CNF;*
+$ DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_'PID'.RND;*
+$ DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_'PID'.COM;*
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SEARCH SYS$LOGIN:SSL_'PID'.LOG /OUT=SYS$LOGIN:SSL_'PID'.ERR ":error:"
+$!
+$ IF F$SEARCH ("SYS$LOGIN:SSL_''PID'.ERR") .NES. "" 
+$ THEN 
+$     IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_''PID'.ERR","ALQ") .NE. 0
+$     THEN 
+$         TYPE SYS$LOGIN:SSL_'PID'.LOG
+$     ENDIF
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_'PID'.ERR;*
+$ ENDIF
+$!
+$ DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_'PID'.LOG;*
+$!
+$!------------------------------------------------------------------------------
+$! Exit
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$cert_tool.com
+++ b/VMS/cert_tool/ssl$cert_tool.com
@@ -0,0 +1,231 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$CERT_TOOL.COM - SSL Certificate Tool procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure provides the user a menu from which they can choose desired 
+$! SSL Certificate processing.
+$!
+$! There are no parameters used.
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ DELETE := DELETE
+$ SAY := WRITE SYS$OUTPUT
+$ ASK := READ SYS$COMMAND /END_OF_FILE=EXIT /PROMPT=
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ TT_ROWS = f$getdvi ("TT:","TT_PAGE")
+$ TT_COLS = f$getdvi ("TT:","DEVBUFSIZ")
+$!
+$ SET_MENU_DATA := CALL SET_MENU_DATA
+$ DEL_MENU_DATA := CALL DEL_MENU_DATA
+$!
+$ ESC[0,8] = 27 	! Set the Escape Character
+$ BELL[0,8] = 7 	! Ring the terminal Bell
+$ RED = 1		! Color - Red
+$ FGD = 30		! Foreground
+$ BGD = 0		! Background
+$ CSCR = ESC + "[2J"	! Clear the Screen 
+$ CEOS = ESC + "[0J"	! Clear to the End of the Screen 
+$ CEOL = ESC + "[0K"	! Clear to the End of the Line
+$ NORM = ESC + "[0m"	! Turn Attributes off
+$ BOLD = ESC + "[1m"    ! Turn on BOLD Attribute
+$ WIDE = ESC + "#6"     ! Turn on WIDE Attribute
+$!
+$!------------------------------------------------------------------------------
+$! Run the SSL setup if it hasn't been run yet
+$!------------------------------------------------------------------------------
+$!
+$ IF F$TRNLNM ("SSL$CA_CONF") .EQS. ""
+$ THEN
+$     IF F$SEARCH ("SSL$COM:SSL$INIT_ENV.COM") .NES. ""
+$     THEN 
+$         @SSL$COM:SSL$INIT_ENV.COM
+$     ELSE
+$         SAY BELL, "Unable to locate SSL$COM:SSL$INIT_ENV.COM ..."
+$	  GOTO EXIT
+$     ENDIF
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Initialize the Menu Items
+$!------------------------------------------------------------------------------
+$!
+$ SET_MENU_DATA "View a Certificate#@SSL$COM:SSL$VIEW_CERT.COM CRT"
+$ SET_MENU_DATA "View a Certificate Signing Request#@SSL$COM:SSL$VIEW_CERT.COM CSR"
+$ SET_MENU_DATA "Create a Certificate Signing Request#@SSL$COM:SSL$RQST_CERT.COM"
+$ SET_MENU_DATA "Create a Self-Signed Certificate#@SSL$COM:SSL$SELF_CERT.COM"
+$ SET_MENU_DATA "Create a CA (Certification Authority) Certificate#@SSL$COM:SSL$AUTH_CERT.COM"
+$ SET_MENU_DATA "Sign a Certificate Signing Request#@SSL$COM:SSL$SIGN_CERT.COM"
+$ SET_MENU_DATA "Hash Certificates#@SSL$COM:SSL$HASH_CERT.COM CRT"
+$ SET_MENU_DATA "Hash Certificate Revocations#@SSL$COM:SSL$HASH_CERT.COM CRL"
+$ SET_MENU_DATA "Exit#GOTO EXIT"
+$!
+$!------------------------------------------------------------------------------
+$! Display the Page Header
+$!------------------------------------------------------------------------------
+$!
+$PAGE_LOOP:
+$!
+$ BCOLOR = BGD 
+$ FCOLOR = FGD + RED
+$ COLOR = ESC + "[''BCOLOR';''FCOLOR'm"
+$!
+$ TEXT = "SSL Certificate Tool"
+$ COL = (TT_COLS - (F$LENGTH (TEXT) * 2)) / 4
+$!
+$ SAY ESC + "[01;01H", CSCR
+$ SAY ESC + "[02;''COL'H", COLOR, WIDE, TEXT, NORM
+$!
+$ TEXT = "Main Menu"
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ SAY ESC + "[04;01H"
+$ SAY ESC + "[04;''COL'H", COLOR, TEXT, NORM
+$!
+$ CTR = 1
+$ ROW = 6
+$ COL = (TT_COLS - (SSL_MENU_ITEM_MAX + 4)) / 2
+$ TOP_ROW = ROW
+$ SEP_ROWS = 2
+$ MSG_ROW = TT_ROWS - 1
+$!
+$!------------------------------------------------------------------------------
+$! Process the menu options
+$!------------------------------------------------------------------------------
+$!
+$MENU_LOOP: 
+$!
+$ IF CTR .LE. SSL_MENU_DATA_MAX
+$ THEN
+$     OPT = F$ELEMENT (0,"#",SSL_MENU_DATA_'CTR') ! Option String
+$     CMD = F$ELEMENT (1,"#",SSL_MENU_DATA_'CTR') ! Command String
+$     IF ROW .GE. (MSG_ROW - (SEP_ROWS + 2)) .AND. SEP_ROWS .GT. 1
+$     THEN
+$         SAY ESC + "[''TOP_ROW';01H", CEOS
+$	  ROW = TOP_ROW
+$         SEP_ROWS = 1
+$         CTR = 1
+$     ELSE
+$	  NUM = F$FAO ("!2SL", CTR)
+$         SAY ESC + "[''ROW';''COL'H", BOLD, "''NUM'. ", NORM, "''OPT'"
+$         ROW = ROW + SEP_ROWS
+$         CTR = CTR + 1
+$     ENDIF	   
+$     GOTO MENU_LOOP
+$ ENDIF    
+$!
+$ ROW = ROW + 1
+$!
+$!------------------------------------------------------------------------------
+$! Prompt the user for input
+$!------------------------------------------------------------------------------
+$!
+$PROMPT_LOOP:
+$!
+$ PROMPT = ESC + "[''ROW';''COL'HEnter Option: ''CEOL'"
+$ ASK "''PROMPT'" OPT /END_OF_FILE=EXIT
+$ OPT = F$EDIT (OPT, "TRIM")
+$ IF OPT .EQS. ""  THEN GOTO PROMPT_LOOP
+$!
+$ IF F$TYPE (OPT) .NES. "INTEGER" .OR. -
+     F$INTEGER (OPT) .LE. 0 .OR. -
+     F$INTEGER (OPT) .GT. SSL_MENU_DATA_MAX
+$ THEN 
+$     CALL INVALID_OPTION
+$     GOTO PROMPT_LOOP
+$ ENDIF
+$!
+$ CMD = F$ELEMENT (1,"#",SSL_MENU_DATA_'OPT')
+$!
+$ 'CMD'
+$!
+$ GOTO PAGE_LOOP
+$!
+$!------------------------------------------------------------------------------
+$! Set the Menu Data
+$!------------------------------------------------------------------------------
+$!
+$SET_MENU_DATA: SUBROUTINE
+$!
+$ IF F$TYPE (SSL_MENU_DATA_MAX) .EQS. ""
+$ THEN
+$     SSL_MENU_DATA_MAX == 1
+$     SSL_MENU_ITEM_MAX == 0
+$ ELSE
+$     SSL_MENU_DATA_MAX == SSL_MENU_DATA_MAX + 1
+$ ENDIF
+$!
+$ SSL_MENU_DATA_'SSL_MENU_DATA_MAX' == "''P1'"
+$!
+$ MENU_ITEM = F$ELEMENT (0,"#",SSL_MENU_DATA_'SSL_MENU_DATA_MAX')
+$ IF F$LENGTH (MENU_ITEM) .GT. SSL_MENU_ITEM_MAX THEN SSL_MENU_ITEM_MAX == F$LENGTH (MENU_ITEM)
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Delete the Menu Data
+$!------------------------------------------------------------------------------
+$!
+$DEL_MENU_DATA: SUBROUTINE
+$!
+$ IF F$TYPE (SSL_MENU_DATA_MAX) .EQS. "" THEN GOTO DEL_MENU_DATA_END
+$!
+$DEL_MENU_DATA_LOOP:
+$!
+$ IF F$TYPE (SSL_MENU_DATA_'SSL_MENU_DATA_MAX') .NES. "" 
+$ THEN
+$     DELETE /SYMBOL /GLOBAL SSL_MENU_DATA_'SSL_MENU_DATA_MAX'
+$     SSL_MENU_DATA_MAX == SSL_MENU_DATA_MAX - 1
+$     GOTO DEL_MENU_DATA_LOOP
+$ ENDIF
+$!
+$ DELETE /SYMBOL /GLOBAL SSL_MENU_DATA_MAX
+$!
+$DEL_MENU_DATA_END:
+$!
+$ IF F$TYPE (SSL_MENU_ITEM_MAX) .NES. "" THEN DELETE /SYMBOL /GLOBAL SSL_MENU_ITEM_MAX
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Display the invalid entry 
+$!------------------------------------------------------------------------------
+$!
+$INVALID_OPTION: SUBROUTINE
+$!
+$ SAY ESC + "[''MSG_ROW';01H", BELL, " Invalid Option, Try again ...''CEOL'"
+$ Wait 00:00:01.5
+$ SAY ESC + "[''MSG_ROW';01H", CEOL
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Exit
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ DEL_MENU_DATA
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$conf_util.com
+++ b/VMS/cert_tool/ssl$conf_util.com
@@ -0,0 +1,220 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$CONF_UTIL.COM - SSL Configuration Utility procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure gets or sets a given key item in a SSL configuration file.
+$! The parameters used are:
+$!
+$! 	P1	- SSL Configuration File
+$! 	P2	- SSL Configuration Function (i.e. GET/SET)
+$! 	P3	- SSL Configuration Key/Item (delimited by '#')
+$! 	P4	- SSL Configuration Key/Item Value (for SET function only)
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ SSL_CONF_DATA == ""
+$ SAY := WRITE SYS$OUTPUT
+$ ASK := READ SYS$COMMAND /END_OF_FILE=EXIT /PROMPT=
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$!------------------------------------------------------------------------------
+$! Process parameters
+$!------------------------------------------------------------------------------
+$!
+$ KEY_FOUND = 0
+$ ITM_FOUND = 0
+$ P1 = F$EDIT (P1,"TRIM")
+$ P2 = F$EDIT (P2,"TRIM,UPCASE")
+$ KEY = F$ELEMENT (0,"#",P3)
+$ ITM = F$ELEMENT (1,"#",P3)
+$!
+$!------------------------------------------------------------------------------
+$! Process the configuration function
+$!------------------------------------------------------------------------------
+$!
+$ IF P2 .EQS. "GET" THEN GOSUB GET_CONF_DATA
+$ IF P2 .EQS. "SET" THEN GOSUB SET_CONF_DATA
+$!
+$ GOTO EXIT
+$!
+$!------------------------------------------------------------------------------
+$! Get the configuration data
+$!------------------------------------------------------------------------------
+$!
+$GET_CONF_DATA:
+$!
+$ OPEN /READ /ERROR=OPEN_ERROR IFILE 'P1'
+$!
+$GET_CONF_DATA_LOOP:
+$!
+$ READ /ERROR=READ_ERROR /END_OF_FILE=GET_CONF_DATA_END IFILE IREC
+$!
+$ SREC = IREC
+$ IPOS = F$LOCATE ("#",IREC)
+$ IF IPOS .NE. F$LENGTH (IREC) THEN IREC = F$EXTRACT (0,IPOS,IREC)
+$ IREC = F$EDIT (IREC,"COLLAPSE")
+
+$ IF IREC .EQS. "" THEN GOTO GET_CONF_DATA_LOOP
+$!
+$ IF IREC .EQS. KEY 
+$ THEN
+$     KEY_FOUND = 1
+$     GOTO GET_CONF_DATA_LOOP
+$ ENDIF
+$!
+$ IF KEY_FOUND .EQ. 1
+$ THEN 
+$     IF F$EXTRACT (0,1,IREC) .EQS. "[" .AND. F$EXTRACT (F$LENGTH (IREC)-1,1,IREC) .EQS. "]"
+$     THEN
+$         SSL_CONF_DATA == ""
+$         GOTO GET_CONF_DATA_END
+$     ENDIF
+$!
+$     IF ITM .EQS. F$EDIT (F$ELEMENT (0,"=",IREC),"TRIM")
+$     THEN 
+$         VAL = F$EDIT (F$ELEMENT (1,"=",SREC),"TRIM")
+$         SSL_CONF_DATA == "''VAL'"
+$         GOTO GET_CONF_DATA_END
+$     ENDIF
+$ ENDIF
+$!
+$ GOTO GET_CONF_DATA_LOOP
+$!
+$GET_CONF_DATA_END:
+$!
+$ CLOSE /ERROR=CLOSE_ERROR IFILE
+$!
+$ RETURN
+$!
+$!------------------------------------------------------------------------------
+$! Set the configuration data
+$!------------------------------------------------------------------------------
+$!
+$SET_CONF_DATA:
+$!
+$ IF F$SEARCH ("''P1'") .EQS. "" THEN CREATE /NOLOG 'P1'
+$!
+$ OPEN /READ  /ERROR=OPEN_ERROR IFILE 'P1'
+$ OPEN /WRITE /ERROR=OPEN_ERROR OFILE 'P1'
+$!
+$SET_CONF_DATA_LOOP:
+$!
+$ READ /ERROR=READ_ERROR /END_OF_FILE=SET_CONF_DATA_END IFILE IREC
+$!
+$ IF ITM_FOUND .EQ. 1
+$ THEN 
+$     WRITE /ERROR=WRITE_ERROR OFILE IREC
+$     GOTO SET_CONF_DATA_LOOP
+$ ENDIF
+$!
+$ SREC = IREC
+$ IPOS = F$LOCATE ("#",IREC)
+$ IF IPOS .NE. F$LENGTH (IREC) THEN IREC = F$EXTRACT (0,IPOS,IREC)
+$ IREC = F$EDIT (IREC,"COLLAPSE")
+$!
+$ IF IREC .EQS. ""
+$ THEN
+$     WRITE /ERROR=WRITE_ERROR OFILE SREC
+$     GOTO SET_CONF_DATA_LOOP
+$ ENDIF
+$!
+$ IF IREC .EQS. KEY 
+$ THEN
+$     KEY_FOUND = 1
+$     WRITE /ERROR=WRITE_ERROR OFILE SREC
+$     GOTO SET_CONF_DATA_LOOP
+$ ENDIF
+$!
+$ IF KEY_FOUND .EQ. 1
+$ THEN 
+$     IF F$EXTRACT (0,1,IREC) .EQS. "[" .AND. F$EXTRACT (F$LENGTH (IREC)-1,1,IREC) .EQS. "]"
+$     THEN
+$         WRITE /ERROR=WRITE_ERROR OFILE "''ITM' = ''P4'"
+$         WRITE /ERROR=WRITE_ERROR OFILE SREC
+$         ITM_FOUND = 1
+$         GOTO SET_CONF_DATA_LOOP
+$     ENDIF
+$!
+$     IF ITM .EQS. F$EDIT (F$ELEMENT (0,"=",IREC),"TRIM")
+$     THEN 
+$         WRITE /ERROR=WRITE_ERROR OFILE "''ITM' = ''P4'"
+$         ITM_FOUND = 1
+$         GOTO SET_CONF_DATA_LOOP
+$     ENDIF
+$ ENDIF
+$!
+$ WRITE /ERROR=WRITE_ERROR OFILE SREC
+$!
+$ GOTO SET_CONF_DATA_LOOP
+$!
+$SET_CONF_DATA_END:
+$!
+$ IF KEY_FOUND .EQ. 0 
+$ THEN
+$     WRITE /ERROR=WRITE_ERROR OFILE "''KEY'"
+$     WRITE /ERROR=WRITE_ERROR OFILE "''ITM' = ''P4'"
+$ ENDIF
+$!
+$ IF KEY_FOUND .EQ. 1 .AND. ITM_FOUND .EQ. 0
+$ THEN
+$     WRITE /ERROR=WRITE_ERROR OFILE "''ITM' = ''P4'"
+$ ENDIF
+$!
+$ CLOSE IFILE
+$ CLOSE OFILE
+$!
+$ RETURN
+$!
+$!------------------------------------------------------------------------------
+$! File Errors
+$!------------------------------------------------------------------------------
+$!
+$OPEN_ERROR:
+$!
+$ SAY "Open error for file ''P1' ... aborting ''P2'"
+$ GOTO EXIT
+$!
+$READ_ERROR:
+$!
+$ SAY "Read error for file ''P1' ... aborting ''P2'"
+$ GOTO EXIT
+$!
+$WRITE_ERROR:
+$!
+$ SAY "Write error for file ''P1' ... aborting ''P2'"
+$ GOTO EXIT
+$!
+$CLOSE_ERROR:
+$!
+$ SAY "Close error for file ''P1' ... aborting ''P2'"
+$ GOTO EXIT
+$!
+$!------------------------------------------------------------------------------
+$! Exit
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ CLOSE IFILE
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ CLOSE OFILE
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT 1
--- a/VMS/cert_tool/ssl$draw_box.com
+++ b/VMS/cert_tool/ssl$draw_box.com
@@ -0,0 +1,109 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$DRAW_BOX.COM - SSL Draw Box procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure draws a box with the specified coordinates.
+$!
+$! The parameters used are:
+$!
+$! 	P1	- X1 coordinate
+$! 	P2	- Y1 coordinate
+$! 	P3	- X2 coordinate
+$! 	P4	- Y3 coordinate
+$! 	P5	- Box Header (Optional)
+$! 	P6	- Box Footer (Optional)
+$! 	P7	- Fill Box (Optional)
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ SAY := WRITE SYS$OUTPUT
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ FILL_BOX := @SSL$COM:SSL$FILL_BOX
+$!
+$ ESC[0,8] = 27 	! Set the Escape Character
+$ GRPH_ON[0,8] = 14	! Turn GRAPHICS mode On 
+$ GRPH_OFF[0,8] = 15	! Turn GRAPHICS mode Off
+$ NORM = ESC + "[0m"	! Turn Attributes off
+$ BOLD = ESC + "[1m"    ! Turn on BOLD Attribute
+$!
+$!------------------------------------------------------------------------------
+$! Draw the box
+$!------------------------------------------------------------------------------
+$!
+$ X1 = F$INTEGER (P1)
+$ Y1 = F$INTEGER (P2)
+$ X2 = F$INTEGER (P3)
+$ Y2 = F$INTEGER (P4)
+$!
+$ ROW = Y1 + 1
+$ COL = X1 + 1
+$ SIDE1 = X1
+$ SIDE2 = X2 + 1
+$ TOP = "l" + F$FAO("!#*q", x2 - x1) + "k"
+$ BOT = "m" + F$FAO("!#*q", x2 - x1) + "j"
+$!
+$ SAY ESC + "[''Y1';''X1'H", BOLD, GRPH_ON, TOP, GRPH_OFF, NORM
+$!
+$SIDES:
+$!
+$ SAY ESC + "[''ROW';''SIDE1'H",BOLD,GRPH_ON,"x",GRPH_OFF,NORM
+$ SAY ESC + "[''ROW';''SIDE2'H",BOLD,GRPH_ON,"x",GRPH_OFF,NORM
+$!
+$ IF ROW .LT. Y2
+$ THEN
+$     ROW = ROW + 1
+$     GOTO SIDES
+$ ENDIF  
+$!
+$ SAY ESC + "[''Y2';''X1'H", BOLD, GRPH_ON, BOT, GRPH_OFF, NORM
+$!
+$ IF P5 .NES. "" 
+$ THEN 
+$     IF F$LENGTH(P5) .GT. X2 - X1
+$     THEN 
+$	  HEADER = F$EXTRACT (0, (X2 - X1 - 4), P5)
+$     ELSE
+$	  HEADER = P5
+$     ENDIF
+$     COL = X1 + ((X2 - X1 - F$LENGTH(HEADER)) / 2)
+$     SAY ESC + "[''Y1';''COL'H''BOLD'''HEADER'''NORM'"
+$ ENDIF
+$!
+$ IF P6 .NES. "" 
+$ THEN 
+$     IF F$LENGTH(P6) .GT. X2 - X1
+$     THEN 
+$	  FOOTER = F$EXTRACT (0, (X2 - X1 - 4), P6)
+$     ELSE
+$	  FOOTER = P6
+$     ENDIF
+$     COL = X1 + ((X2 - X1 - F$LENGTH(FOOTER)) / 2)
+$     SAY ESC + "[''Y2';''COL'H''BOLD'''FOOTER'''NORM'"
+$ ENDIF
+$!
+$ IF P7 .EQS. "" .OR. P7 .EQS. "Y" THEN FILL_BOX 'X1' 'Y1' 'X2' 'Y2'
+$!
+$ GOTO EXIT
+$!
+$!------------------------------------------------------------------------------
+$! Exit 
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$exit_cmd.tpu
+++ b/VMS/cert_tool/ssl$exit_cmd.tpu
@@ -0,0 +1 @@
+EXIT
--- a/VMS/cert_tool/ssl$fill_box.com
+++ b/VMS/cert_tool/ssl$fill_box.com
@@ -0,0 +1,65 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$FILL_BOX.COM - SSL Fill Box procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure draws a box with the specified coordinates.
+$!
+$! The parameters used are:
+$!
+$! 	P1	- X1 coordinate
+$! 	P2	- Y1 coordinate
+$! 	P3	- X2 coordinate
+$! 	P4	- Y2 coordinate
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ SAY := WRITE SYS$OUTPUT
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ ESC[0,8] = 27 	! Set the Escape Character
+$!
+$!------------------------------------------------------------------------------
+$! Draw the box
+$!------------------------------------------------------------------------------
+$!
+$ X1 = F$INTEGER (P1)
+$ Y1 = F$INTEGER (P2)
+$ X2 = F$INTEGER (P3)
+$ Y2 = F$INTEGER (P4)
+$!
+$ ROW = Y1 + 1
+$ COL = X1 + 1
+$ FILL = F$FAO("!#* ", X2 - X1)
+$!
+$FILL_LOOP:
+$!
+$ IF ROW .LT. Y2
+$ THEN
+$     SAY ESC + "[''ROW';''COL'H",FILL
+$     ROW = ROW + 1
+$     GOTO FILL_LOOP
+$ ENDIF  
+$!
+$ GOTO EXIT
+$!
+$!------------------------------------------------------------------------------
+$! Exit 
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$hash_cert.com
+++ b/VMS/cert_tool/ssl$hash_cert.com
@@ -0,0 +1,235 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$HASH_CERT.COM - SSL Hash Certificate procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure prompts the user through hashing Certificates.
+$!
+$! The parameters used are:
+$!
+$! 	P1	- Certificate or Certificate Revocation List (i.e. "CRT" or "CRL")
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ DELETE := DELETE
+$ SAY := WRITE SYS$OUTPUT
+$ ASK := READ SYS$COMMAND /END_OF_FILE=EXIT /PROMPT=
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ TT_ROWS = F$GETDVI ("TT:","TT_PAGE")
+$ TT_COLS = F$GETDVI ("TT:","DEVBUFSIZ")
+$!
+$ INIT_TERM := @SSL$COM:SSL$INIT_TERM
+$!
+$ ESC[0,8] = 27 	! Set the Escape Character
+$ BELL[0,8] = 7 	! Ring the terminal Bell
+$ RED = 1		! Color - Red
+$ FGD = 30		! Foreground
+$ BGD = 0		! Background
+$ CSCR = ESC + "[2J"	! Clear the Screen 
+$ CEOS = ESC + "[0J"	! Clear to the End of the Screen 
+$ CEOL = ESC + "[0K"	! Clear to the End of the Line
+$ NORM = ESC + "[0m"	! Turn Attributes off
+$ BLNK = ESC + "[5m"    ! Turn on BLINK Attribute
+$ WIDE = ESC + "#6"     ! Turn on WIDE Attribute
+$!
+$!------------------------------------------------------------------------------
+$! Run the SSL setup if it hasn't been run yet
+$!------------------------------------------------------------------------------
+$!
+$ IF F$TRNLNM ("SSL$ROOT") .EQS. ""
+$ THEN
+$     IF F$SEARCH ("SSL$COM:SSL$INIT_ENV.COM") .NES. ""
+$     THEN 
+$         @SSL$COM:SSL$INIT_ENV.COM
+$     ELSE
+$         SAY BELL, "Unable to locate SSL$COM:SSL$INIT_ENV.COM ..."
+$	  GOTO EXIT
+$     ENDIF
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Display the Page Header
+$!------------------------------------------------------------------------------
+$!
+$ INIT_TERM
+$ BCOLOR = BGD
+$ FCOLOR = FGD + RED
+$ COLOR = ESC + "[''BCOLOR';''FCOLOR'm"
+$!
+$ TEXT = "SSL Certificate Tool"
+$ COL = (TT_COLS - (F$LENGTH (TEXT) * 2)) / 4
+$!
+$ SAY ESC + "[01;01H", CSCR
+$ SAY ESC + "[02;''COL'H", COLOR, WIDE, TEXT, NORM
+$!
+$ IF P1 .EQS. "CRT"
+$ THEN 
+$     TEXT = "Hash Certification Authorities"
+$ ELSE
+$     TEXT = "Hash Certificate Revocations"
+$ ENDIF
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ SAY ESC + "[04;01H"
+$ SAY ESC + "[04;''COL'H", COLOR, TEXT, NORM
+$!
+$ CTR = 1
+$ ROW = 6
+$ COL = 2
+$ TOP_ROW = ROW
+$ MSG_ROW = TT_ROWS - 1
+$!
+$!------------------------------------------------------------------------------
+$! Initialize the Request Data
+$!------------------------------------------------------------------------------
+$!
+$ IF P1 .EQS. "CRT"
+$ THEN 
+$     PRM = "Certificate Path:"
+$     DEF = "SSL$CRT:*.CRT"
+$ ENDIF
+$!
+$ IF P1 .EQS. "CRL"
+$ THEN 
+$     PRM = "Certificate Revocation Path:"
+$     DEF = "SSL$CRT:*.CRL"
+$ ENDIF
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$!
+$!------------------------------------------------------------------------------
+$! Confirm/Update the SSL Configuration Data
+$!------------------------------------------------------------------------------
+$!
+$PROMPT_LOOP:
+$!
+$ PROMPT = ESC + "[''ROW';''COL'H''PRM' ? [''DEF'] ''CEOL'"
+$ ASK "''PROMPT'" _hash_path_name
+$ _hash_path_name = F$EDIT (_hash_path_name,"TRIM")
+$ IF _hash_path_name .EQS. "" THEN _hash_path_name = DEF
+$!
+$ HASH_DEV = F$PARSE (_hash_path_name,DEF,,"DEVICE")
+$ HASH_DIR = F$PARSE (_hash_path_name,DEF,,"DIRECTORY")
+$ HASH_NAM = F$PARSE (_hash_path_name,DEF,,"NAME")
+$ HASH_TYP = F$PARSE (_hash_path_name,DEF,,"TYPE")
+$ _hash_path_name = HASH_DEV + HASH_DIR + HASH_NAM + HASH_TYP
+$!
+$!------------------------------------------------------------------------------
+$! Create the Certificiate Hashes 
+$!------------------------------------------------------------------------------
+$!
+$ IF P1 .EQS. "CRT"
+$ THEN 
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Hashing Certificate Authorities ...", NORM, CEOL
+$ ENDIF
+$!
+$ IF P1 .EQS. "CRL"
+$ THEN 
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Hashing Certificate Revocations ...", NORM, CEOL
+$ ENDIF
+$!
+$ IF F$SEARCH ("''HASH_DEV'''HASH_DIR'DELETE_HASH_FILES.COM") .NES. ""
+$ THEN 
+$    @'HASH_DEV''HASH_DIR'DELETE_HASH_FILES.COM
+$    DELETE 'HASH_DEV''HASH_DIR'DELETE_HASH_FILES.COM;*
+$ ENDIF
+$!
+$ CTR = 0
+$!     
+$ OPEN /WRITE OFILE 'HASH_DEV''HASH_DIR'DELETE_HASH_FILES.COM
+$!
+$CERT_LOOP:
+$!
+$ CERT_FILE = F$SEARCH ("''_hash_path_name'", 1)
+$ IF CERT_FILE .EQS. "" THEN GOTO CERT_END
+$ CTR = CTR + 1
+$!
+$ CALL HASH_CERT 'P1' 'CERT_FILE'
+$!
+$ GOTO CERT_LOOP
+$!
+$CERT_END:
+$!
+$ CLOSE OFILE
+$!
+$ IF CTR .EQ. 0 
+$ THEN 
+$     TEXT = "No files found, Press return to continue"
+$ ELSE
+$     TEXT = "Press return to continue"
+$ ENDIF
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ IF CTR .EQ. 0 
+$ THEN 
+$     SAY BELL, ESC + "[''MSG_ROW';01H", CEOS
+$ ELSE
+$     SAY ESC + "[''MSG_ROW';01H", CEOS
+$ ENDIF
+$ PROMPT = ESC + "[''MSG_ROW';''COL'H''TEXT'"
+$ ASK "''PROMPT'" OPT
+$!
+$ GOTO EXIT
+$!
+$!------------------------------------------------------------------------------
+$! Hash Certificate Subroutine
+$!------------------------------------------------------------------------------
+$!
+$HASH_CERT: SUBROUTINE
+$!
+$ IF P1 .EQS. "CRT"
+$ THEN 
+$     HASH_SUFF = ""
+$     HASH_FUNC = "$SSL$EXE:OPENSSL X509 -HASH -NOOUT -IN"
+$ ELSE
+$     HASH_SUFF = "R"
+$     HASH_FUNC = "$SSL$EXE:OPENSSL CRL -HASH -NOOUT -IN"
+$ ENDIF
+$!
+$ PIPE HASH_FUNC 'P2' | (READ SYS$INPUT VAL ; DEFINE/NOLOG/JOB HASH_VAL &VAL)
+$ HASH_VAL = F$TRNLNM ("HASH_VAL")
+$ DEASSIGN /JOB HASH_VAL
+$!
+$ IDX = 0
+$!
+$IDX_LOOP:
+$!
+$ HASH_FILE = "''HASH_DEV'''HASH_DIR'''HASH_VAL'.''HASH_SUFF'''IDX'"
+$ IF F$SEARCH ("''HASH_FILE'") .NES. ""
+$ THEN
+$     IDX = IDX + 1
+$     GOTO IDX_LOOP
+$ ENDIF
+$!
+$ COPY 'P2' 'HASH_FILE'
+$ WRITE OFILE "$ DELETE ''HASH_FILE';*"
+$!
+$ EXIT
+$!
+$ ENDSUBOUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Exit the procedure
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ CLOSE OFILE
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$init_env.com
+++ b/VMS/cert_tool/ssl$init_env.com
@@ -0,0 +1,61 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$INIT_ENV.COM - SSL Initialize Environment
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure sets up the SSL environment logicals & symbols.
+$!
+$! P1 = Mode of the logicals (ie - "/SYSTEM/EXECUTIVE_MODE").
+$!      Note - if P1 is not passed in, P1 will default to PROCESS.
+$!
+$!------------------------------------------------------------------------------
+$! Initialization 
+$!------------------------------------------------------------------------------
+$!
+$ IF F$TRNLNM("SSL$ROOT") .EQS. ""
+$ THEN
+$    WRITE SYS$OUTPUT " "
+$    WRITE SYS$OUTPUT " SSL-E-ERROR, SSL has not been started."
+$    WRITE SYS$OUTPUT " "
+$    WRITE SYS$OUTPUT " Execute the command procedure, SYS$STARTUP:SSL$STARTUP.COM, and then try this procedure again."
+$    WRITE SYS$OUTPUT " "
+$    EXIT
+$ ENDIF
+$!
+$ IF P1 .EQS. ""
+$ THEN
+$    P1 = "/PROCESS"
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Define logicals
+$!------------------------------------------------------------------------------
+$!
+$ DEFINE 'P1 	SSL$CA_CONF	SSL$ROOT:[CONF]SSL$CA.CNF
+$ DEFINE 'P1 	SSL$CONF	SSL$ROOT:[CONF]SSL$CERT.CNF
+$ DEFINE 'P1 	SSL$COM		SSL$ROOT:[COM]
+$ DEFINE 'P1	SSL$CRT		SSL$ROOT:[CERTS]
+$ DEFINE 'P1 	SSL$CSR		SSL$ROOT:[CERTS]
+$ DEFINE 'P1 	SSL$KEY		SSL$ROOT:[CERTS]
+$ DEFINE 'P1 	SSL$DB		SSL$ROOT:[PRIVATE]
+$!
+$!------------------------------------------------------------------------------
+$! Define foreign symbols
+$!------------------------------------------------------------------------------
+$!
+$ OPENSSL	:== $ SSL$EXE:OPENSSL
+$ HOSTADDR	:== $ SSL$EXE:SSL$HOSTADDR
+$ HOSTNAME	:== $ SSL$EXE:SSL$HOSTNAME
+$!
+$!------------------------------------------------------------------------------
+$! Exit
+$!------------------------------------------------------------------------------
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$init_term.com
+++ b/VMS/cert_tool/ssl$init_term.com
@@ -0,0 +1,55 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$INIT_TERM.COM - SSL Initialize Terminal procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure initializes the terminal attributes.
+$!
+$! The parameters used are:
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ EDIT := EDIT
+$!
+$!------------------------------------------------------------------------------
+$! Initialize the terminal with TPU
+$!------------------------------------------------------------------------------
+$!
+$ IF F$SEARCH ("SSL$COM:SSL$EXIT_CMD.TPU") .EQS. ""
+$ THEN 
+$     OPEN /WRITE OFILE SSL$COM:SSL$EXIT_CMD.TPU
+$     WRITE OFILE "EXIT"
+$     CLOSE OFILE
+$ ENDIF
+$!
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$INPUT  SYS$COMMAND
+$ EDIT /TPU /COMMAND=OPENSS$COM:SSL$EXIT_CMD.TPU
+$!
+$!------------------------------------------------------------------------------
+$! Exit 
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ CLOSE OFILE
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$pick_file.com
+++ b/VMS/cert_tool/ssl$pick_file.com
@@ -0,0 +1,230 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$PICK_FILE.COM - SSL Pick File procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure display the contents of a given file in a box size specified.
+$!
+$! The parameters used are:
+$!
+$! 	P1	- File Spec to Parse
+$! 	P2	- X1 coordinate
+$! 	P3	- Y1 coordinate
+$! 	P4	- X2 coordinate
+$! 	P5	- Y3 coordinate
+$! 	P6	- File Pick Header (Optional)
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ SSL_FILE_NAME == ""
+$ SAY := WRITE SYS$OUTPUT
+$ ASK := READ SYS$COMMAND /END_OF_FILE=EXIT /PROMPT=
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ DRAW_BOX := @SSL$COM:SSL$DRAW_BOX
+$ FILL_BOX := @SSL$COM:SSL$FILL_BOX
+$!
+$ ESC[0,8] = 27 	! Set the Escape Character
+$ BELL[0,8] = 7 	! Ring the terminal Bell
+$ CEOL = ESC + "[0K"	! Clear to the End of the Line
+$ NORM = ESC + "[0m"	! Turn Attributes off
+$ BOLD = ESC + "[1m"    ! Turn on BOLD Attribute
+$!
+$!------------------------------------------------------------------------------
+$! Display the Page Header
+$!------------------------------------------------------------------------------
+$!
+$ P1 = F$EDIT (P1, "TRIM")
+$ P2 = F$INTEGER (P2)
+$ P3 = F$INTEGER (P3)
+$ P4 = F$INTEGER (P4)
+$ P5 = F$INTEGER (P5)
+$ FILE_MAX = 0
+$!
+$SEARCH_LOOP:
+$!
+$ FILE = F$SEARCH ("''P1'",1)
+$ IF FILE .NES. ""
+$ THEN 
+$     IF FILE_MAX .EQ. 1
+$     THEN
+$         IF FILE_1 .EQS. FILE THEN GOTO SEARCH_END
+$     ENDIF
+$     FILE_MAX = FILE_MAX + 1
+$     FILE_'FILE_MAX' = FILE
+$     GOTO SEARCH_LOOP
+$ ENDIF
+$!
+$SEARCH_END:
+$!
+$ IF FILE_MAX .EQ. 0 
+$ THEN 
+$     DRAW_BOX 'P2' 'P3' 'P4' 'P5' "''P6'" " No Files Found, Press Return to Exit "
+$     INPUT_ROW = P5 + 1
+$     PROMPT = ESC + "[''INPUT_ROW';01H ''CEOL'"
+$     ASK "''PROMPT'" OPT
+$     GOTO EXIT
+$ ENDIF
+$!
+$ COL = P2 + 2
+$ ROW = P3 + 2
+$ TOP_ROW = ROW
+$ INPUT_ROW = P5 + 1
+$ BOX_WIDTH = P4 - (P2 + 2)
+$ BOX_HEIGHT = P5 - (P3 + 3)
+$!
+$ FILE_CTR = 1
+$ PAGE_CTR = 1
+$ PAGE_'PAGE_CTR'_FILE_CTR = FILE_CTR
+$ FILES_PER_PAGE = BOX_HEIGHT
+$ PAGE_MAX = FILE_MAX / FILES_PER_PAGE
+$ IF PAGE_MAX * FILES_PER_PAGE .LT. FILE_MAX THEN PAGE_MAX = PAGE_MAX + 1
+$!
+$ DRAW_BOX 'P2' 'P3' 'P4' 'P5' "''P6'" " Enter B for Back, N for Next, Ctrl-Z to Exit or Enter a File Number "
+$ PAGE_TXT = F$FAO (" Page !UL of !UL ", PAGE_CTR, PAGE_MAX)
+$ _COL = P2 + (BOX_WIDTH - F$LENGTH (PAGE_TXT)) + 2
+$ SAY ESC + "[''P3';''_COL'H''BOLD'''PAGE_TXT'''NORM'"
+$!
+$DISPLAY_LOOP:
+$!
+$ IF FILE_CTR .LE. FILE_MAX .AND. F$TYPE (FILE_'FILE_CTR') .NES. ""
+$ THEN 
+$     FILE = FILE_'FILE_CTR'
+$ ELSE
+$     FILE = ""
+$ ENDIF
+$ WRAP_IN_PROGRESS = 0
+$!
+$WRAP_LOOP:
+$!
+$ IF ROW .LE. (P5 - 2) .AND. -
+     FILE_CTR .LE. PAGE_CTR * FILES_PER_PAGE
+$ THEN
+$     IF F$LENGTH (FILE) .GT. BOX_WIDTH 
+$     THEN 
+$ 	  IF WRAP_IN_PROGRESS .EQ. 0
+$	  THEN 
+$	      CTR_TXT = F$FAO ("!3UL. ",FILE_CTR)
+$	      WRAP_IN_PROGRESS = 1
+$	  ELSE
+$	      CTR_TXT = "     "
+$         ENDIF
+$	  FILE_SEG = F$EXTRACT (0, BOX_WIDTH - F$LENGTH (CTR_TXT), FILE)
+$         SAY ESC + "[''ROW';''COL'H''BOLD'''CTR_TXT'''NORM'''FILE_SEG'"
+$         FILE = F$EXTRACT (BOX_WIDTH - F$LENGTH (CTR_TXT), F$LENGTH (FILE) - (BOX_WIDTH + F$LENGTH (CTR_TXT)), FILE)
+$         ROW = ROW + 1
+$	  GOTO WRAP_LOOP
+$     ELSE
+$	  IF FILE .NES. ""
+$	  THEN
+$ 	      IF WRAP_IN_PROGRESS .EQ. 0
+$	      THEN 
+$	          CTR_TXT = F$FAO ("!3UL. ",FILE_CTR)
+$	      ELSE
+$	          CTR_TXT = "     "
+$             ENDIF
+$             SAY ESC + "[''ROW';''COL'H''BOLD'''CTR_TXT'''NORM'''FILE'"
+$	  ENDIF
+$     ENDIF
+$ ELSE
+$!
+$RETRY:
+$!
+$     PROMPT = ESC + "[''INPUT_ROW';01H ''CEOL'"
+$     ASK "''PROMPT'" OPT
+$     IF F$TYPE (OPT) .NES. "INTEGER" .AND. -
+         F$EDIT (OPT,"TRIM,UPCASE") .NES. "B" .AND. -
+	 F$EDIT (OPT,"TRIM,UPCASE") .NES. "N" 
+$     THEN
+$         CALL INVALID_ENTRY
+$	  GOTO RETRY
+$     ENDIF
+$     IF F$TYPE (OPT) .EQS. "INTEGER" 
+$     THEN
+$	  IF OPT .GT. 0 .AND. -
+  	     OPT .LE. FILE_MAX .AND. -
+	     OPT .LE. (FILE_CTR - 1) .AND. -
+	     OPT .GE. (FILE_CTR - 1 - FILES_PER_PAGE)
+$	  THEN 
+$	      SSL_FILE_NAME == FILE_'OPT'
+$	      GOTO EXIT
+$	  ELSE
+$             CALL INVALID_ENTRY
+$	      GOTO RETRY
+$	  ENDIF
+$     ENDIF
+$     IF F$EDIT (OPT,"TRIM,UPCASE") .EQS. "B"
+$     THEN
+$	  IF PAGE_CTR .GT. 1
+$	  THEN
+$ 	      ROW = TOP_ROW
+$	      PAGE_CTR = PAGE_CTR - 1
+$ 	      FILE_CTR = PAGE_'PAGE_CTR'_FILE_CTR
+$             PAGE_TXT = F$FAO (" Page !UL of !UL ", PAGE_CTR, PAGE_MAX)
+$             _COL = P2 + (BOX_WIDTH - F$LENGTH (PAGE_TXT)) + 2
+$             SAY ESC + "[''P3';''_COL'H''BOLD'''PAGE_TXT'''NORM'"
+$             FILL_BOX 'P2' 'P3' 'P4' 'P5'
+$	      GOTO DISPLAY_LOOP
+$	  ELSE
+$             CALL INVALID_ENTRY
+$	      GOTO RETRY
+$         ENDIF
+$     ENDIF
+$     IF F$EDIT (OPT,"TRIM,UPCASE") .EQS. "N"
+$     THEN
+$	  IF PAGE_CTR .LT. PAGE_MAX
+$	  THEN
+$	      PAGE_CTR = PAGE_CTR + 1
+$ 	      PAGE_'PAGE_CTR'_FILE_CTR = FILE_CTR
+$ 	      FILE_CTR = PAGE_'PAGE_CTR'_FILE_CTR
+$             PAGE_TXT = F$FAO (" Page !UL of !UL ", PAGE_CTR, PAGE_MAX)
+$             _COL = P2 + (BOX_WIDTH - F$LENGTH (PAGE_TXT)) + 2
+$             SAY ESC + "[''P3';''_COL'H''BOLD'''PAGE_TXT'''NORM'"
+$             FILL_BOX 'P2' 'P3' 'P4' 'P5'
+$	  ELSE
+$             CALL INVALID_ENTRY
+$	      GOTO RETRY
+$         ENDIF
+$     ENDIF
+$     FILL_BOX 'P2' 'P3' 'P4' 'P5'
+$     ROW = TOP_ROW
+$     GOTO WRAP_LOOP
+$ ENDIF
+$ FILE_CTR = FILE_CTR + 1
+$ ROW = ROW + 1
+$ GOTO DISPLAY_LOOP
+$!
+$!------------------------------------------------------------------------------
+$! Display the invalid entry 
+$!------------------------------------------------------------------------------
+$!
+$INVALID_ENTRY: SUBROUTINE
+$!
+$ SAY ESC + "[''INPUT_ROW';01H", BELL, " Invalid Entry, Try again ...''CEOL'"
+$ Wait 00:00:01.5
+$ SAY ESC + "[''INPUT_ROW';01H", CEOL
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Exit
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$rem_env.com
+++ b/VMS/cert_tool/ssl$rem_env.com
@@ -0,0 +1,62 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$REM_ENV.COM - Remove the SSL Initialize Environment
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure deletes the SSL environment logicals & symbols set up by
+$! SSL$INIT_ENV.COM.
+$!
+$! P1 = Mode of the logicals (ie - "/SYSTEM/EXECUTIVE_MODE").
+$!      Note - if P1 is not passed in, P1 will default to PROCESS.
+$!
+$!------------------------------------------------------------------------------
+$! Initialization 
+$!------------------------------------------------------------------------------
+$!
+$ IF F$TRNLNM("SSL$ROOT") .EQS. ""
+$ THEN
+$    WRITE SYS$OUTPUT " "
+$    WRITE SYS$OUTPUT " SSL-E-ERROR, SSL has not been started."
+$    WRITE SYS$OUTPUT " "
+$    WRITE SYS$OUTPUT " Execute the command procedure, SYS$STARTUP:SSL$STARTUP.COM, and then try this procedure again."
+$    WRITE SYS$OUTPUT " "
+$    EXIT
+$ ENDIF
+$!
+$ IF P1 .EQS. ""
+$ THEN
+$    P1 = "/PROCESS"
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Define logicals
+$!------------------------------------------------------------------------------
+$!
+$ DEASSIGN 'P1 	SSL$CA_CONF
+$ DEASSIGN 'P1 	SSL$CONF
+$ DEASSIGN 'P1 	SSL$COM
+$ DEASSIGN 'P1	SSL$CRT
+$ DEASSIGN 'P1 	SSL$CSR
+$ DEASSIGN 'P1 	SSL$KEY
+$ DEASSIGN 'P1 	SSL$DB
+$!
+$!------------------------------------------------------------------------------
+$! Define foreign symbols
+$!------------------------------------------------------------------------------
+$!
+$ DELETE/SYMBOL/GLOBAL OPENSSL
+$ DELETE/SYMBOL/GLOBAL HOSTADDR
+$ DELETE/SYMBOL/GLOBAL HOSTNAME
+$!
+$!------------------------------------------------------------------------------
+$! Exit
+$!------------------------------------------------------------------------------
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$rqst_cert.com
+++ b/VMS/cert_tool/ssl$rqst_cert.com
@@ -0,0 +1,769 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$RQST_CERT.COM - SSL Certificate Request procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure prompts the user through creating a Certificate Request.
+$!
+$! There are no parameters used.
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ DELETE := DELETE
+$ SAY := WRITE SYS$OUTPUT
+$ ASK := READ SYS$COMMAND /END_OF_FILE=EXIT /PROMPT=
+$ PID = F$GETJPI ("","PID")
+$ TT_NOECHO = F$GETDVI ("TT:","TT_NOECHO")
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ TT_ROWS = F$GETDVI ("TT:","TT_PAGE")
+$ TT_COLS = F$GETDVI ("TT:","DEVBUFSIZ")
+$!
+$ GET_USER_DATA := CALL GET_USER_DATA
+$ SET_USER_DATA := CALL SET_USER_DATA
+$ DEL_USER_DATA := CALL DEL_USER_DATA
+$ INIT_TERM := @SSL$COM:SSL$INIT_TERM
+$ SHOW_FILE := @SSL$COM:SSL$SHOW_FILE 
+$ SSL_CONF_FILE = F$TRNLNM ("SSL$CONF")
+$ GET_CONF_DATA := @SSL$COM:SSL$CONF_UTIL 'SSL_CONF_FILE' GET
+$ SET_CONF_DATA := @SSL$COM:SSL$CONF_UTIL 'SSL_CONF_FILE' SET
+$!
+$ ESC[0,8] = 27 	! Set the Escape Character
+$ BELL[0,8] = 7 	! Ring the terminal Bell
+$ RED = 1		! Color - Red
+$ FGD = 30		! Foreground
+$ BGD = 0		! Background
+$ CSCR = ESC + "[2J"	! Clear the Screen 
+$ CEOS = ESC + "[0J"	! Clear to the End of the Screen 
+$ CEOL = ESC + "[0K"	! Clear to the End of the Line
+$ NORM = ESC + "[0m"	! Turn Attributes off
+$ BLNK = ESC + "[5m"    ! Turn on BLINK Attribute
+$ WIDE = ESC + "#6"     ! Turn on WIDE Attribute
+$!
+$!------------------------------------------------------------------------------
+$! Run the SSL setup if it hasn't been run yet
+$!------------------------------------------------------------------------------
+$!
+$ IF F$TRNLNM ("SSL$ROOT") .EQS. ""
+$ THEN
+$     IF F$SEARCH ("SSL$COM:SSL$INIT_ENV.COM") .NES. ""
+$     THEN 
+$         @SSL$COM:SSL$INIT_ENV.COM
+$     ELSE
+$         SAY BELL, "Unable to locate SSL$COM:SSL$INIT_ENV.COM ..."
+$	  GOTO EXIT
+$     ENDIF
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Display the Page Header
+$!------------------------------------------------------------------------------
+$!
+$ INIT_TERM
+$ BCOLOR = BGD
+$ FCOLOR = FGD + RED
+$ COLOR = ESC + "[''BCOLOR';''FCOLOR'm"
+$!
+$ TEXT = "SSL Certificate Tool"
+$ COL = (TT_COLS - (F$LENGTH (TEXT) * 2)) / 4
+$!
+$ SAY ESC + "[01;01H", CSCR
+$ SAY ESC + "[02;''COL'H", COLOR, WIDE, TEXT, NORM
+$!
+$ TEXT = "Create Certificate Request"
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ SAY ESC + "[04;01H"
+$ SAY ESC + "[04;''COL'H", COLOR, TEXT, NORM
+$!
+$ ROW = 6
+$ COL = 2
+$ TOP_ROW = ROW
+$ MSG_ROW = TT_ROWS - 1
+$!
+$!------------------------------------------------------------------------------
+$! Initialize the Request Data
+$!------------------------------------------------------------------------------
+$!
+$ IF F$SEARCH ("''SSL_CONF_FILE'") .NES. ""
+$ THEN 
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Reading Configuration ...", NORM
+$ ELSE
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Initializing Configuration ...", NORM
+$ ENDIF
+$!
+$ _request_name = "req"
+$!
+$ _distinguished_name = "REQ_distinguished_name"
+$ _distinguished_name_upd = "Y"
+$!
+$ _default_bits = "1024"
+$ _default_bits_upd = "Y"
+$!
+$ _default_keyfile = "SSL$KEY:SERVER.KEY"
+$ _default_keyfile_upd = "Y"
+$!
+$ _default_csrfile = "SSL$CSR:SERVER.CSR"
+$ _default_csrfile_upd = "Y"
+$!
+$ _countryName_prompt = "Country Name ?"
+$ _countryName_min = "2"
+$ _countryName_max = "2"
+$ _countryName_default = "US"
+$ _countryName_upd = "Y"
+$ _countryName_cnt = 4
+$!
+$ _stateOrProvinceName_prompt = "State or Province Name ?"
+$ _stateOrProvinceName_default = ""
+$ _stateOrProvinceName_upd = "Y"
+$ _stateOrProvinceName_cnt = 2
+$!
+$ _localityName_prompt = "City Name ?"
+$ _localityName_default = ""
+$ _localityName_upd = "Y"
+$ _localityName_cnt = 2
+$!
+$ _0organizationName_prompt = "Organization Name ?"
+$ _0organizationName_default = ""
+$ _0organizationName_upd = "Y"
+$ _0organizationName_cnt = 2
+$!
+$ _organizationalUnitName_prompt = "Organization Unit Name ?"
+$ _organizationalUnitName_default = ""
+$ _organizationalUnitName_upd = "Y"
+$ _organizationalUnitName_cnt = 2
+$!
+$ _commonName_prompt = "Common Name ?"
+$ _commonName_max = "64"
+$ HOSTNAME -s _commonName_default
+$ _commonName_upd = "Y"
+$ _commonName_cnt = 3
+$!
+$ _emailAddress_prompt = "Email Address ?"
+$ _emailAddress_max = "40"
+$ _emailAddress_default = "webmaster@''_commonName_default'"
+$ _emailAddress_upd = "Y"
+$ _emailAddress_cnt = 3
+$!
+$ IF F$SEARCH ("''SSL_CONF_FILE'") .NES. ""
+$ THEN 
+$     GET_CONF_DATA "[''_request_name']#distinguished_name"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _distinguished_name = SSL_CONF_DATA
+$         _distinguished_name_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_request_name']#default_bits"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _default_bits = SSL_CONF_DATA
+$         _default_bits_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_request_name']#default_keyfile"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _default_keyfile = F$PARSE (SSL_CONF_DATA,"SSL$ROOT:",,"DEVICE") + -
+ 		             F$PARSE (SSL_CONF_DATA,"[KEY]",,"DIRECTORY") + -
+ 		             F$PARSE (SSL_CONF_DATA,"SERVER",,"NAME") + -
+ 		             F$PARSE (SSL_CONF_DATA,".KEY",,"TYPE") 
+$         _default_keyfile_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_request_name']#default_csrfile"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _default_csrfile = F$PARSE (SSL_CONF_DATA,"SSL$ROOT:",,"DEVICE") + -
+ 		             F$PARSE (SSL_CONF_DATA,"[CSR]",,"DIRECTORY") + -
+ 		             F$PARSE (SSL_CONF_DATA,"SERVER",,"NAME") + -
+ 		             F$PARSE (SSL_CONF_DATA,".CSR",,"TYPE") 
+$         _default_csrfile_upd = "N"
+$     ENDIF
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#countryName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _countryName_prompt = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#countryName_min"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _countryName_min = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#countryName_max"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _countryName_max = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#countryName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _countryName_default = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     IF _countryName_cnt .EQ. CTR THEN _countryName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#stateOrProvinceName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _stateOrProvinceName_prompt = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#stateOrProvinceName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _stateOrProvinceName_default = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     IF _stateOrProvinceName_cnt .EQ. CTR THEN _stateOrProvinceName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#localityName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _localityName_prompt = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#localityName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _localityName_default = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     IF _localityName_cnt .EQ. CTR THEN _localityName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#0.organizationName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _0organizationName_prompt = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#0.organizationName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _0organizationName_default = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     IF _0organizationName_cnt .EQ. CTR THEN _0organizationName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#organizationalUnitName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _organizationalUnitName_prompt = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#organizationalUnitName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _organizationalUnitName_default = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     IF _organizationalUnitName_cnt .EQ. CTR THEN _organizationalUnitName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#commonName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _commonName_prompt = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#commonName_max"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _commonName_max = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#commonName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _commonName_default = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     IF _commonName_cnt .EQ. CTR THEN _commonName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#emailAddress"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _emailAddress_prompt = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#emailAddress_max"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _emailAddress_max = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#emailAddress_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _emailAddress_default = SSL_CONF_DATA
+$         CTR = CTR + 1
+$     ENDIF
+$     IF _emailAddress_cnt .EQ. CTR THEN _emailAddress_upd = "N"
+$ ENDIF
+$!
+$ SET_USER_DATA "[]#encrypt_key#-#N#Encrypt Private Key ?#S##1##Y#N"
+$ SET_USER_DATA "[]#pem_pass_phrase#-##PEM Pass Phrase ?#P#1###Y#Y"
+$ SET_USER_DATA "[''_request_name']#default_bits#D#''_default_bits'#Encryption Bits ?#I###''_default_bits_upd'#Y#N"
+$ SET_USER_DATA "[''_request_name']#default_keyfile#D#''_default_keyfile'#Certificate Key File ?#F###''_default_keyfile_upd'#Y#N"
+$ SET_USER_DATA "[''_request_name']#default_csrfile#D#''_default_csrfile'#Certificate Request File ?#F###''_default_csrfile_upd'#Y#N"
+$ SET_USER_DATA "[''_request_name']#distinguished_name#D#''_distinguished_name'##S###''_distinguished_name_upd'#N#N"
+$ SET_USER_DATA "[''_distinguished_name']#countryName#P#''_countryName_default'#''_countryName_prompt'#S#''_countryName_min'#''_countryName_max'#''_countryName_upd'#Y#N" 
+$ SET_USER_DATA "[''_distinguished_name']#stateOrProvinceName#P#''_stateOrProvinceName_default'#''_stateOrProvinceName_prompt'#S###''_stateOrProvinceName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#localityName#P#''_localityName_default'#''_localityName_prompt'#S###''_localityName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#0.organizationName#P#''_0organizationName_default'#''_0organizationName_prompt'#S###''_0organizationName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#organizationalUnitName#P#''_organizationalUnitName_default'#''_organizationalUnitName_prompt'#S###''_organizationUnitName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#commonName#P#''_commonName_default'#''_commonName_prompt'#S##''_commonName_max'#''_commonName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#emailAddress#P#''_emailAddress_default'#''_emailAddress_prompt'#S##''_emailAddress_max'#''_emailAddress_upd'#Y#N"
+$ SET_USER_DATA "[]#display_certificate#-#N#Display the Certificate ?#S##1##Y#N"
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$!
+$!------------------------------------------------------------------------------
+$! Confirm/Update the SSL Configuration Data
+$!------------------------------------------------------------------------------
+$!
+$ CTR = 1
+$!
+$PROMPT_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN 
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     TYP = F$ELEMENT (5,"#",SSL_USER_DATA_'CTR') ! Value Type
+$     MIN = F$ELEMENT (6,"#",SSL_USER_DATA_'CTR') ! Value Minimum Length
+$     MAX = F$ELEMENT (7,"#",SSL_USER_DATA_'CTR') ! Value Maximum Length
+$     UPD = F$ELEMENT (8,"#",SSL_USER_DATA_'CTR') ! Entry Updated ?
+$     REQ = F$ELEMENT (9,"#",SSL_USER_DATA_'CTR') ! Entry Required for Input ?
+$     CFM = F$ELEMENT (10,"#",SSL_USER_DATA_'CTR')! Confirm Input  ?
+$!
+$! The PEM Pass Phrase prompt is dependant on the answer to encrypt the private key
+$!
+$     IF KEY .EQS. "[]" .AND. ITM .EQS. "pem_pass_phrase"
+$     THEN
+$         GET_USER_DATA "[]#encrypt_key"
+$ 	  _encrypt_key = SSL_USER_DATA
+$         IF F$EDIT (_encrypt_key,"UPCASE") .NES. "Y"
+$	  THEN
+$             CTR = CTR + 1
+$             GOTO PROMPT_LOOP
+$	  ENDIF
+$     ENDIF
+$!
+$     CONFIRMED = 0
+$     IF REQ .EQS. "N"
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO PROMPT_LOOP
+$     ENDIF
+$     IF ROW .GT. MSG_ROW - 2
+$     THEN 
+$         SAY ESC + "[''TOP_ROW';01H", CEOS
+$	  ROW = TOP_ROW
+$     ENDIF
+$!
+$CONFIRM_LOOP:
+$!
+$     IF PRM .EQS. "" 
+$     THEN 
+$         PROMPT = ESC + "[''ROW';''COL'H''ITM' ? [''DEF'] ''CEOL'"
+$     ELSE
+$         PROMPT = ESC + "[''ROW';''COL'H''PRM' [''DEF'] ''CEOL'"
+$     ENDIF
+$     IF TYP .EQS. "P" THEN SET TERMINAL /NOECHO
+$     ASK "''PROMPT'" ANS /END_OF_FILE=EXIT
+$     IF TYP .EQS. "P" THEN SET TERMINAL /ECHO
+$     ANS = F$EDIT (ANS,"TRIM")
+$     IF ANS .EQS. "" THEN ANS = DEF
+$     IF TYP .EQS. "F"
+$     THEN
+$         ANS = F$PARSE ("''ANS'","''DEF'",,,"SYNTAX_ONLY")
+$     ENDIF
+$     IF TYP .EQS. "I" .AND. F$TYPE (ANS) .NES. "INTEGER"
+$     THEN 
+$         CALL INVALID_ENTRY
+$         SAY ESC + "[''ROW';01H", CEOS
+$         GOTO PROMPT_LOOP
+$     ENDIF
+$     IF (TYP .EQS. "S" .OR. TYP .EQS. "P") .AND. -
+         ((MIN .NES. "" .AND. F$LENGTH (ANS) .LT. F$INTEGER(MIN)) .OR. -
+          (MAX .NES. "" .AND. F$LENGTH (ANS) .GT. F$INTEGER(MAX)))
+$     THEN 
+$         CALL INVALID_ENTRY
+$         SAY ESC + "[''ROW';01H", CEOS
+$	  IF TYP .EQS. "S" THEN GOTO PROMPT_LOOP
+$         IF TYP .EQS. "P" THEN GOTO CONFIRM_LOOP
+$     ENDIF
+$     ROW = ROW + 1
+$     IF CFM .EQS. "Y"
+$     THEN
+$         IF CONFIRMED .EQ. 0
+$	  THEN
+$	      CONFIRMED = 1
+$	      CONFIRMED_ANS = ANS
+$	      PRM = "Confirm ''PRM'"
+$	      GOTO CONFIRM_LOOP
+$         ELSE
+$	      IF ANS .NES. CONFIRMED_ANS
+$	      THEN 
+$                 CALL INVALID_ENTRY
+$		  ROW = ROW - 2
+$                 SAY ESC + "[''ROW';01H", CEOS
+$                 GOTO PROMPT_LOOP
+$	      ENDIF
+$         ENDIF
+$     ENDIF
+$     IF ANS .NES. DEF THEN SSL_USER_DATA_'CTR' = "''KEY'#''ITM'#''VAL'#''ANS'#''PRM'#''TYP'#''MIN'#''MAX'#Y#''REQ'#''CFM'"
+$     CTR = CTR + 1
+$     GOTO PROMPT_LOOP
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Save the SSL Configuration Data
+$!------------------------------------------------------------------------------
+$!
+$ CTR = 1
+$ SAY ESC + "[''MSG_ROW';01H", BLNK, " Saving Configuration ...", NORM
+$!
+$SAVE_CONF_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN 
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     TYP = F$ELEMENT (5,"#",SSL_USER_DATA_'CTR') ! Value Type
+$     MIN = F$ELEMENT (6,"#",SSL_USER_DATA_'CTR') ! Value Minimum Length
+$     MAX = F$ELEMENT (7,"#",SSL_USER_DATA_'CTR') ! Value Maximum Length
+$     UPD = F$ELEMENT (8,"#",SSL_USER_DATA_'CTR') ! Entry Updated ?
+$     REQ = F$ELEMENT (9,"#",SSL_USER_DATA_'CTR') ! Entry Required for Input ?
+$     CFM = F$ELEMENT (10,"#",SSL_USER_DATA_'CTR')! Confirm Input ?
+$     IF UPD .NES. "Y" .OR. VAL .EQS. "-"
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO SAVE_CONF_LOOP
+$     ENDIF
+$     IF VAL .EQS. "D"
+$     THEN 
+$         SET_CONF_DATA "''KEY'#''ITM'" "''DEF'"
+$     ELSE
+$         SET_CONF_DATA "''KEY'#''ITM'" "''PRM'"
+$         SET_CONF_DATA "''KEY'#''ITM'_default" "''DEF'"
+$     ENDIF
+$     IF MIN .NES. "" THEN SET_CONF_DATA "''KEY'#''ITM'_min" "''MIN'"
+$     IF MAX .NES. "" THEN SET_CONF_DATA "''KEY'#''ITM'_max" "''MAX'"
+$     CTR = CTR + 1
+$     GOTO SAVE_CONF_LOOP
+$ ENDIF
+$!
+$ PURGE /NOLOG /NOCONFIRM 'SSL_CONF_FILE'
+$ RENAME 'SSL_CONF_FILE'; ;1
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$!
+$!------------------------------------------------------------------------------
+$! Create the Server Certificiate
+$!------------------------------------------------------------------------------
+$!
+$ SAY ESC + "[''MSG_ROW';01H", BLNK, " Creating Certificate Request ...", NORM
+$!
+$ X1 = 2
+$ Y1 = TOP_ROW
+$ X2 = TT_COLS - 2
+$ Y2 = MSG_ROW - 1
+$!
+$ GET_USER_DATA "[]#encrypt_key"
+$ _encrypt_key = SSL_USER_DATA
+$ IF F$EDIT (_encrypt_key,"UPCASE") .EQS. "Y"
+$ THEN 
+$     GET_USER_DATA "[]#pem_pass_phrase"
+$     _pem_pass_phrase = SSL_USER_DATA
+$ ENDIF
+$ GET_USER_DATA "[req]#default_bits"
+$ _default_bits = SSL_USER_DATA
+$ GET_USER_DATA "[req]#default_keyfile"
+$ _default_keyfile = SSL_USER_DATA
+$ GET_USER_DATA "[req]#default_csrfile"
+$ _default_csrfile = SSL_USER_DATA
+$ GET_USER_DATA "[]#display_certificate"
+$ _display_certificate = SSL_USER_DATA
+$!
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SHOW SYSTEM /FULL /OUT=SYS$LOGIN:SSL_GENRSA_'PID'.RND
+$!
+$ OPEN /WRITE OFILE SYS$LOGIN:SSL_GENRSA_'PID'.COM
+$ WRITE OFILE "$ DEFINE /USER /NOLOG RANDFILE    SYS$LOGIN:SSL_GENRSA_''PID'.RND"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_GENRSA_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_GENRSA_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$ IF _encrypt_key .EQS. "Y"
+$ THEN 
+$     WRITE OFILE "$ OPENSSL genrsa -des3 -out ''_default_keyfile' ''_default_bits'"
+$     WRITE OFILE "''_pem_pass_phrase'"
+$     WRITE OFILE "''_pem_pass_phrase'"
+$ ELSE
+$     WRITE OFILE "$ OPENSSL genrsa -out ''_default_keyfile' ''_default_bits'"
+$ ENDIF
+$ CLOSE OFILE
+$!
+$ @SYS$LOGIN:SSL_GENRSA_'PID'.COM
+$!
+$ DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_GENRSA_'PID'.RND;*
+$ DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_GENRSA_'PID'.COM;*
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SEARCH SYS$LOGIN:SSL_GENRSA_'PID'.LOG /OUT=SYS$LOGIN:SSL_GENRSA_'PID'.ERR ":error:"
+$ IF F$SEARCH ("SYS$LOGIN:SSL_GENRSA_''PID'.ERR") .NES. "" 
+$ THEN 
+$     IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_GENRSA_''PID'.ERR","ALQ") .NE. 0
+$     THEN 
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_GENRSA_'PID'.ERR;*
+$         SAY ESC + "[''MSG_ROW';01H''BELL'''CEOS'"
+$         SHOW_FILE "SYS$LOGIN:SSL_GENRSA_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ERROR >" 
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_GENRSA_'PID'.LOG;*
+$         GOTO EXIT
+$     ENDIF
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_GENRSA_'PID'.ERR;*
+$ ENDIF
+$! 
+$ DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_GENRSA_'PID'.LOG;*
+$!
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SHOW SYSTEM /FULL /OUT=SYS$LOGIN:SSL_REQ_'PID'.RND
+$!
+$ OPEN /WRITE OFILE SYS$LOGIN:SSL_REQ_'PID'.COM
+$ WRITE OFILE "$ DEFINE /USER /NOLOG RANDFILE    SYS$LOGIN:SSL_REQ_''PID'.RND"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_REQ_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_REQ_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$ IF _encrypt_key .EQS. "Y"
+$ THEN 
+$     WRITE OFILE "$ OPENSSL req -new -config ''SSL_CONF_FILE' -key ''_default_keyfile' -out ''_default_csrfile'"
+$     WRITE OFILE "''_pem_pass_phrase'"
+$     WRITE OFILE "''_pem_pass_phrase'"
+$ ELSE
+$     WRITE OFILE "$ OPENSSL req -new -nodes -config ''SSL_CONF_FILE' -keyout ''_default_keyfile' -out ''_default_csrfile'"
+$ ENDIF
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ CLOSE OFILE
+$!
+$ @SYS$LOGIN:SSL_REQ_'PID'.COM
+$!
+$ DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.COM;*
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SEARCH SYS$LOGIN:SSL_REQ_'PID'.LOG /OUT=SYS$LOGIN:SSL_REQ_'PID'.ERR ":error:"
+$ IF F$SEARCH ("SYS$LOGIN:SSL_REQ_''PID'.ERR") .NES. "" 
+$ THEN 
+$     IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_REQ_''PID'.ERR","ALQ") .NE. 0
+$     THEN 
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.ERR;*
+$         SAY ESC + "[''MSG_ROW';01H''BELL'''CEOS'"
+$         SHOW_FILE "SYS$LOGIN:SSL_REQ_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ERROR >" 
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.LOG;*
+$         GOTO EXIT
+$     ENDIF
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.ERR;*
+$ ENDIF
+$!
+$ DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.LOG;*
+$! 
+$ IF F$EDIT (_display_certificate,"TRIM,UPCASE") .EQS. "Y"
+$ THEN 
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Generating Output ...", NORM, CEOL
+$!
+$     OPEN /WRITE OFILE SYS$LOGIN:SSL_REQ_'PID'.COM
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_REQ_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_REQ_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$     WRITE OFILE "$ OPENSSL req -noout -text -config ''SSL_CONF_FILE' -in ''_default_csrfile'"
+$     CLOSE OFILE
+$!
+$     @SYS$LOGIN:SSL_REQ_'PID'.COM
+$!
+$     DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.COM;*
+$!
+$     DEFINE /USER /NOLOG SYS$ERROR  NL:
+$     DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$     SEARCH SYS$LOGIN:SSL_REQ_'PID'.LOG /OUT=SYS$LOGIN:SSL_REQ_'PID'.ERR ":error:"
+$     IF F$SEARCH ("SYS$LOGIN:SSL_REQ_''PID'.ERR") .NES. "" 
+$     THEN 
+$         IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_REQ_''PID'.ERR","ALQ") .NE. 0
+$         THEN 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.ERR;*
+$             SAY ESC + "[''MSG_ROW';01H''BELL'''CEOS'"
+$             SHOW_FILE "SYS$LOGIN:SSL_REQ_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ERROR >" 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.LOG;*
+$             GOTO EXIT
+$         ENDIF
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.ERR;*
+$     ENDIF
+$!
+$     SAY ESC + "[''MSG_ROW';01H''CEOS'"
+$     SHOW_FILE "SYS$LOGIN:SSL_REQ_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ''_default_csrfile' >" 
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.LOG;*
+$     GOTO EXIT
+$ ENDIF
+$!
+$ TEXT = "Press return to continue"
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$ PROMPT = ESC + "[''MSG_ROW';''COL'H''TEXT'"
+$ ASK "''PROMPT'" OPT
+$!
+$GOTO EXIT
+$!
+$!------------------------------------------------------------------------------
+$! Set the User Data
+$!------------------------------------------------------------------------------
+$!
+$SET_USER_DATA: SUBROUTINE
+$!
+$ IF F$TYPE (SSL_USER_DATA_MAX) .EQS. ""
+$ THEN
+$     SSL_USER_DATA_MAX == 1
+$ ELSE
+$     SSL_USER_DATA_MAX == SSL_USER_DATA_MAX + 1
+$ ENDIF
+$!
+$ SSL_USER_DATA_'SSL_USER_DATA_MAX' == "''P1'"
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Get the User Data
+$!------------------------------------------------------------------------------
+$!
+$GET_USER_DATA: SUBROUTINE
+$!
+$ CTR = 1
+$ USER_KEY = F$ELEMENT (0,"#",P1)
+$ USER_ITM = F$ELEMENT (1,"#",P1)
+$!
+$GET_USER_DATA_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     IF USER_KEY .NES. KEY .OR. USER_ITM .NES. ITM
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO GET_USER_DATA_LOOP
+$     ENDIF
+$     IF VAL .EQS. "-" THEN SSL_USER_DATA == "''DEF'"
+$     IF VAL .EQS. "D" THEN SSL_USER_DATA == "''DEF'"
+$     IF VAL .EQS. "P" THEN SSL_USER_DATA == "''PRM'"
+$ ENDIF
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Delete the User Data
+$!------------------------------------------------------------------------------
+$!
+$DEL_USER_DATA: SUBROUTINE
+$!
+$ IF F$TYPE (SSL_USER_DATA_MAX) .EQS. "" THEN GOTO DEL_USER_DATA_END
+$!
+$DEL_USER_DATA_LOOP:
+$!
+$ IF F$TYPE (SSL_USER_DATA_'SSL_USER_DATA_MAX') .NES. "" 
+$ THEN
+$     DELETE /SYMBOL /GLOBAL SSL_USER_DATA_'SSL_USER_DATA_MAX'
+$     SSL_USER_DATA_MAX == SSL_USER_DATA_MAX - 1
+$     GOTO DEL_USER_DATA_LOOP
+$ ENDIF
+$!
+$ DELETE /SYMBOL /GLOBAL SSL_USER_DATA_MAX
+$!
+$DEL_USER_DATA_END:
+$!
+$ IF F$TYPE (SSL_USER_DATA) .NES. "" THEN DELETE /SYMBOL /GLOBAL SSL_USER_DATA
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Display the invalid entry 
+$!------------------------------------------------------------------------------
+$!
+$INVALID_ENTRY: SUBROUTINE
+$!
+$ SAY ESC + "[''MSG_ROW';01H", BELL, " Invalid Entry, Try again ...''CEOL'"
+$ Wait 00:00:01.5
+$ SAY ESC + "[''MSG_ROW';01H", CEOL
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$!
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ CLOSE OFILE
+$!
+$ DEL_USER_DATA
+$!
+$ IF F$TYPE (SSL_CONF_DATA) .NES. "" THEN DELETE /SYMBOL /GLOBAL SSL_CONF_DATA
+$!
+$ IF F$GETDVI ("TT:","TT_NOECHO") .AND. .NOT. TT_NOECHO THEN SET TERMINAL /ECHO
+$!
+$ IF F$SEARCH ("SYS$LOGIN:SSL_GENRSA_''PID'.%%%;*") .NES. "" THEN DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_GENRSA_'PID'.%%%;*
+$ IF F$SEARCH ("SYS$LOGIN:SSL_REQ_''PID'.%%%;*") .NES. "" THEN DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.%%%;*
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$self_cert.com
+++ b/VMS/cert_tool/ssl$self_cert.com
@@ -0,0 +1,725 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$SELF_CERT.COM - SSL Self Signed Certificate procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure prompts the user through creating a Server Certificate.
+$!
+$! There are no parameters used.
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ DELETE := DELETE
+$ SAY := WRITE SYS$OUTPUT
+$ ASK := READ SYS$COMMAND /END_OF_FILE=EXIT /PROMPT=
+$ PID = F$GETJPI ("","PID")
+$ TT_NOECHO = F$GETDVI ("TT:","TT_NOECHO")
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ TT_ROWS = F$GETDVI ("TT:","TT_PAGE")
+$ TT_COLS = F$GETDVI ("TT:","DEVBUFSIZ")
+$!
+$ GET_USER_DATA := CALL GET_USER_DATA
+$ SET_USER_DATA := CALL SET_USER_DATA
+$ DEL_USER_DATA := CALL DEL_USER_DATA
+$ INIT_TERM := @SSL$COM:SSL$INIT_TERM
+$ SHOW_FILE := @SSL$COM:SSL$SHOW_FILE 
+$ SSL_CONF_FILE = F$TRNLNM ("SSL$CONF")
+$ GET_CONF_DATA := @SSL$COM:SSL$CONF_UTIL 'SSL_CONF_FILE' GET
+$ SET_CONF_DATA := @SSL$COM:SSL$CONF_UTIL 'SSL_CONF_FILE' SET
+$!
+$ ESC[0,8] = 27 	! Set the Escape Character
+$ BELL[0,8] = 7 	! Ring the terminal Bell
+$ RED = 1		! Color - Red
+$ FGD = 30		! Foreground
+$ BGD = 0		! Background
+$ CSCR = ESC + "[2J"	! Clear the Screen 
+$ CEOS = ESC + "[0J"	! Clear to the End of the Screen 
+$ CEOL = ESC + "[0K"	! Clear to the End of the Line
+$ NORM = ESC + "[0m"	! Turn Attributes off
+$ BLNK = ESC + "[5m"    ! Turn on BLINK Attribute
+$ WIDE = ESC + "#6"     ! Turn on WIDE Attribute
+$!
+$!------------------------------------------------------------------------------
+$! Run the SSL setup if it hasn't been run yet
+$!------------------------------------------------------------------------------
+$!
+$ IF F$TRNLNM ("SSL$ROOT") .EQS. ""
+$ THEN
+$     IF F$SEARCH ("SSL$COM:SSL$INIT_ENV.COM") .NES. ""
+$     THEN 
+$         @SSL$COM:SSL$INIT_ENV.COM
+$     ELSE
+$         SAY BELL, "Unable to locate SSL$COM:SSL$INIT_ENV.COM ..."
+$	  GOTO EXIT
+$     ENDIF
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Display the Page Header
+$!------------------------------------------------------------------------------
+$!
+$ INIT_TERM
+$ BCOLOR = BGD
+$ FCOLOR = FGD + RED
+$ COLOR = ESC + "[''BCOLOR';''FCOLOR'm"
+$!
+$ TEXT = "SSL Certificate Tool"
+$ COL = (TT_COLS - (F$LENGTH (TEXT) * 2)) / 4
+$!
+$ SAY ESC + "[01;01H", CSCR
+$ SAY ESC + "[02;''COL'H", COLOR, WIDE, TEXT, NORM
+$!
+$ TEXT = "Create Self-Signed Certificate"
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ SAY ESC + "[04;01H"
+$ SAY ESC + "[04;''COL'H", COLOR, TEXT, NORM
+$!
+$ ROW = 6
+$ COL = 2
+$ TOP_ROW = ROW
+$ MSG_ROW = TT_ROWS - 1
+$!
+$!------------------------------------------------------------------------------
+$! Initialize the Request Data
+$!------------------------------------------------------------------------------
+$!
+$ IF F$SEARCH ("''SSL_CONF_FILE'") .NES. ""
+$ THEN 
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Reading Configuration ...", NORM
+$ ELSE
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Initializing Configuration ...", NORM
+$ ENDIF
+$!
+$ _request_name = "req"
+$!
+$ _distinguished_name = "REQ_distinguished_name"
+$ _distinguished_name_upd = "Y"
+$!
+$ _default_bits = "1024"
+$ _default_bits_upd = "Y"
+$!
+$ _default_keyfile = "SSL$KEY:SERVER.KEY"
+$ _default_keyfile_upd = "Y"
+$!
+$ _default_crtfile = "SSL$CRT:SERVER.CRT"
+$ _default_crtfile_upd = "Y"
+$!
+$ _countryName_prompt = "Country Name ?"
+$ _countryName_min = "2"
+$ _countryName_max = "2"
+$ _countryName_default = "US"
+$ _countryName_upd = "Y"
+$ _countryName_cnt = 4
+$!
+$ _stateOrProvinceName_prompt = "State or Province Name ?"
+$ _stateOrProvinceName_default = ""
+$ _stateOrProvinceName_upd = "Y"
+$ _stateOrProvinceName_cnt = 2
+$!
+$ _localityName_prompt = "City Name ?"
+$ _localityName_default = ""
+$ _localityName_upd = "Y"
+$ _localityName_cnt = 2
+$!
+$ _0organizationName_prompt = "Organization Name ?"
+$ _0organizationName_default = ""
+$ _0organizationName_upd = "Y"
+$ _0organizationName_cnt = 2
+$!
+$ _organizationalUnitName_prompt = "Organization Unit Name ?"
+$ _organizationalUnitName_default = ""
+$ _organizationalUnitName_upd = "Y"
+$ _organizationalUnitName_cnt = 2
+$!
+$ _commonName_prompt = "Common Name ?"
+$ _commonName_max = "64"
+$ HOSTNAME -s _commonName_default
+$ _commonName_upd = "Y"
+$ _commonName_cnt = 3
+$!
+$ _emailAddress_prompt = "Email Address ?"
+$ _emailAddress_max = "40"
+$ _emailAddress_default = "webmaster@''_commonName_default'"
+$ _emailAddress_upd = "Y"
+$ _emailAddress_cnt = 3
+$!
+$ IF F$SEARCH ("''SSL_CONF_FILE'") .NES. ""
+$ THEN 
+$     GET_CONF_DATA "[''_request_name']#distinguished_name"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _distinguished_name = SSL_CONF_DATA
+$         _distinguished_name_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_request_name']#default_bits"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _default_bits = SSL_CONF_DATA
+$     	  _default_bits_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_request_name']#default_keyfile"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _default_keyfile = F$PARSE (SSL_CONF_DATA,"SSL$ROOT:",,"DEVICE") + -
+ 		             F$PARSE (SSL_CONF_DATA,"[KEY]",,"DIRECTORY") + -
+ 		             F$PARSE (SSL_CONF_DATA,"SERVER",,"NAME") + -
+ 		             F$PARSE (SSL_CONF_DATA,".KEY",,"TYPE") 
+$         _default_keyfile_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_request_name']#default_crtfile"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _default_crtfile = F$PARSE (SSL_CONF_DATA,"SSL$ROOT:",,"DEVICE") + -
+ 		             F$PARSE (SSL_CONF_DATA,"[CRT]",,"DIRECTORY") + -
+ 		             F$PARSE (SSL_CONF_DATA,"SERVER",,"NAME") + -
+ 		             F$PARSE (SSL_CONF_DATA,".CRT",,"TYPE") 
+$         _default_crtfile_upd = "N"
+$     ENDIF
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#countryName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _countryName_prompt = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#countryName_min"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _countryName_min = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#countryName_max"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _countryName_max = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#countryName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _countryName_default = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     IF _countryName_cnt .EQS. CTR THEN _countryName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#stateOrProvinceName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _stateOrProvinceName_prompt = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#stateOrProvinceName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _stateOrProvinceName_default = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     IF _stateOrProvinceName_cnt .EQ. CTR THEN _stateOrProvinceName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#localityName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _localityName_prompt = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#localityName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _localityName_default = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     IF _localityName_cnt .EQ. CTR THEN _localityName_default_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#0.organizationName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _0organizationName_prompt = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#0.organizationName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _0organizationName_default = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     IF _0organizationName_cnt .EQ. CTR THEN _0organizationName_default_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#organizationalUnitName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _organizationalUnitName_prompt = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#organizationalUnitName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _organizationalUnitName_default = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     IF _organizationalUnitName_cnt .EQ. CTR THEN _organizationalUnitName_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#commonName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _commonName_prompt = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#commonName_max"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _commonName_max = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#commonName_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _commonName_default = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     IF _commonName_cnt .EQ. CTR THEN _commonName_default_upd = "N"
+$!
+$     CTR = 0
+$     GET_CONF_DATA "[''_distinguished_name']#emailAddress"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _emailAddress_prompt = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#emailAddress_max"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _emailAddress_max = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     GET_CONF_DATA "[''_distinguished_name']#emailAddress_default"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _emailAddress_default = SSL_CONF_DATA
+$	  CTR = CTR + 1
+$     ENDIF
+$     IF _emailAddress_cnt .EQ. CTR THEN _emailAddress_default_upd = "N"
+$ ENDIF
+$!
+$ SET_USER_DATA "[]#encrypt_key#-#N#Encrypt Private Key ?#S##1##Y#N"
+$ SET_USER_DATA "[]#pem_pass_phrase#-##PEM Pass Phrase ?#P#1###Y#Y"
+$ SET_USER_DATA "[''_request_name']#default_bits#D#''_default_bits'#Encryption Bits ?#I###''_default_bits_upd'#Y#N"
+$ SET_USER_DATA "[''_request_name']#default_keyfile#D#''_default_keyfile'#Certificate Key File ?#F###''_default_keyfile_upd'#Y#N"
+$ SET_USER_DATA "[''_request_name']#default_crtfile#D#''_default_crtfile'#Certificate File ?#F###''_default_crtfile_upd'#Y#N"
+$ SET_USER_DATA "[''_request_name']#distinguished_name#D#''_distinguished_name'##S###''_distinguished_name_upd'#N#N"
+$ SET_USER_DATA "[''_distinguished_name']#countryName#P#''_countryName_default'#''_countryName_prompt'#S#''_countryName_min'#''#''_countryName_upd'#Y#N" 
+$ SET_USER_DATA "[''_distinguished_name']#stateOrProvinceName#P#''_stateOrProvinceName_default'#''_stateOrProvinceName_prompt'####''_stateOrProvinceName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#localityName#P#''_localityName_default'#''_localityName_prompt'#S###''_localityName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#0.organizationName#P#''_0organizationName_default'#''_0organizationName_prompt'#S###''_0organizationalName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#organizationalUnitName#P#''_organizationalUnitName_default'#''_organizationalUnitName_prompt#S###''_organizationalUnitName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#commonName#P#''_commonName_default'#''_commonName_prompt'#S##''_commonName_max'#''_commonName_upd'#Y#N"
+$ SET_USER_DATA "[''_distinguished_name']#emailAddress#P#''_emailAddress_default'#''_emailAddress_prompt'#S##''_emailAddress_max'#''_emailAddress_upd'#Y#N"
+$ SET_USER_DATA "[]#display_certificate#-#N#Display the Certificate ?#S##1##Y#N"
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$!
+$!------------------------------------------------------------------------------
+$! Confirm/Update the SSL Configuration Data
+$!------------------------------------------------------------------------------
+$!
+$ CTR = 1
+$!
+$PROMPT_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN 
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     TYP = F$ELEMENT (5,"#",SSL_USER_DATA_'CTR') ! Value Type
+$     MIN = F$ELEMENT (6,"#",SSL_USER_DATA_'CTR') ! Value Minimum Length
+$     MAX = F$ELEMENT (7,"#",SSL_USER_DATA_'CTR') ! Value Maximum Length
+$     UPD = F$ELEMENT (8,"#",SSL_USER_DATA_'CTR') ! Entry Updated ?
+$     REQ = F$ELEMENT (9,"#",SSL_USER_DATA_'CTR') ! Entry Required for Input ?
+$     CFM = F$ELEMENT (10,"#",SSL_USER_DATA_'CTR')! Confirm Input  ?
+$!
+$! The PEM Pass Phrase prompt is dependant on the answer to encrypt the private key
+$!
+$     IF KEY .EQS. "[]" .AND. ITM .EQS. "pem_pass_phrase"
+$     THEN
+$         GET_USER_DATA "[]#encrypt_key"
+$ 	  _encrypt_key = SSL_USER_DATA
+$         IF F$EDIT (_encrypt_key,"UPCASE") .NES. "Y"
+$	  THEN
+$             CTR = CTR + 1
+$             GOTO PROMPT_LOOP
+$	  ENDIF
+$     ENDIF
+$!
+$     CONFIRMED = 0
+$     IF REQ .EQS. "N"
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO PROMPT_LOOP
+$     ENDIF
+$     IF ROW .GT. MSG_ROW - 2
+$     THEN 
+$         SAY ESC + "[''TOP_ROW';01H", CEOS
+$	  ROW = TOP_ROW
+$     ENDIF
+$!
+$CONFIRM_LOOP:
+$!
+$     IF PRM .EQS. "" 
+$     THEN 
+$         PROMPT = ESC + "[''ROW';''COL'H''ITM' ? [''DEF'] ''CEOL'"
+$     ELSE
+$         PROMPT = ESC + "[''ROW';''COL'H''PRM' [''DEF'] ''CEOL'"
+$     ENDIF
+$     IF TYP .EQS. "P" THEN SET TERMINAL /NOECHO
+$     ASK "''PROMPT'" ANS /END_OF_FILE=EXIT
+$     IF TYP .EQS. "P" THEN SET TERMINAL /ECHO
+$     ANS = F$EDIT (ANS,"TRIM")
+$     IF ANS .EQS. "" THEN ANS = DEF
+$     IF TYP .EQS. "F"
+$     THEN
+$         ANS = F$PARSE ("''ANS'","''DEF'",,,"SYNTAX_ONLY")
+$     ENDIF
+$     IF TYP .EQS. "I" .AND. F$TYPE (ANS) .NES. "INTEGER"
+$     THEN 
+$         CALL INVALID_ENTRY
+$         SAY ESC + "[''ROW';01H", CEOS
+$         GOTO PROMPT_LOOP
+$     ENDIF
+$     IF (TYP .EQS. "S" .OR. TYP .EQS. "P") .AND. -
+         ((MIN .NES. "" .AND. F$LENGTH (ANS) .LT. F$INTEGER(MIN)) .OR. -
+          (MAX .NES. "" .AND. F$LENGTH (ANS) .GT. F$INTEGER(MAX)))
+$     THEN 
+$         CALL INVALID_ENTRY
+$         SAY ESC + "[''ROW';01H", CEOS
+$	  IF TYP .EQS. "S" THEN GOTO PROMPT_LOOP
+$         IF TYP .EQS. "P" THEN GOTO CONFIRM_LOOP
+$     ENDIF
+$     ROW = ROW + 1
+$     IF CFM .EQS. "Y"
+$     THEN
+$         IF CONFIRMED .EQ. 0
+$	  THEN
+$	      CONFIRMED = 1
+$	      CONFIRMED_ANS = ANS
+$	      PRM = "Confirm ''PRM'"
+$	      GOTO CONFIRM_LOOP
+$         ELSE
+$	      IF ANS .NES. CONFIRMED_ANS
+$	      THEN 
+$                 CALL INVALID_ENTRY
+$		  ROW = ROW - 2
+$                 SAY ESC + "[''ROW';01H", CEOS
+$                 GOTO PROMPT_LOOP
+$	      ENDIF
+$         ENDIF
+$     ENDIF
+$     IF ANS .NES. DEF THEN SSL_USER_DATA_'CTR' = "''KEY'#''ITM'#''VAL'#''ANS'#''PRM'#''TYP'#''MIN'#''MAX'#Y#''REQ'#''CFM'"
+$     CTR = CTR + 1
+$     GOTO PROMPT_LOOP
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Save the SSL Configuration Data
+$!------------------------------------------------------------------------------
+$!
+$ CTR = 1
+$ SAY ESC + "[''MSG_ROW';01H", BLNK, " Saving Configuration ...", NORM
+$!
+$SAVE_CONF_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN 
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     TYP = F$ELEMENT (5,"#",SSL_USER_DATA_'CTR') ! Value Type
+$     MIN = F$ELEMENT (6,"#",SSL_USER_DATA_'CTR') ! Value Minimum Length
+$     MAX = F$ELEMENT (7,"#",SSL_USER_DATA_'CTR') ! Value Maximum Length
+$     UPD = F$ELEMENT (8,"#",SSL_USER_DATA_'CTR') ! Entry Updated ?
+$     REQ = F$ELEMENT (9,"#",SSL_USER_DATA_'CTR') ! Entry Required for Input ?
+$     CFM = F$ELEMENT (10,"#",SSL_USER_DATA_'CTR')! Confirm Input ?
+$     IF UPD .NES. "Y" .OR. VAL .EQS. "-"
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO SAVE_CONF_LOOP
+$     ENDIF
+$     IF VAL .EQS. "D"
+$     THEN 
+$         SET_CONF_DATA "''KEY'#''ITM'" "''DEF'"
+$     ELSE
+$         SET_CONF_DATA "''KEY'#''ITM'" "''PRM'"
+$         SET_CONF_DATA "''KEY'#''ITM'_default" "''DEF'"
+$     ENDIF
+$     IF MIN .NES. "" THEN SET_CONF_DATA "''KEY'#''ITM'_min" "''MIN'"
+$     IF MAX .NES. "" THEN SET_CONF_DATA "''KEY'#''ITM'_max" "''MAX'"
+$     CTR = CTR + 1
+$     GOTO SAVE_CONF_LOOP
+$ ENDIF
+$!
+$ PURGE /NOLOG /NOCONFIRM 'SSL_CONF_FILE'
+$ RENAME 'SSL_CONF_FILE'; ;1
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$!
+$!------------------------------------------------------------------------------
+$! Create the Server Certificiate
+$!------------------------------------------------------------------------------
+$!
+$ SAY ESC + "[''MSG_ROW';01H", BLNK, " Creating Self-Signed Certificate ...", NORM
+$!
+$ X1 = 2
+$ Y1 = TOP_ROW
+$ X2 = TT_COLS - 2
+$ Y2 = MSG_ROW - 1
+$!
+$ GET_USER_DATA "[]#encrypt_key"
+$ _encrypt_key = SSL_USER_DATA
+$ IF F$EDIT (_encrypt_key,"UPCASE") .EQS. "Y"
+$ THEN 
+$     GET_USER_DATA "[]#pem_pass_phrase"
+$     _pem_pass_phrase = SSL_USER_DATA
+$ ENDIF
+$ GET_USER_DATA "[''_request_name']#default_bits"
+$ _default_bits = SSL_USER_DATA
+$ GET_USER_DATA "[''_request_name']#default_keyfile"
+$ _default_keyfile = SSL_USER_DATA
+$ GET_USER_DATA "[''_request_name']#default_crtfile"
+$ _default_crtfile = SSL_USER_DATA
+$ GET_USER_DATA "[]#display_certificate"
+$ _display_certificate = SSL_USER_DATA
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SHOW SYSTEM /FULL /OUT=SYS$LOGIN:SSL_REQ_'PID'.RND
+$!
+$ OPEN /WRITE OFILE SYS$LOGIN:SSL_REQ_'PID'.COM
+$ WRITE OFILE "$ DEFINE /USER /NOLOG RANDFILE    SYS$LOGIN:SSL_REQ_''PID'.RND"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_REQ_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_REQ_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$ IF F$EDIT (_encrypt_key,"UPCASE") .EQS. "Y"
+$ THEN 
+$     WRITE OFILE "$ OPENSSL req -config ''SSL_CONF_FILE' -new -days 365 -x509 -keyout ''_default_keyfile' -out ''_default_crtfile'"
+$     WRITE OFILE "''_pem_pass_phrase'"
+$     WRITE OFILE "''_pem_pass_phrase'"
+$ ELSE
+$     WRITE OFILE "$ OPENSSL req -config ''SSL_CONF_FILE' -nodes -new -days 365 -x509 -keyout ''_default_keyfile' -out ''_default_crtfile'"
+$ ENDIF
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ WRITE OFILE ""
+$ CLOSE OFILE
+$!
+$ @SYS$LOGIN:SSL_REQ_'PID'.COM
+$!
+$ DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.COM;*
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SEARCH SYS$LOGIN:SSL_REQ_'PID'.LOG /OUT=SYS$LOGIN:SSL_REQ_'PID'.ERR ":error:"
+$ IF F$SEARCH ("SYS$LOGIN:SSL_REQ_''PID'.ERR") .NES. "" 
+$ THEN 
+$     IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_REQ_''PID'.ERR","ALQ") .NE. 0
+$     THEN 
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.ERR;*
+$         SAY ESC + "[''MSG_ROW';01H''BELL'''CEOS'"
+$         SHOW_FILE "SYS$LOGIN:SSL_REQ_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ERROR >"
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.LOG;*
+$         GOTO EXIT
+$     ENDIF
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.ERR;*
+$ ENDIF
+$!
+$ DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.LOG;*
+$! 
+$ IF F$EDIT (_display_certificate,"TRIM,UPCASE") .EQS. "Y"
+$ THEN 
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Generating Output ...", NORM, CEOL
+$!
+$     OPEN /WRITE OFILE SYS$LOGIN:SSL_X509_'PID'.COM
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_X509_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_X509_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$     WRITE OFILE "$ OPENSSL x509 -noout -text -in ''_default_crtfile'"
+$     CLOSE OFILE
+$!
+$     @SYS$LOGIN:SSL_X509_'PID'.COM
+$!
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.COM;*
+$!
+$     DEFINE /USER /NOLOG SYS$ERROR  NL:
+$     DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$     SEARCH SYS$LOGIN:SSL_X509_'PID'.LOG /OUT=SYS$LOGIN:SSL_X509_'PID'.ERR ":error:"
+$     IF F$SEARCH ("SYS$LOGIN:SSL_X509_''PID'.ERR") .NES. "" 
+$     THEN 
+$         IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_X509_''PID'.ERR","ALQ") .NE. 0
+$         THEN 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.ERR;*
+$             SAY ESC + "[''MSG_ROW';01H''BELL'''CEOS'"
+$             SHOW_FILE "SYS$LOGIN:SSL_X509_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ERROR >" 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.LOG;*
+$             GOTO EXIT
+$         ENDIF
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.ERR;*
+$     ENDIF
+$!
+$     SAY ESC + "[''MSG_ROW';01H''CEOS'"
+$     SHOW_FILE "SYS$LOGIN:SSL_X509_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ''_default_crtfile' >" 
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.LOG;*
+$     GOTO EXIT
+$ ENDIF
+$!
+$ TEXT = "Press return to continue"
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$ PROMPT = ESC + "[''MSG_ROW';''COL'H''TEXT'"
+$ ASK "''PROMPT'" OPT
+$!
+$GOTO EXIT
+z$!
+$!------------------------------------------------------------------------------
+$! Set the User Data
+$!------------------------------------------------------------------------------
+$!
+$SET_USER_DATA: SUBROUTINE
+$!
+$ IF F$TYPE (SSL_USER_DATA_MAX) .EQS. ""
+$ THEN
+$     SSL_USER_DATA_MAX == 1
+$ ELSE
+$     SSL_USER_DATA_MAX == SSL_USER_DATA_MAX + 1
+$ ENDIF
+$!
+$ SSL_USER_DATA_'SSL_USER_DATA_MAX' == "''P1'"
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Find the Request Data
+$!------------------------------------------------------------------------------
+$!
+$GET_USER_DATA: SUBROUTINE
+$!
+$ CTR = 1
+$ USER_KEY = F$ELEMENT (0,"#",P1)
+$ USER_ITM = F$ELEMENT (1,"#",P1)
+$!
+$GET_USER_DATA_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     IF USER_KEY .NES. KEY .OR. USER_ITM .NES. ITM
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO GET_USER_DATA_LOOP
+$     ENDIF
+$     IF VAL .EQS. "-" THEN SSL_USER_DATA == "''DEF'"
+$     IF VAL .EQS. "D" THEN SSL_USER_DATA == "''DEF'"
+$     IF VAL .EQS. "P" THEN SSL_USER_DATA == "''PRM'"
+$ ENDIF
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Delete the User Data
+$!------------------------------------------------------------------------------
+$!
+$DEL_USER_DATA: SUBROUTINE
+$!
+$ IF F$TYPE (SSL_USER_DATA_MAX) .EQS. "" THEN GOTO DEL_USER_DATA_END
+$!
+$DEL_USER_DATA_LOOP:
+$!
+$ IF F$TYPE (SSL_USER_DATA_'SSL_USER_DATA_MAX') .NES. "" 
+$ THEN
+$     DELETE /SYMBOL /GLOBAL SSL_USER_DATA_'SSL_USER_DATA_MAX'
+$     SSL_USER_DATA_MAX == SSL_USER_DATA_MAX - 1
+$     GOTO DEL_USER_DATA_LOOP
+$ ENDIF
+$!
+$ DELETE /SYMBOL /GLOBAL SSL_USER_DATA_MAX
+$!
+$DEL_USER_DATA_END:
+$!
+$ IF F$TYPE (SSL_USER_DATA) .NES. "" THEN DELETE /SYMBOL /GLOBAL SSL_USER_DATA
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Display the invalid entry 
+$!------------------------------------------------------------------------------
+$!
+$INVALID_ENTRY: SUBROUTINE
+$!
+$ SAY ESC + "[''MSG_ROW';01H", BELL, " Invalid Entry, Try again ...''CEOL'"
+$ Wait 00:00:01.5
+$ SAY ESC + "[''MSG_ROW';01H", CEOL
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$!
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ CLOSE OFILE
+$!
+$ DEL_USER_DATA
+$!
+$ IF F$TYPE (SSL_CONF_DATA) .NES. "" THEN DELETE /SYMBOL /GLOBAL SSL_CONF_DATA
+$!
+$ IF F$GETDVI ("TT:","TT_NOECHO") .AND. .NOT. TT_NOECHO THEN SET TERMINAL /ECHO
+$!
+$ IF F$SEARCH ("SYS$LOGIN:SSL_REQ_''PID'.%%%;*") .NES. "" THEN DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.%%%;*
+$ IF F$SEARCH ("SYS$LOGIN:SSL_X509_''PID'.%%%;*") .NES. "" THEN DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.%%%;*
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$show_file.com
+++ b/VMS/cert_tool/ssl$show_file.com
@@ -0,0 +1,205 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$SHOW_FILE.COM - SSL Show File procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure display the contents of a given file in a box size specified.
+$!
+$! The parameters used are:
+$!
+$! 	P1	- File to View
+$! 	P2	- X1 coordinate
+$! 	P3	- Y1 coordinate
+$! 	P4	- X2 coordinate
+$! 	P5	- Y3 coordinate
+$! 	P6	- File Box Title (Optional)
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ SAY := WRITE SYS$OUTPUT
+$ ASK := READ SYS$COMMAND /END_OF_FILE=EXIT /PROMPT=
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ DRAW_BOX := @SSL$COM:SSL$DRAW_BOX
+$ FILL_BOX := @SSL$COM:SSL$FILL_BOX
+$!
+$ ESC[0,8] = 27 	! Set the Escape Character
+$ CEOL = ESC + "[0K"	! Clear to the End of the Line
+$ NORM = ESC + "[0m"	! Turn Attributes off
+$ BOLD = ESC + "[1m"    ! Turn on BOLD Attribute
+$!
+$!------------------------------------------------------------------------------
+$! Display the Page Header
+$!------------------------------------------------------------------------------
+$!
+$ REC_MAX = 0
+$ OPEN /READ IFILE 'P1' 
+$!
+$READ_LOOP:
+$!
+$ READ /END_OF_FILE=READ_END IFILE IREC
+$ REC_MAX = REC_MAX + 1
+$ REC_'REC_MAX' = IREC
+$ GOTO READ_LOOP
+$!
+$READ_END:
+$!
+$ CLOSE IFILE
+$!
+$ IF REC_MAX .EQ. 0
+$ THEN 
+$     DRAW_BOX 'P2' 'P3' 'P4' 'P5' "''P6'" " ** End-of-File **, Press Return to Exit "
+$     INPUT_ROW = P5 + 1
+$     PROMPT = ESC + "[''INPUT_ROW';01H ''CEOL'"
+$     ASK "''PROMPT'" OPT
+$     GOTO EXIT
+$ ENDIF
+$!
+$ COL = P2 + 2
+$ ROW = P3 + 2
+$ TOP_ROW = ROW
+$ INPUT_ROW = P5 + 1
+$ BOX_WIDTH = P4 - (P2 + 2)
+$ BOX_HEIGHT = P5 - (P3 + 3)
+$!
+$ REC_CTR = 1
+$ PAGE_CTR = 1
+$ PAGE_'PAGE_CTR'_REC_CTR = REC_CTR
+$ RECS_PER_PAGE = BOX_HEIGHT
+$ PAGE_MAX = REC_MAX / RECS_PER_PAGE
+$ IF PAGE_MAX * RECS_PER_PAGE .LT. REC_MAX THEN PAGE_MAX = PAGE_MAX + 1
+$!
+$ DRAW_BOX 'P2' 'P3' 'P4' 'P5' "''P6'" " Enter B for Back, N for Next, Ctrl-Z to Exit "
+$ PAGE_TXT = F$FAO (" Page !UL of !UL ", PAGE_CTR, PAGE_MAX)
+$ _COL = P2 + (BOX_WIDTH - F$LENGTH (PAGE_TXT)) + 2
+$ SAY ESC + "[''P3';''_COL'H''BOLD'''PAGE_TXT'''NORM'"
+$!
+$DISPLAY_LOOP:
+$!
+$ IF REC_CTR .LE. REC_MAX .AND. F$TYPE (REC_'REC_CTR') .NES. ""
+$ THEN 
+$     REC = REC_'REC_CTR'
+$ ENDIF
+$ WRAP_IN_PROGRESS = 0
+$!
+$WRAP_LOOP:
+$!
+$ IF ROW .LE. (P5 - 2) .AND. -
+     REC_CTR .LE. PAGE_CTR * RECS_PER_PAGE
+$ THEN
+$     IF F$LENGTH (REC) .GT. BOX_WIDTH  
+$     THEN 
+$ 	  IF WRAP_IN_PROGRESS .EQ. 0
+$	  THEN
+$	      WRAP_IN_PROGRESS = 1
+$	      _COL = COL
+$	  ELSE
+$	      _COL = COL - 1
+$	  ENDIF
+$	  REC_SEG = F$EXTRACT (0, BOX_WIDTH, REC)
+$         SAY ESC + "[''ROW';''_COL'H", REC_SEG
+$         REC = ">" + F$EXTRACT (BOX_WIDTH, F$LENGTH (REC)-BOX_WIDTH, REC)
+$         ROW = ROW + 1
+$	  GOTO WRAP_LOOP
+$     ELSE
+$         IF REC_CTR .LE. REC_MAX .AND. F$TYPE (REC_'REC_CTR') .NES. ""
+$         THEN 
+$ 	      IF WRAP_IN_PROGRESS .EQ. 1
+$	      THEN
+$		  _COL = COL - 1
+$	      ELSE
+$		  _COL = COL
+$	      ENDIF
+$             SAY ESC + "[''ROW';''_COL'H", REC
+$	  ENDIF
+$     ENDIF
+$ ELSE
+$!
+$RETRY:
+$!
+$     PROMPT = ESC + "[''INPUT_ROW';01H ''CEOL'"
+$     ASK "''PROMPT'" OPT
+$     IF F$EDIT (OPT,"TRIM,UPCASE") .NES. "B" .AND. -
+	 F$EDIT (OPT,"TRIM,UPCASE") .NES. "N" 
+$     THEN
+$         CALL INVALID_ENTRY
+$	  GOTO RETRY
+$     ENDIF
+$     IF F$EDIT (OPT,"TRIM,UPCASE") .EQS. "B"
+$     THEN
+$	  IF PAGE_CTR .GT. 1
+$	  THEN
+$ 	      ROW = TOP_ROW
+$	      PAGE_CTR = PAGE_CTR - 1
+$ 	      REC_CTR = PAGE_'PAGE_CTR'_REC_CTR
+$             PAGE_TXT = F$FAO (" Page !UL of !UL ", PAGE_CTR, PAGE_MAX)
+$             _COL = P2 + (BOX_WIDTH - F$LENGTH (PAGE_TXT)) + 2
+$             SAY ESC + "[''P3';''_COL'H''BOLD'''PAGE_TXT'''NORM'"
+$             FILL_BOX 'P2' 'P3' 'P4' 'P5'
+$	      GOTO DISPLAY_LOOP
+$	  ELSE
+$             CALL INVALID_ENTRY
+$	      GOTO RETRY
+$         ENDIF
+$     ENDIF
+$     IF F$EDIT (OPT,"TRIM,UPCASE") .EQS. "N"
+$     THEN
+$	  IF PAGE_CTR .LT. PAGE_MAX
+$	  THEN
+$	      PAGE_CTR = PAGE_CTR + 1
+$ 	      PAGE_'PAGE_CTR'_REC_CTR = REC_CTR
+$             PAGE_TXT = F$FAO (" Page !UL of !UL ", PAGE_CTR, PAGE_MAX)
+$             _COL = P2 + (BOX_WIDTH - F$LENGTH (PAGE_TXT)) + 2
+$             SAY ESC + "[''P3';''_COL'H''BOLD'''PAGE_TXT'''NORM'"
+$             FILL_BOX 'P2' 'P3' 'P4' 'P5'
+$	  ELSE
+$             CALL INVALID_ENTRY
+$	      GOTO RETRY
+$         ENDIF
+$     ENDIF
+$     FILL_BOX 'P2' 'P3' 'P4' 'P5'
+$     ROW = TOP_ROW
+$     GOTO WRAP_LOOP
+$ ENDIF
+$ REC_CTR = REC_CTR + 1
+$ ROW = ROW + 1
+$ GOTO DISPLAY_LOOP
+$!
+$!------------------------------------------------------------------------------
+$! Display the invalid entry 
+$!------------------------------------------------------------------------------
+$!
+$INVALID_ENTRY: SUBROUTINE
+$!
+$ SAY ESC + "[''INPUT_ROW';01H", BELL, " Invalid Entry, Try again ...''CEOL'"
+$ Wait 00:00:01.5
+$ SAY ESC + "[''INPUT_ROW';01H", CEOL
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Exit 
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ CLOSE IFILE
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$sign_cert.com
+++ b/VMS/cert_tool/ssl$sign_cert.com
@@ -0,0 +1,759 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$SIGN_CERT.COM - SSL Sign Certificate Request procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure prompts the user through creating a Server Certificate.
+$!
+$! There are no parameters used.
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ DELETE := DELETE
+$ SAY := WRITE SYS$OUTPUT
+$ ASK := READ SYS$COMMAND /END_OF_FILE=EXIT /PROMPT=
+$ PID = F$GETJPI ("","PID")
+$ TT_NOECHO = F$GETDVI ("TT:","TT_NOECHO")
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ TT_ROWS = F$GETDVI ("TT:","TT_PAGE")
+$ TT_COLS = F$GETDVI ("TT:","DEVBUFSIZ")
+$!
+$ GET_USER_DATA := CALL GET_USER_DATA
+$ SET_USER_DATA := CALL SET_USER_DATA
+$ DEL_USER_DATA := CALL DEL_USER_DATA
+$ INIT_TERM := @SSL$COM:SSL$INIT_TERM
+$ SHOW_FILE := @SSL$COM:SSL$SHOW_FILE 
+$ SSL_CONF_FILE = F$TRNLMN ("SSL$CA_CONF")
+$ GET_CONF_DATA := @SSL$COM:SSL$CONF_UTIL 'SSL_CONF_FILE' GET
+$ SET_CONF_DATA := @SSL$COM:SSL$CONF_UTIL 'SSL_CONF_FILE' SET
+$!
+$ ESC[0,8] = 27 	! Set the Escape Character
+$ BELL[0,8] = 7 	! Ring the terminal Bell
+$ RED = 1		! Color - Red
+$ FGD = 30		! Foreground
+$ BGD = 0		! Background
+$ CSCR = ESC + "[2J"	! Clear the Screen 
+$ CEOS = ESC + "[0J"	! Clear to the End of the Screen 
+$ CEOL = ESC + "[0K"	! Clear to the End of the Line
+$ NORM = ESC + "[0m"	! Turn Attributes off
+$ BLNK = ESC + "[5m"    ! Turn on BLINK Attribute
+$ WIDE = ESC + "#6"     ! Turn on WIDE Attribute
+$!
+$!------------------------------------------------------------------------------
+$! Run the SSL setup if it hasn't been run yet
+$!------------------------------------------------------------------------------
+$!
+$ IF F$TRNLNM ("SSL$ROOT") .EQS. ""
+$ THEN
+$     IF F$SEARCH ("SSL$COM:SSL$INIT_ENV.COM") .NES. ""
+$     THEN 
+$         @SSL$COM:SSL$INIT_ENV.COM
+$     ELSE
+$         SAY BELL, "Unable to locate SSL$COM:SSL$INIT_ENV.COM ..."
+$	  GOTO EXIT
+$     ENDIF
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Display the Page Header
+$!------------------------------------------------------------------------------
+$!
+$ INIT_TERM
+$ BCOLOR = BGD
+$ FCOLOR = FGD + RED
+$ COLOR = ESC + "[''BCOLOR';''FCOLOR'm"
+$!
+$ TEXT = "SSL Certificate Tool"
+$ COL = (TT_COLS - (F$LENGTH (TEXT) * 2)) / 4
+$!
+$ SAY ESC + "[01;01H", CSCR
+$ SAY ESC + "[02;''COL'H", COLOR, WIDE, TEXT, NORM
+$!
+$ TEXT = "Sign Certificate Request"
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ SAY ESC + "[04;01H"
+$ SAY ESC + "[04;''COL'H", COLOR, TEXT, NORM
+$!
+$ CTR = 1
+$ ROW = 6
+$ COL = 2
+$ TOP_ROW = ROW
+$ MSG_ROW = TT_ROWS - 1
+$!
+$!------------------------------------------------------------------------------
+$! Initialize the Request Data
+$!------------------------------------------------------------------------------
+$!
+$ IF F$SEARCH ("''SSL_CONF_FILE'") .NES. ""
+$ THEN 
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Reading Configuration ...", NORM
+$ ELSE
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Initializing Configuration ...", NORM
+$ ENDIF
+$!
+$ _ca = "ca"
+$!
+$ _default_ca = "CA_default_ca"
+$ _default_ca_upd = "Y"
+$!
+$ _default_serfile = "SSL$DB:SERIAL.TXT"
+$ _default_serfile_upd = "Y"
+$!
+$ _default_idxfile = "SSL$DB:INDEX.TXT"
+$ _default_idxfile_upd = "Y"
+$!
+$ _default_crtfile = "SSL$CRT:SERVER_CA.CRT"
+$ _default_crtfile_upd = "Y"
+$!
+$ _default_keyfile = "SSL$KEY:SERVER_CA.KEY"
+$ _default_keyfile_upd = "Y"
+$!
+$ _default_csrfile = "SSL$CSR:SERVER.CSR"
+$ _default_csrfile_upd = "Y"
+$!
+$ _default_sgnfile = "SSL$CRT:SIGNED.CRT"
+$ _default_sgnfile_upd = "Y"
+$!
+$ _default_newcert = "SSL$CRT"
+$ _default_newcert_upd = "Y"
+$!
+$ _default_md = "md5"
+$ _default_md_upd = "Y"
+$!
+$ _default_days = "365"
+$ _default_days_upd = "Y"
+$!
+$ _default_policy = "policy_anything"
+$ _default_policy_upd = "Y"
+$!
+$ _policy_countryName = "optional"
+$ _policy_countryName_upd = "Y"
+$!
+$ _policy_stateOrProvinceName = "optional"
+$ _policy_stateOrProvinceName_upd = "Y"
+$!
+$ _policy_localityName = "optional"
+$ _policy_localityName_upd = "Y"
+$!
+$ _policy_organizationName = "optional"
+$ _policy_organizationName_upd = "Y"
+$!
+$ _policy_organizationalUnitName = "optional"
+$ _policy_organizationalUnitName_upd = "Y"
+$!
+$ _policy_commonName = "supplied"
+$ _policy_commonName_upd = "Y"
+$!
+$ _policy_emailAddress = "optional"
+$ _policy_emailAddress_upd = "Y"
+$!
+$ _default_x509_extensions = "CA_x509_extensions"
+$ _default_x509_extensions_upd = "Y"
+$!
+$ _x509_basicContraints = "CA:FALSE"
+$ _x509_basicContraints_upd = "Y"
+$!
+$ _x509_nsCertType = "client,email,objsign,server"
+$ _x509_nsCertType_upd = "Y"
+$!
+$ _x509_nsComment = "SSL Generated Certificate"
+$ _x509_nsComment_upd = "Y"
+$!
+$ _x509_subjectKeyIdentifier = "hash"
+$ _x509_subjectKeyIdentifier_upd = "Y"
+$!
+$ _x509_authorityKeyIdentifier = "keyid,issuer:always"
+$ _x509_authorityKeyIdentifier_upd = "Y"
+$!
+$ IF F$SEARCH ("''SSL_CONF_FILE'") .NES. ""
+$ THEN 
+$     GET_CONF_DATA "[''_ca']#default_ca"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN 
+$         _default_ca = SSL_CONF_DATA
+$         _default_ca_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_ca']#serial"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_serfile = F$PARSE (SSL_CONF_DATA,"SSL$ROOT:",,"DEVICE") + -
+ 		             F$PARSE (SSL_CONF_DATA,"[DB]",,"DIRECTORY") + -
+ 		             F$PARSE (SSL_CONF_DATA,"SERIAL",,"NAME") + -
+ 		             F$PARSE (SSL_CONF_DATA,".TXT",,"TYPE") 
+$         _default_serfile_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_ca']#database"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_idxfile = F$PARSE (SSL_CONF_DATA,"SSL$ROOT:",,"DEVICE") + -
+ 		             F$PARSE (SSL_CONF_DATA,"[DB]",,"DIRECTORY") + -
+ 		             F$PARSE (SSL_CONF_DATA,"INDEX",,"NAME") + -
+ 		             F$PARSE (SSL_CONF_DATA,".TXT",,"TYPE") 
+$         _default_idxfile_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_ca']#certificate"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_crtfile = F$PARSE (SSL_CONF_DATA,"SSL$ROOT:",,"DEVICE") + -
+ 		             F$PARSE (SSL_CONF_DATA,"[CRT]",,"DIRECTORY") + -
+ 		             F$PARSE (SSL_CONF_DATA,"SERVER_CA",,"NAME") + -
+ 		             F$PARSE (SSL_CONF_DATA,".CRT",,"TYPE") 
+$         _default_crtfile_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_ca']#private_key"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_keyfile = F$PARSE (SSL_CONF_DATA,"SSL$ROOT:",,"DEVICE") + -
+ 		             F$PARSE (SSL_CONF_DATA,"[KEY]",,"DIRECTORY") + -
+ 		             F$PARSE (SSL_CONF_DATA,"SERVER_CA",,"NAME") + -
+ 		             F$PARSE (SSL_CONF_DATA,".KEY",,"TYPE") 
+$         _default_keyfile_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_ca']#new_certs_dir"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_newcert = SSL_CONF_DATA
+$         _default_newcert_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_ca']#default_md"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_md = SSL_CONF_DATA
+$         _default_md_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_ca']#default_days"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_days = SSL_CONF_DATA
+$         _default_days_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_ca']#policy"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_policy = SSL_CONF_DATA
+$         _default_policy_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_policy']#countryName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _policy_countryName = SSL_CONF_DATA
+$         _policy_countryName_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_policy']#stateOrProvinceName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _policy_stateOrProvinceName = SSL_CONF_DATA
+$         _policy_stateOrProvinceName_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_policy']#localityName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _policy_localityName = SSL_CONF_DATA
+$         _policy_localityName_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_policy']#organizationName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _policy_organizationName = SSL_CONF_DATA
+$         _policy_organizationName_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_policy']#organizationalUnitName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _policy_organizationalUnitName = SSL_CONF_DATA
+$         _policy_organizationalUnitName_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_policy']#commonName"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _policy_commonName = SSL_CONF_DATA
+$         _policy_commonName_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_policy']#emailAddress"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _policy_emailAddress = SSL_CONF_DATA
+$         _policy_emailAddress_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_ca']#x509_extensions"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _default_x509_extensions = SSL_CONF_DATA
+$         _default_x509_extensions_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_x509_extensions']#basicConstraints"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _x509_basicConstraints = SSL_CONF_DATA
+$         _x509_basicConstraints_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_x509_extensions']#nsCertType"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _x509_nsCertType = SSL_CONF_DATA
+$         _x509_nsCertType_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_x509_extensions']#nsComment"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _x509_nsComment = SSL_CONF_DATA
+$         _x509_nsComment_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_x509_extensions']#subjectKeyIdentifier"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _x509_subjectKeyIdentifier = SSL_CONF_DATA
+$         _x509_subjectKeyIdentifier_upd = "N"
+$     ENDIF
+$!
+$     GET_CONF_DATA "[''_default_x509_extensions']#authorityKeyIdentifier"
+$     IF SSL_CONF_DATA .NES. ""
+$     THEN
+$         _x509_authorityKeyIdentifier = SSL_CONF_DATA
+$         _x509_authorityKeyIdentifier_upd = "N"
+$     ENDIF
+$ ENDIF
+$!
+$ SET_USER_DATA "[''_ca']#default_ca#D#''_default_ca'##S###''_default_ca_upd'#N#N"
+$ SET_USER_DATA "[''_default_ca']#serial#D#''_default_serfile'#Serial File ?#F###''_default_serfile_upd'#N#N"
+$ SET_USER_DATA "[''_default_ca']#database#D#''_default_idxfile'#Database File ?#F###''_default_idxfile_upd'#N#N"
+$ SET_USER_DATA "[''_default_ca']#certificate#D#''_default_crtfile'#CA Certificate File ?#F###''_default_crtfile_upd'#Y#N"
+$ SET_USER_DATA "[''_default_ca']#private_key#D#''_default_keyfile'#CA Certificate Key File ?#F###''_default_keyfile_upd'#Y#N"
+$ SET_USER_DATA "[]#default_csrfile#-#''_default_csrfile'#Certificate Request File ?#F###''_default_csrfile_upd'#Y#N"
+$ SET_USER_DATA "[]#default_sgnfile#-#''_default_sgnfile'#Signed Certificate File ?#F###''_default_sgnfile_upd'#Y#N"
+$ SET_USER_DATA "[''_default_ca']#new_certs_dir#D#''_default_newcert'#New Certificate Directory ?#S###''_default_newcert_upd'#N#N"
+$ SET_USER_DATA "[''_default_ca']#default_md#D#''_default_md'#Default Digest ?#I###''_default_md_upd'#N#N"
+$ SET_USER_DATA "[''_default_ca']#default_days#D#''_default_days'#Default Days ?#I###''_default_days_upd'#Y#N"
+$ SET_USER_DATA "[''_default_ca']#policy#D#''_default_policy'#Default Policy ?#S###''_default_policy_upd'#N#N"
+$ SET_USER_DATA "[''_default_policy']#countryName#D#''_policy_countryName'#Country Name Policy ?#S###''_policy_countryName_upd'#N#N"
+$ SET_USER_DATA "[''_default_policy']#stateOrProvinceName#D#''_policy_stateOrProvinceName'#State or Province Name Policy ?#S###''_policy_stateOrProvinceName_upd'#N#N"
+$ SET_USER_DATA "[''_default_policy']#localityName#D#''_policy_localityName'#Locality Name Policy ?#S###''_policy_localityName_upd'#N#N"
+$ SET_USER_DATA "[''_default_policy']#organizationName#D#''_policy_organizationName'#Organization Name Policy ?#S###''_policy_organizationName_upd'#N#N"
+$ SET_USER_DATA "[''_default_policy']#organizationalUnitName#D#''_policy_organizationalUnitName'#Organization Unit Name Policy ?#S###''_policy_organizationalUnitName_upd'#N#N"
+$ SET_USER_DATA "[''_default_policy']#commonName#D#''_policy_commonName'#Common Name Policy ?#S###''_policy_commonName_upd'#N#N"
+$ SET_USER_DATA "[''_default_policy']#emailAddress#D#''_policy_emailAddress'#Email Address Policy ?#S###''_policy_emailAddress_upd'#N#N"
+$ SET_USER_DATA "[''_default_ca']#x509_extensions#D#''_default_x509_extensions'#X509 Extensions ?#S###''_default_x509_extensions_upd'#N#N"
+$ SET_USER_DATA "[''_default_x509_extensions']#basicConstraints#D#''_x509_basicConstraints'#X509 Basic Constraints ?#S###''_x509_basicConstraints_upd'#N#N"
+$ SET_USER_DATA "[''_default_x509_extensions']#nsCertType#D#''_x509_nsCertType'#X509 NS Cert Type ?#S###''_x509_nsCertType_upd'#N#N"
+$ SET_USER_DATA "[''_default_x509_extensions']#nsComment#D#''_x509_nsComment'#X509 NS Comment ?#S###''_x509_nsComment_upd'#N#N"
+$ SET_USER_DATA "[''_default_x509_extensions']#subjectKeyIdentifier#D#''_x509_subjectKeyIdentifier'#X509 Subject Key Identifier ?#S###''_x509_subjectKeyIdentifier_upd'#N#N"
+$ SET_USER_DATA "[''_default_x509_extensions']#authorityKeyIdentifier#D#''_x509_authorityKeyIdentifier'#X509 Authority Key Identifier ?#S###''_x509_authorityKeyIdentifier_upd'#N#N"
+$ SET_USER_DATA "[]#pem_pass_phrase#-##PEM Pass Phrase ?#P#1###Y#N"
+$ SET_USER_DATA "[]#display_certificate#-#N#Display the Certificate ?#S##1##Y#N"
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$!
+$!------------------------------------------------------------------------------
+$! Confirm/Update the SSL Configuration Data
+$!------------------------------------------------------------------------------
+$!
+$PROMPT_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN 
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     TYP = F$ELEMENT (5,"#",SSL_USER_DATA_'CTR') ! Value Type
+$     MIN = F$ELEMENT (6,"#",SSL_USER_DATA_'CTR') ! Value Minimum Length
+$     MAX = F$ELEMENT (7,"#",SSL_USER_DATA_'CTR') ! Value Maximum Length
+$     UPD = F$ELEMENT (8,"#",SSL_USER_DATA_'CTR') ! Entry Updated ?
+$     REQ = F$ELEMENT (9,"#",SSL_USER_DATA_'CTR') ! Entry Required for Input ?
+$     CFM = F$ELEMENT (10,"#",SSL_USER_DATA_'CTR')! Confirm Input  ?
+$     CONFIRMED = 0
+$     IF REQ .EQS. "N"
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO PROMPT_LOOP
+$     ENDIF
+$     IF ROW .GT. MSG_ROW - 2
+$     THEN 
+$         SAY ESC + "[''TOP_ROW';01H", CEOS
+$	  ROW = TOP_ROW
+$     ENDIF
+$!
+$CONFIRM_LOOP:
+$!
+$     IF PRM .EQS. "" 
+$     THEN 
+$         PROMPT = ESC + "[''ROW';''COL'H''ITM' ? [''DEF'] ''CEOL'"
+$     ELSE
+$         PROMPT = ESC + "[''ROW';''COL'H''PRM' [''DEF'] ''CEOL'"
+$     ENDIF
+$     IF TYP .EQS. "P" THEN SET TERMINAL /NOECHO
+$     ASK "''PROMPT'" ANS /END_OF_FILE=EXIT
+$     IF TYP .EQS. "P" THEN SET TERMINAL /ECHO
+$     ANS = F$EDIT (ANS,"TRIM")
+$     IF ANS .EQS. "" THEN ANS = DEF
+$     IF TYP .EQS. "F"
+$     THEN
+$         ANS = F$PARSE ("''ANS'","''DEF'",,,"SYNTAX_ONLY")
+$     ENDIF
+$     IF TYP .EQS. "I" .AND. F$TYPE (ANS) .NES. "INTEGER"
+$     THEN 
+$         CALL INVALID_ENTRY
+$         SAY ESC + "[''ROW';01H", CEOS
+$         GOTO PROMPT_LOOP
+$     ENDIF
+$     IF (TYP .EQS. "S" .OR. TYP .EQS. "P") .AND. -
+         ((MIN .NES. "" .AND. F$LENGTH (ANS) .LT. F$INTEGER(MIN)) .OR. -
+          (MAX .NES. "" .AND. F$LENGTH (ANS) .GT. F$INTEGER(MAX)))
+$     THEN 
+$         CALL INVALID_ENTRY
+$         SAY ESC + "[''ROW';01H", CEOS
+$	  IF TYP .EQS. "S" THEN GOTO PROMPT_LOOP
+$         IF TYP .EQS. "P" THEN GOTO CONFIRM_LOOP
+$     ENDIF
+$     ROW = ROW + 1
+$     IF CFM .EQS. "Y"
+$     THEN
+$         IF CONFIRMED .EQ. 0
+$	  THEN
+$	      CONFIRMED = 1
+$	      CONFIRMED_ANS = ANS
+$	      PRM = "Confirm ''PRM'"
+$	      GOTO CONFIRM_LOOP
+$         ELSE
+$	      IF ANS .NES. CONFIRMED_ANS
+$	      THEN 
+$                 CALL INVALID_ENTRY
+$		  ROW = ROW - 2
+$                 SAY ESC + "[''ROW';01H", CEOS
+$                 GOTO PROMPT_LOOP
+$	      ENDIF
+$         ENDIF
+$     ENDIF
+$     IF ANS .NES. DEF THEN SSL_USER_DATA_'CTR' = "''KEY'#''ITM'#''VAL'#''ANS'#''PRM'#''TYP'#''MIN'#''MAX'#Y#''REQ'#''CFM'"
+$     CTR = CTR + 1
+$     GOTO PROMPT_LOOP
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Save the SSL Configuration Data
+$!------------------------------------------------------------------------------
+$!
+$ CTR = 1
+$ SAY ESC + "[''MSG_ROW';01H", BLNK, " Saving Configuration ...", NORM
+$!
+$SAVE_CONF_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN 
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     TYP = F$ELEMENT (5,"#",SSL_USER_DATA_'CTR') ! Value Type
+$     MIN = F$ELEMENT (6,"#",SSL_USER_DATA_'CTR') ! Value Minimum Length
+$     MAX = F$ELEMENT (7,"#",SSL_USER_DATA_'CTR') ! Value Maximum Length
+$     UPD = F$ELEMENT (8,"#",SSL_USER_DATA_'CTR') ! Entry Updated ?
+$     REQ = F$ELEMENT (9,"#",SSL_USER_DATA_'CTR') ! Entry Required for Input ?
+$     CFM = F$ELEMENT (10,"#",SSL_USER_DATA_'CTR')! Confirm Input ?
+$     IF UPD .NES. "Y" .OR. VAL .EQS. "-"
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO SAVE_CONF_LOOP
+$     ENDIF
+$     IF VAL .EQS. "D"
+$     THEN 
+$         SET_CONF_DATA "''KEY'#''ITM'" "''DEF'"
+$     ELSE
+$         SET_CONF_DATA "''KEY'#''ITM'" "''PRM'"
+$         SET_CONF_DATA "''KEY'#''ITM'_default" "''DEF'"
+$     ENDIF
+$     IF MIN .NES. "" THEN SET_CONF_DATA "''KEY'#''ITM'_min" "''MIN'"
+$     IF MAX .NES. "" THEN SET_CONF_DATA "''KEY'#''ITM'_max" "''MAX'"
+$     CTR = CTR + 1
+$     GOTO SAVE_CONF_LOOP
+$ ENDIF
+$!
+$ PURGE /NOLOG /NOCONFIRM 'SSL_CONF_FILE'
+$ RENAME 'SSL_CONF_FILE'; ;1
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$!
+$!------------------------------------------------------------------------------
+$! Create the Certificiate Authority
+$!------------------------------------------------------------------------------
+$!
+$SKIP:
+$!
+$ SAY ESC + "[''MSG_ROW';01H", BLNK, " Signing Certificate Request ...", NORM
+$!
+$ X1 = 2
+$ Y1 = TOP_ROW
+$ X2 = TT_COLS - 2
+$ Y2 = MSG_ROW - 1
+$!
+$ GET_USER_DATA "[]#pem_pass_phrase"
+$ _pem_pass_phrase = SSL_USER_DATA
+$ GET_USER_DATA "[''_default_ca']#database"
+$ _default_idxfile = SSL_USER_DATA
+$ GET_USER_DATA "[''_default_ca']#serial"
+$ _default_serfile = SSL_USER_DATA
+$ GET_USER_DATA "[]#default_csrfile"
+$ _default_csrfile = SSL_USER_DATA
+$ GET_USER_DATA "[]#default_sgnfile"
+$ _default_sgnfile = SSL_USER_DATA
+$ GET_USER_DATA "[]#display_certificate"
+$ _display_certificate = SSL_USER_DATA
+$!
+$ IF F$SEARCH ("''_default_idxfile'") .EQS. ""
+$ THEN
+$     OPEN /WRITE OFILE '_default_idxfile'
+$     CLOSE OFILE
+$ ENDIF
+$!
+$ IF F$SEARCH ("''_default_serfile'") .EQS. ""
+$ THEN
+$     OPEN /WRITE OFILE '_default_serfile'
+$     WRITE OFILE "01"
+$     CLOSE OFILE
+$ ENDIF
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SHOW SYSTEM /FULL /OUT=SYS$LOGIN:SSL_CA_'PID'.RND
+$!
+$ OPEN /WRITE OFILE SYS$LOGIN:SSL_CA_'PID'.COM
+$ WRITE OFILE "$ SET NOON"
+$ WRITE OFILE "$ SET MESSAGE /NOFACILITY /NOIDENTIFICATION /NOSEVERITY /NOTEXT"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG RANDFILE    SYS$LOGIN:SSL_CA_''PID'.RND"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_CA_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_CA_''PID'.LOG"
+$ WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$ WRITE OFILE "$ OPENSSL ca -config ''SSL_CONF_FILE' -out ''_default_sgnfile' -infiles ''_default_csrfile'"
+$ WRITE OFILE "''_pem_pass_phrase'"
+$ WRITE OFILE "y"
+$ WRITE OFILE "y"
+$ WRITE OFILE "$ SET MESSAGE /FACILITY /IDENTIFICATION /SEVERITY /TEXT"
+$ CLOSE OFILE
+$!
+$ @SYS$LOGIN:SSL_CA_'PID'.COM
+$!
+$ DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_CA_'PID'.RND;*
+$ DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_CA_'PID'.COM;*
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ SEARCH SYS$LOGIN:SSL_CA_'PID'.LOG /OUT=SYS$LOGIN:SSL_CA_'PID'.ERR "error:"
+$ IF F$SEARCH ("SYS$LOGIN:SSL_CA_''PID'.ERR") .NES. "" 
+$ THEN 
+$     IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_CA_''PID'.ERR","ALQ") .NE. 0
+$     THEN 
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_CA_'PID'.ERR;*
+$         SAY ESC + "[''MSG_ROW';01H''BELL'''CEOS'"
+$         SHOW_FILE "SYS$LOGIN:SSL_CA_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ERROR >" 
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_CA_'PID'.LOG;*
+$         GOTO EXIT
+$     ENDIF
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_CA_'PID'.ERR;*
+$ ENDIF
+$!
+$ DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_CA_'PID'.LOG;*
+$! 
+$ IF F$EDIT (_display_certificate,"TRIM,UPCASE") .EQS. "Y"
+$ THEN 
+$     SAY ESC + "[''MSG_ROW';01H", BLNK, " Generating Output ...", NORM, CEOL
+$!
+$     OPEN /WRITE OFILE SYS$LOGIN:SSL_X509_'PID'.COM
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_X509_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_X509_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$     WRITE OFILE "$ OPENSSL x509 -noout -text -in ''_default_sgnfile'"
+$     CLOSE OFILE
+$!
+$     @SYS$LOGIN:SSL_X509_'PID'.COM
+$!
+$     DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.COM;*
+$!
+$     DEFINE /USER /NOLOG SYS$ERROR  NL:
+$     DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$     SEARCH SYS$LOGIN:SSL_X509_'PID'.LOG /OUT=SYS$LOGIN:SSL_X509_'PID'.ERR ":error:"
+$     IF F$SEARCH ("SYS$LOGIN:SSL_X509_''PID'.ERR") .NES. "" 
+$     THEN 
+$         IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_X509_''PID'.ERR","ALQ") .NE. 0
+$         THEN 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.ERR;*
+$             SAY ESC + "[''MSG_ROW';01H''BELL'''CEOS'"
+$             SHOW_FILE "SYS$LOGIN:SSL_X509_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ERROR >" 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.LOG;*
+$             GOTO EXIT
+$         ENDIF
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.ERR;*
+$     ENDIF
+$!
+$     SAY ESC + "[''MSG_ROW';01H''CEOS'"
+$     SHOW_FILE "SYS$LOGIN:SSL_X509_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ''_default_sgnfile' >" 
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.LOG;*
+$     GOTO EXIT
+$ ENDIF
+$!
+$ TEXT = "Press return to continue"
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$ PROMPT = ESC + "[''MSG_ROW';''COL'H''TEXT'"
+$ ASK "''PROMPT'" OPT
+$!
+$GOTO EXIT
+$!
+$!------------------------------------------------------------------------------
+$! Set the User Data
+$!------------------------------------------------------------------------------
+$!
+$SET_USER_DATA: SUBROUTINE
+$!
+$ IF F$TYPE (SSL_USER_DATA_MAX) .EQS. ""
+$ THEN
+$     SSL_USER_DATA_MAX == 1
+$ ELSE
+$     SSL_USER_DATA_MAX == SSL_USER_DATA_MAX + 1
+$ ENDIF
+$!
+$ SSL_USER_DATA_'SSL_USER_DATA_MAX' == "''P1'"
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Find the Request Data
+$!------------------------------------------------------------------------------
+$!
+$GET_USER_DATA: SUBROUTINE
+$!
+$ CTR = 1
+$ USER_KEY = F$ELEMENT (0,"#",P1)
+$ USER_ITM = F$ELEMENT (1,"#",P1)
+$!
+$GET_USER_DATA_LOOP:
+$!
+$ IF CTR .LE. SSL_USER_DATA_MAX
+$ THEN
+$     KEY = F$ELEMENT (0,"#",SSL_USER_DATA_'CTR') ! Key Name
+$     ITM = F$ELEMENT (1,"#",SSL_USER_DATA_'CTR') ! Item Name
+$     VAL = F$ELEMENT (2,"#",SSL_USER_DATA_'CTR') ! Item Value Contains Default or Prompt
+$     DEF = F$ELEMENT (3,"#",SSL_USER_DATA_'CTR') ! Default Value
+$     PRM = F$ELEMENT (4,"#",SSL_USER_DATA_'CTR') ! Prompt Value
+$     IF USER_KEY .NES. KEY .OR. USER_ITM .NES. ITM
+$     THEN 
+$         CTR = CTR + 1
+$         GOTO GET_USER_DATA_LOOP
+$     ENDIF
+$     IF VAL .EQS. "-" THEN SSL_USER_DATA == "''DEF'"
+$     IF VAL .EQS. "D" THEN SSL_USER_DATA == "''DEF'"
+$     IF VAL .EQS. "P" THEN SSL_USER_DATA == "''PRM'"
+$ ENDIF
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Delete the User Data
+$!------------------------------------------------------------------------------
+$!
+$DEL_USER_DATA: SUBROUTINE
+$!
+$ IF F$TYPE (SSL_USER_DATA_MAX) .EQS. "" THEN GOTO DEL_USER_DATA_END
+$!
+$DEL_USER_DATA_LOOP:
+$!
+$ IF F$TYPE (SSL_USER_DATA_'SSL_USER_DATA_MAX') .NES. "" 
+$ THEN
+$     DELETE /SYMBOL /GLOBAL SSL_USER_DATA_'SSL_USER_DATA_MAX'
+$     SSL_USER_DATA_MAX == SSL_USER_DATA_MAX - 1
+$     GOTO DEL_USER_DATA_LOOP
+$ ENDIF
+$!
+$ DELETE /SYMBOL /GLOBAL SSL_USER_DATA_MAX
+$!
+$DEL_USER_DATA_END:
+$!
+$ IF F$TYPE (SSL_USER_DATA) .NES. "" THEN DELETE /SYMBOL /GLOBAL SSL_USER_DATA
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Display the invalid entry 
+$!------------------------------------------------------------------------------
+$!
+$INVALID_ENTRY: SUBROUTINE
+$!
+$ SAY ESC + "[''MSG_ROW';01H", BELL, " Invalid Entry, Try again ...''CEOL'"
+$ Wait 00:00:01.5
+$ SAY ESC + "[''MSG_ROW';01H", CEOL
+$!
+$ EXIT
+$!
+$ ENDSUBROUTINE
+$!
+$!------------------------------------------------------------------------------
+$! Exit the procedure
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ DEASSIGN SYS$OUTPUT
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ DEASSIGN SYS$ERROR
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ CLOSE OFILE
+$!
+$ DEL_USER_DATA
+$!
+$ IF F$TYPE (SSL_CONF_DATA) .NES. "" THEN DELETE /SYMBOL /GLOBAL SSL_CONF_DATA
+$!
+$ IF F$GETDVI ("TT:","TT_NOECHO") .AND. .NOT. TT_NOECHO THEN SET TERMINAL /ECHO
+$!
+$ IF F$SEARCH ("SYS$LOGIN:SSL_CA_''PID'.%%%;*") .NES. "" THEN DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_CA_'PID'.%%%;*
+$ IF F$SEARCH ("SYS$LOGIN:SSL_X509_''PID'.%%%;*") .NES. "" THEN DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.%%%;*
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/cert_tool/ssl$view_cert.com
+++ b/VMS/cert_tool/ssl$view_cert.com
@@ -0,0 +1,245 @@
+$!
+$!------------------------------------------------------------------------------
+$! SSL$VIEW_CERT.COM - SSL View Certificate procedure
+$!------------------------------------------------------------------------------
+$!
+$ Verify = F$VERIFY (0)
+$ Set NoOn
+$ Set NoControl=Y
+$!
+$!------------------------------------------------------------------------------
+$! Description 
+$!------------------------------------------------------------------------------
+$!
+$! This procedure prompts the user through creating a Server Certificate.
+$!
+$! The parameters used are:
+$!
+$! 	P1	- Certificate or Certificate Request (i.e. "CRT" or "CSR")
+$!
+$!------------------------------------------------------------------------------
+$! Define symbols
+$!------------------------------------------------------------------------------
+$!
+$ DELETE := DELETE
+$ SAY := WRITE SYS$OUTPUT
+$ ASK := READ SYS$COMMAND /END_OF_FILE=EXIT /PROMPT=
+$ PID = F$GETJPI ("","PID")
+$ TT_NOECHO = F$GETDVI ("TT:","TT_NOECHO")
+$ On Control_Y THEN GOTO EXIT
+$ Set Control=Y
+$!
+$ TT_ROWS = F$GETDVI ("TT:","TT_PAGE")
+$ TT_COLS = F$GETDVI ("TT:","DEVBUFSIZ")
+$!
+$ INIT_TERM := @SSL$COM:SSL$INIT_TERM
+$ PICK_FILE := @SSL$COM:SSL$PICK_FILE 
+$ SHOW_FILE := @SSL$COM:SSL$SHOW_FILE 
+$!
+$ ESC[0,8] = 27 	! Set the Escape Character
+$ BELL[0,8] = 7 	! Ring the terminal Bell
+$ RED = 1		! Color - Red
+$ FGD = 30		! Foreground
+$ BGD = 0		! Background
+$ CSCR = ESC + "[2J"	! Clear the Screen 
+$ CEOS = ESC + "[0J"	! Clear to the End of the Screen 
+$ CEOL = ESC + "[0K"	! Clear to the End of the Line
+$ NORM = ESC + "[0m"	! Turn Attributes off
+$ BLNK = ESC + "[5m"    ! Turn on BLINK Attribute
+$ WIDE = ESC + "#6"     ! Turn on WIDE Attribute
+$!
+$!------------------------------------------------------------------------------
+$! Run the SSL setup if it hasn't been run yet
+$!------------------------------------------------------------------------------
+$!
+$ IF F$TRNLNM ("SSL$ROOT") .EQS. ""
+$ THEN
+$     IF F$SEARCH ("SSL$COM:SSL$INIT_ENV.COM") .NES. ""
+$     THEN 
+$         @SSL$COM:SSL$INIT_ENV.COM
+$     ELSE
+$         SAY BELL, "Unable to locate SSL$COM:SSL$INIT_ENV.COM ..."
+$	  GOTO EXIT
+$     ENDIF
+$ ENDIF
+$!
+$!------------------------------------------------------------------------------
+$! Display the Page Header
+$!------------------------------------------------------------------------------
+$!
+$ INIT_TERM
+$ BCOLOR = BGD
+$ FCOLOR = FGD + RED
+$ COLOR = ESC + "[''BCOLOR';''FCOLOR'm"
+$!
+$ TEXT = "SSL Certificate Tool"
+$ COL = (TT_COLS - (F$LENGTH (TEXT) * 2)) / 4
+$!
+$ SAY ESC + "[01;01H", CSCR
+$ SAY ESC + "[02;''COL'H", COLOR, WIDE, TEXT, NORM
+$!
+$ IF P1 .EQS. "CSR"
+$ THEN 
+$     TEXT = "View Certificate Request"
+$ ELSE
+$     TEXT = "View Certificate"
+$ ENDIF
+$ COL = (TT_COLS - F$LENGTH (TEXT)) / 2
+$!
+$ SAY ESC + "[04;01H"
+$ SAY ESC + "[04;''COL'H", COLOR, TEXT, NORM
+$!
+$ CTR = 1
+$ ROW = 6
+$ COL = 2
+$ TOP_ROW = ROW
+$ MSG_ROW = TT_ROWS - 1
+$!
+$!------------------------------------------------------------------------------
+$! Initialize the Request Data
+$!------------------------------------------------------------------------------
+$!
+$ IF P1 .NES. "CRT" .AND. P1 .NES. "CSR"
+$ THEN 
+$     PRM = "Display File:"
+$     DEF = "*.*"
+$ ENDIF
+$!
+$ IF P1 .EQS. "CRT"
+$ THEN 
+$     PRM = "Display Certificate File:"
+$     DEF = "SSL$CRT:*.CRT"
+$ ENDIF
+$!
+$ IF P1 .EQS. "CSR"
+$ THEN 
+$     PRM = "Display Certificate Request File:"
+$     DEF = "SSL$CSR:*.CSR"
+$ ENDIF
+$!
+$ SAY ESC + "[''MSG_ROW';01H", CEOS
+$!
+$!------------------------------------------------------------------------------
+$! Confirm/Update the SSL Configuration Data
+$!------------------------------------------------------------------------------
+$!
+$PROMPT_LOOP:
+$!
+$ PROMPT = ESC + "[''ROW';''COL'H''PRM' ? [''DEF'] ''CEOL'"
+$ ASK "''PROMPT'" _view_file_name
+$ _view_file_name = F$EDIT (_view_file_name,"TRIM")
+$ IF _view_file_name .EQS. "" THEN _view_file_name = DEF
+$!
+$ X1 = 2
+$ Y1 = TOP_ROW
+$ X2 = TT_COLS - 2
+$ Y2 = MSG_ROW - 1
+$!
+$PICK_FILE:
+$!
+$ PICK_FILE "''_view_file_name'" 'X1' 'Y1' 'X2' 'Y2' "< Select a File >" 
+$!
+$ SAY ESC + "[''TOP_ROW';01H", CEOS
+$! 
+$ IF SSL_FILE_NAME .EQS. "" THEN GOTO EXIT
+$!
+$!------------------------------------------------------------------------------
+$! Create the Certificiate Authority
+$!------------------------------------------------------------------------------
+$!
+$ SAY ESC + "[''MSG_ROW';01H", BLNK, " Generating Output ...", NORM, CEOL
+$!
+$ IF P1 .EQS. "CRT"
+$ THEN 
+$     OPEN /WRITE OFILE SYS$LOGIN:SSL_X509_'PID'.COM
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_X509_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_X509_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$     WRITE OFILE "$ OPENSSL x509 -noout -text -in ''SSL_FILE_NAME'"
+$     CLOSE OFILE
+$!
+$     @SYS$LOGIN:SSL_X509_'PID'.COM
+$!
+$     DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.COM;*
+$!
+$     DEFINE /USER /NOLOG SYS$ERROR  NL:
+$     DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$     SEARCH SYS$LOGIN:SSL_X509_'PID'.LOG /OUT=SYS$LOGIN:SSL_X509_'PID'.ERR ":error:"
+$     IF F$SEARCH ("SYS$LOGIN:SSL_X509_''PID'.ERR") .NES. "" 
+$     THEN 
+$         IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_X509_''PID'.ERR","ALQ") .NE. 0
+$         THEN 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.ERR;*
+$             SAY ESC + "[''MSG_ROW';01H''BELL'''CEOS'"
+$             SHOW_FILE "SYS$LOGIN:SSL_X509_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ERROR >" 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.LOG;*
+$             GOTO EXIT
+$         ENDIF
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.ERR;*
+$     ENDIF
+$!
+$     SAY ESC + "[''MSG_ROW';01H''CEOS'"
+$     SHOW_FILE "SYS$LOGIN:SSL_X509_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ''SSL_FILE_NAME' >" 
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.LOG;*
+$     GOTO PICK_FILE
+$ ENDIF
+$!
+$ IF P1 .EQS. "CSR"
+$ THEN 
+$     OPEN /WRITE OFILE SYS$LOGIN:SSL_REQ_'PID'.COM
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$ERROR   SYS$LOGIN:SSL_REQ_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$OUTPUT  SYS$LOGIN:SSL_REQ_''PID'.LOG"
+$     WRITE OFILE "$ DEFINE /USER /NOLOG SYS$COMMAND SYS$INPUT"
+$     WRITE OFILE "$ OPENSSL req -noout -text -in ''SSL_FILE_NAME'"
+$     CLOSE OFILE
+$!
+$     @SYS$LOGIN:SSL_REQ_'PID'.COM
+$!
+$     DELETE/NOLOG/NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.COM;*
+$!
+$     DEFINE /USER /NOLOG SYS$ERROR  NL:
+$     DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$     SEARCH SYS$LOGIN:SSL_REQ_'PID'.LOG /OUT=SYS$LOGIN:SSL_REQ_'PID'.ERR ":error:"
+$     IF F$SEARCH ("SYS$LOGIN:SSL_REQ_''PID'.ERR") .NES. "" 
+$     THEN 
+$         IF F$FILE_ATTRIBUTE ("SYS$LOGIN:SSL_REQ_''PID'.ERR","ALQ") .NE. 0
+$         THEN 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.ERR;*
+$             SAY ESC + "[''MSG_ROW';01H''BELL'''CEOS'"
+$             SHOW_FILE "SYS$LOGIN:SSL_REQ_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ERROR >" 
+$             DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.LOG;*
+$             GOTO EXIT
+$         ENDIF
+$         DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.ERR;*
+$     ENDIF
+$!
+$     SAY ESC + "[''MSG_ROW';01H''CEOS'"
+$     SHOW_FILE "SYS$LOGIN:SSL_REQ_''PID'.LOG" 'X1' 'Y1' 'X2' 'Y2' "< ''SSL_FILE_NAME' >" 
+$     DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.LOG;*
+$     GOTO PICK_FILE
+$ ENDIF
+$!
+$ SAY ESC + "[''MSG_ROW';01H''CEOS'"
+$ SHOW_FILE "''SYS$LOGIN:SSL_FILE_NAME'" 'X1' 'Y1' 'X2' 'Y2' "< ''SSL_FILE_NAME' >"
+$ GOTO PICK_FILE
+$!
+$!------------------------------------------------------------------------------
+$! Exit the procedure
+$!------------------------------------------------------------------------------
+$!
+$EXIT:
+$!
+$ DEFINE /USER /NOLOG SYS$ERROR  NL:
+$ DEFINE /USER /NOLOG SYS$OUTPUT NL:
+$ CLOSE OFILE
+$!
+$ IF F$TYPE (SSL_FILE_NAME) .NES. "" THEN DELETE /SYMBOL /GLOBAL SSL_FILE_NAME
+$!
+$ IF F$GETDVI ("TT:","TT_NOECHO") .AND. .NOT. TT_NOECHO THEN SET TERMINAL /ECHO
+$!
+$ IF F$SEARCH ("SYS$LOGIN:SSL_REQ_''PID'.%%%;*") .NES. "" THEN DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_REQ_'PID'.%%%;*
+$ IF F$SEARCH ("SYS$LOGIN:SSL_X509_''PID'.%%%;*") .NES. "" THEN DELETE /NOLOG /NOCONFIRM SYS$LOGIN:SSL_X509_'PID'.%%%;*
+$!
+$ Verify = F$VERIFY (Verify)
+$!
+$ EXIT
--- a/VMS/install.com
+++ b/VMS/install.com
@@ -26,47 +26,129 @@ $	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]
+$	DEFINE/NOLOG WRK_SSLCOM WRK_SSLROOT:[COM]
 $
 $	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$PARSE("WRK_SSLROOT:[VMS]") .EQS. "" THEN -
+$!	   CREATE/DIR/LOG WRK_SSLROOT:[VMS]
+$	IF F$PARSE("WRK_SSLCOM:") .EQS. "" THEN -
+	   CREATE/DIR/LOG WRK_SSLROOT:[COM]
 $
 $	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"
+$	OPEN/WRITE SF WRK_SSLCOM:SSL$STARTUP.COM
+$	WRITE SYS$OUTPUT "%OPEN-I-CREATED,  ",F$SEARCH("WRK_SSLCOM:SSL$STARTUP.COM")," created."
+$	WRITE SF "$! Startup file for SSL 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 "$! Instead, add or change SSL$COM:SSL$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 "$ IF F$SEARCH(""SYS$STARTUP:SSL$DEFINE_ROOT.COM"") .NES."""" THEN -"
+$	WRITE SF "$	@SYS$STARTUP:SSL$DEFINE_ROOT.COM"
+$	WRITE SF "$!"
+$	WRITE SF "$!"
+$	WRITE SF "$	DEFINE/NOLOG/SYSTEM/EXEC	SSL$CERTS	SSL$ROOT:[CERTS]"
+$	WRITE SF "$	DEFINE/NOLOG/SYSTEM/EXEC	SSL$COM		SSL$ROOT:[COM]"
+$	WRITE SF "$	DEFINE/NOLOG/SYSTEM/EXEC	SSL$EXE		SSL$ROOT:['ARCH'_EXE]"
+$	WRITE SF "$	DEFINE/NOLOG/SYSTEM/EXEC	SSL$INCLUDE	SSL$ROOT:[INCLUDE]"
+$	WRITE SF "$	DEFINE/NOLOG/SYSTEM/EXEC	SSL$KEY		SSL$ROOT:[CERTS]"
+$	WRITE SF "$	DEFINE/NOLOG/SYSTEM/EXEC	SSL$PRIVATE	SSL$ROOT:[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 "$	DEFINE/NOLOG/SYSTEM/EXEC	OPENSSL		SSL$INCLUDE:"
+$	WRITE SF "$!"
+$	WRITE SF "$	IF F$SEARCH(""SSL$COM:SSL$SYSTARTUP.COM"") .NES."""" THEN -"
+$	WRITE SF "	   @SSL$COM:SSL$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
-$
+$	SET FILE/PROT=WORLD:RE WRK_SSLCOM:SSL$STARTUP.COM
+$!
+$	OPEN/WRITE SF WRK_SSLCOM:SSL$SHUTDOWN.COM
+$	WRITE SYS$OUTPUT "%OPEN-I-CREATED,  ",F$SEARCH("WRK_SSLCOM:SSL$SHUTDOWN.COM")," created."
+$	WRITE SF "$! Shutdown file for SSL"
+$	WRITE SF "$!"
+$	WRITE SF "$! Do not edit this file, as it will be regenerated during next installation."
+$	WRITE SF "$!"
+$	WRITE SF "$	ARCH = ""VAX"""
+$	WRITE SF "$	IF F$GETSYI(""CPU"") .GE. 128 THEN ARCH = ""ALPHA"""
+$	WRITE SF "$!"
+$	WRITE SF "$ IF F$SEARCH(""SSL$COM:SSL$SYSHUTDOWN.COM"") .NES."""" THEN -"
+$	WRITE SF "	@SSL$COM:SSL$SYSHUTDOWN.COM"
+$	WRITE SF "$!"
+$	WRITE SF "$ IF F$TRNLNM(""SSL$CERTS"") .NES."""" THEN -"
+$	WRITE SF "	DEASSIGN/SYSTEM/EXEC	SSL$CERTS"
+$!
+$	WRITE SF "$ IF F$TRNLNM(""SSL$COM"") .NES."""" THEN -"
+$	WRITE SF "	DEASSIGN/SYSTEM/EXEC	SSL$COM"
+$!
+$	WRITE SF "$ IF F$TRNLNM(""SSL$EXE"") .NES."""" THEN -"
+$	WRITE SF "	DEASSIGN/SYSTEM/EXEC	SSL$EXE"
+$!
+$	WRITE SF "$ IF F$TRNLNM(""SSL$INCLUDE"") .NES."""" THEN -"
+$	WRITE SF "	DEASSIGN/SYSTEM/EXEC	SSL$INCLUDE"
+$!
+$	WRITE SF "$ IF F$TRNLNM(""SSL$KEY"") .NES."""" THEN -"
+$	WRITE SF "	DEASSIGN/SYSTEM/EXEC	SSL$KEY"
+$!
+$	WRITE SF "$ IF F$TRNLNM(""SSL$PRIVATE"") .NES."""" THEN -"
+$	WRITE SF "	DEASSIGN/SYSTEM/EXEC	SSL$PRIVATE"
+$!
+$	WRITE SF "$!"
+$	WRITE SF "$ IF F$TRNLNM(""OPENSSL"") .NES."""" THEN -"
+$	WRITE SF "	DEASSIGN/SYSTEM/EXEC	OPENSSL"
+$	WRITE SF "$!"
+$	WRITE SF "$ IF F$TRNLNM(""SSL$ROOT"") .NES."""" THEN -"
+$	WRITE SF "	DEASSIGN/SYSTEM/EXEC SSL$ROOT"
+$	WRITE SF "$!"
+$	WRITE SF "$	EXIT"
+$	CLOSE SF
+$	SET FILE/PROT=WORLD:RE WRK_SSLCOM:SSL$SHUTDOWN.COM
+$!
+$	COPY SSL$UTILS.COM WRK_SSLCOM:/LOG
+$	SET FILE/PROT=WORLD:RE WRK_SSLCOM:SSL$UTILS.COM
+$!
+$	COPY SSL$SYSTARTUP.COM WRK_SSLCOM:/LOG
+$	SET FILE/PROT=WORLD:RE WRK_SSLCOM:SSL$SYSTARTUP.COM
+$	COPY SSL$SYSHUTDOWN.COM WRK_SSLCOM:/LOG
+$	SET FILE/PROT=WORLD:RE WRK_SSLCOM:SSL$SYSHUTDOWN.COM
+$!
+$	CERT_DIR := [.CERT_TOOL]
+$	CERT_FILES := SSL$AUTH_CERT.COM,SSL$AUTO_CERT.COM,SSL$CERT_TOOL.COM, -
+		      SSL$CONF_UTIL.COM,SSL$DRAW_BOX.COM,SSL$EXIT_CMD.TPU, -
+		      SSL$FILL_BOX.COM,SSL$HASH_CERT.COM,SSL$HOSTADDR.EXE, -
+		      SSL$HOSTNAME.EXE,SSL$INIT_ENV.COM,SSL$INIT_TERM.COM, -
+		      SSL$PICK_FILE.COM,SSL$RQST_CERT.COM,SSL$SELF_CERT.COM, -
+		      SSL$SHOW_FILE.COM,SSL$SIGN_CERT.COM,SSL$VIEW_CERT.COM, -
+		      SSL$REM_ENV.COM
+$!
+$	I = 0
+$ LOOP:
+$       CF = F$EDIT(F$ELEMENT(I, ",", CERT_FILES),"TRIM")
+$       I = I + 1
+$       IF CF .EQS. "," THEN GOTO LOOP_END
+$       SET NOON
+$       IF F$SEARCH(CERT_DIR+CF) .NES. ""
+$       THEN
+$         COPY 'CERT_DIR''CF' WRK_SSLCOM:*.*/log
+$         SET FILE/PROT=W:RE WRK_SSLCOM:'CF'
+$       ENDIF
+$       SET ON
+$       GOTO LOOP
+$ LOOP_END:
+$!
+$	SHOW SYSTEM/FULL/OUTPUT=WRK_SSLROOT:[PRIVATE]RANDFILE.
+$	SET FILE/PROT=WORLD:RE WRK_SSLROOT:[PRIVATE]RANDFILE.
+$!
+$	COPY SSL010.RELEASE_NOTES WRK_SSLROOT:[000000]/LOG
+$	SET FILE/PROT=WORLD:RE WRK_SSLROOT:[000000]SSL010.RELEASE_NOTES
+$!
 $	EXIT
--- a/VMS/mkshared.com
+++ b/VMS/mkshared.com
@@ -3,16 +3,94 @@ $!
 $! No command line parameters.  This should be run at the start of the source
 $! tree (the same directory where one finds INSTALL.VMS).
 $!
-$! Input:	[.UTIL]LIBEAY.NUM,[.AXP.EXE.CRYPTO]LIBCRYPTO.OLB
-$!		[.UTIL]SSLEAY.NUM,[.AXP.EXE.SSL]LIBSSL.OLB
-$! Output:	[.AXP.EXE.CRYPTO]LIBCRYPTO.OPT,.MAP,.EXE
-$!		[.AXP.EXE.SSL]LIBSSL.OPT,.MAP,.EXE
+$! Input:       [.UTIL]LIBEAY.NUM,[.AXP.EXE.CRYPTO]LIBCRYPTO.OLB
+$!              [.UTIL]SSLEAY.NUM,[.AXP.EXE.SSL]LIBSSL.OLB
+$! Output:      [.AXP.EXE.CRYPTO]LIBCRYPTO.OPT,.MAP,.EXE
+$!              [.AXP.EXE.SSL]LIBSSL.OPT,.MAP,.EXE
 $!
 $! So far, tests have only been made on VMS for Alpha.  VAX will come in time.
+$!
+$!
+$! >>>>>
+$!	Note: Since I don't know how to put a comment into one of the .NUM
+$!	      files, I will put the comment here and hope that it is found.
+$!
+$!	      For SSLEAY.NUM, we do not expose SSL_add_dir_cert_subjs_to_stk.
+$!	      We do not expose it because it is a truncated VMS name that
+$!	      points to (via SYMHACKS.H) SSL_add_dir_cert_subjects_to_stack.
+$!	      However, SSL_add_dir_cert_subjects_to_stack is #ifndef VMS
+$!	      out of SSL_CERT.C.  So, comment them all out and we won't get
+$!	      any link errors about undefined symbols.  This all works fine
+$!	      until we need this API's functionality. 
+$!
+$!	      For LIBEAY.NUM, 
+$!		ASN1_UTCTIME_GET  #if 0         [.CRYPTO.ASN1]A_UTCTM.C
+$!								[.CRYPTO.ASN1]ASN1.H
+$!
+$!		DES_SET_WEAK_KEY_FLAG           [.CRYPTO.DES]DES.H
+$!						Not used in any .C file.
+$!
+$!		DH_GET_DEFAULT_METHOD   Not found in any .C or .H file.
+$!		DH_SET_DEFAULT_METHOD   Not found in any .C or .H file.
+$!		DSA_GET_DEFAULT_METHOD  Not found in any .C or .H file.
+$!		DSA_SET_DEFAULT_METHOD  Not found in any .C or .H file.
+$!
+$!		PEM_READ_BIO_NETSCAPE_CERT_SEQUENCE     [.CRYPTO.PEM]PEM.H
+$!							[.CRYPTO]SYMHACKS.H
+$!							PEM_read_bio_NS_CERT_SEQ is not in any .C or .H file.
+$!
+$!		PEM_READ_BIO_PKCS8_PRIV_KEY_INFO        [.CRYPTO]SYMHACKS.H
+$!			#define PEM_read_bio_PKCS8_PRIV_KEY_INFO        PEM_read_bio_P8_PRIV_KEY_INFO
+$!			PEM_read_bio_P8_PRIV_KEY_INFO is not in any .C or .H file.
+$!
+$!		PEM_READ_NETSCAPE_CERT_SEQUENCE         [.CRYPTO.PEM]PEM.H
+$!							[.CRYPTO]SYMHACKS.H
+$!			#define PEM_read_NETSCAPE_CERT_SEQUENCE         PEM_read_NS_CERT_SEQ
+$!			PEM_read_NS_CERT_SEQ is not in any .C or .H file.
+$!
+$!		PEM_READ_PKCS8_PRIV_KEY_INFO            [.CRYPTO]SYMHACKS.H
+$!			#define PEM_read_PKCS8_PRIV_KEY_INFO            PEM_read_P8_PRIV_KEY_INFO
+$!			PEM_read_P8_PRIV_KEY_INFO is not in any .C or .H file.
+$!
+$!		PEM_WRITE_BIO_NETSCAPE_CERT_SEQUENCE    [.CRYPTO.PEM]PEM.H
+$!							[.CRYPTO]SYMHACKS.H
+$!			#define PEM_write_bio_NETSCAPE_CERT_SEQUENCE    PEM_write_bio_NS_CERT_SEQ
+$!			PEM_write_bio_NS_CERT_SEQ is not in any .C or .H file.
+$!
+$!		PEM_WRITE_BIO_PKCS8_PRIV_KEY_INFO       [.CRYPTO]SYMHACKS.H
+$!			#define PEM_write_bio_PKCS8_PRIV_KEY_INFO       PEM_write_bio_P8_PRIV_KEY_INFO
+$!			PEM_write_bio_P8_PRIV_KEY_INFO is not in any .C or .H file.
+$!
+$!		PEM_WRITE_NETSCAPE_CERT_SEQUENCE        [.CRYPTO.PEM]PEM.H
+$!							[.CRYPTO]SYMHACKS.H
+$!			#define PEM_write_NETSCAPE_CERT_SEQUENCE        PEM_write_NS_CERT_SEQ
+$!			PEM_write_NS_CERT_SEQ is not in any .C or .H file.
+$!
+$!		PEM_WRITE_PKCS8_PRIV_KEY_INFO           [.CRYPTO]SYMHACKS.H
+$!			#define PEM_write_PKCS8_PRIV_KEY_INFO           PEM_write_P8_PRIV_KEY_INFO
+$!			PEM_write_P8_PRIV_KEY_INFO is not in any .C or .H file.
+$!
+$!		RAND_EVENT                              [.CRYPTO.RAND]RAND.H RAND_event is #if windows || Win32
+$!							[.CRYPTO.RAND]RAND_WIN.C
+$!							All modules in RAND_WIN are WINDOWS or WIN32 modules.
+$!
+$!		RAND_SCREEN     if Windows or Win32 - [.CRYPTO.RAND]RAND.H
+$!
+$!		RSA_GET_DEFAULT_METHOD          is not in any .C or .H file.
+$!
+$!		RSA_SET_DEFAULT_METHOD           is not in any .C or .H file.
+$!
+$!
+$!
 $! ===========================================================================
-$
+$!
+$! Setup VMS specific information.
+$!
+$ @vms_build_info
+$!
 $! ----- 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..."
@@ -24,20 +102,31 @@ $ then
 $   libid  = "Crypto"
 $   libnum = "[.UTIL]LIBEAY.NUM"
 $   libdir = "[.AXP.EXE.CRYPTO]"
-$   libolb = "''libdir'LIBCRYPTO.OLB"
+$   libolb = "''libdir'LIBCRYPTO''build_bits'.OLB"
 $   libopt = "''libdir'LIBCRYPTO.OPT"
 $   libmap = "''libdir'LIBCRYPTO.MAP"
-$   libgoal= "''libdir'LIBCRYPTO.EXE"
+$   if build_bits .eqs. "32"
+$   then 
+$      libgoal= "''libdir'SSL$LIBCRYPTO_SHR''build_bits'.EXE"
+$   else
+$      libgoal= "''libdir'SSL$LIBCRYPTO_SHR.EXE"
+$   endif
 $   libref = ""
 $   gosub create_axp_shr
 $   libid  = "SSL"
 $   libnum = "[.UTIL]SSLEAY.NUM"
 $   libdir = "[.AXP.EXE.SSL]"
-$   libolb = "''libdir'LIBSSL.OLB"
+$   libolb = "''libdir'LIBSSL''build_bits'.OLB"
 $   libopt = "''libdir'LIBSSL.OPT"
 $   libmap = "''libdir'LIBSSL.MAP"
-$   libgoal= "''libdir'LIBSSL.EXE"
-$   libref = "[.AXP.EXE.CRYPTO]LIBCRYPTO.EXE"
+$   if build_bits .eqs. "32"
+$   then 
+$      libgoal= "''libdir'SSL$LIBSSL_SHR''build_bits'.EXE"
+$      libref = "[.AXP.EXE.CRYPTO]SSL$LIBCRYPTO_SHR''build_bits'.EXE"
+$   else
+$      libgoal= "''libdir'SSL$LIBSSL_SHR.EXE"
+$      libref = "[.AXP.EXE.CRYPTO]SSL$LIBCRYPTO_SHR.EXE"
+$   endif
 $   gosub create_axp_shr
 $ else
 $   libtit = "CRYPTO_TRANSFER_VECTOR"
@@ -45,11 +134,16 @@ $   libid  = "Crypto"
 $   libnum = "[.UTIL]LIBEAY.NUM"
 $   libdir = "[.VAX.EXE.CRYPTO]"
 $   libmar = "''libdir'LIBCRYPTO.MAR"
-$   libolb = "''libdir'LIBCRYPTO.OLB"
+$   libolb = "''libdir'LIBCRYPTO''build_bits.OLB"
 $   libopt = "''libdir'LIBCRYPTO.OPT"
 $   libobj = "''libdir'LIBCRYPTO.OBJ"
 $   libmap = "''libdir'LIBCRYPTO.MAP"
-$   libgoal= "''libdir'LIBCRYPTO.EXE"
+$   if build_bits .eqs. "32"
+$   then
+$      libgoal= "''libdir'SSL$LIBCRYPTO_SHR''build_bits'.EXE"
+$   else
+$      libgoal= "''libdir'SSL$LIBCRYPTO_SHR.EXE"
+$   endif
 $   libref = ""
 $   libvec = "LIBCRYPTO"
 $   gosub create_vax_shr
@@ -58,12 +152,18 @@ $   libid  = "SSL"
 $   libnum = "[.UTIL]SSLEAY.NUM"
 $   libdir = "[.VAX.EXE.SSL]"
 $   libmar = "''libdir'LIBSSL.MAR"
-$   libolb = "''libdir'LIBSSL.OLB"
+$   libolb = "''libdir'LIBSSL''build_bits'.OLB"
 $   libopt = "''libdir'LIBSSL.OPT"
 $   libobj = "''libdir'LIBSSL.OBJ"
 $   libmap = "''libdir'LIBSSL.MAP"
-$   libgoal= "''libdir'LIBSSL.EXE"
-$   libref = "[.VAX.EXE.CRYPTO]LIBCRYPTO.EXE"
+$   if build_bits .eqs. "32"
+$   then
+$      libgoal= "''libdir'SSL$LIBSSL_SHR''build_bits'.EXE"
+$      libref = "[.VAX.EXE.CRYPTO]SSL$LIBCRYPTO_SHR''build_bits'.EXE"
+$   else
+$      libgoal= "''libdir'SSL$LIBSSL_SHR.EXE"
+$      libref = "[.VAX.EXE.CRYPTO]SSL$LIBCRYPTO_SHR.EXE"
+$   endif
 $   libvec = "LIBSSL"
 $   gosub create_vax_shr
 $ endif
@@ -83,18 +183,18 @@ $! in the .num file, check that each line applies to VMS and the architecture,
 $! and to fill in "holes" with dummy entries.
 $!
 $! The creator routines depend on the following variables:
-$! libnum	The name of the .num file to use as input
-$! libolb	The name of the object library to build from
-$! libid	The identification string of the shareable library
-$! libopt	The name of the .opt file to write
-$! libtit	The title of the assembler transfer vector file (VAX only)
-$! libmar	The name of the assembler transfer vector file (VAX only)
-$! libmap	The name of the map file to write
-$! libgoal	The name of the shareable library to write
-$! libref	The name of a shareable library to link in
+$! libnum       The name of the .num file to use as input
+$! libolb       The name of the object library to build from
+$! libid        The identification string of the shareable library
+$! libopt       The name of the .opt file to write
+$! libtit       The title of the assembler transfer vector file (VAX only)
+$! libmar       The name of the assembler transfer vector file (VAX only)
+$! libmap       The name of the map file to write
+$! libgoal      The name of the shareable library to write
+$! libref       The name of a shareable library to link in
 $!
 $! 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
+$! libwriter    The name of the writer routine to call for each .num file line
 $! -----
 $
 $! ----- Subroutines for AXP
@@ -103,6 +203,7 @@ $! The creator routine
 $ create_axp_shr:
 $   open/write opt 'libopt'
 $   write opt "identification=""",libid," ",libverstr,""""
+$   write opt "build_ident=""",build_ident,"_",build_platform,"_",build_bits,""" "
 $   write opt libolb,"/lib"
 $   if libref .nes. "" then write opt libref,"/SHARE"
 $   write opt "SYMBOL_VECTOR=(-"
@@ -137,14 +238,16 @@ $   endif
 $   if libfirstentry
 $   then
 $     write 'libwrch' "    ",libentry,"=",pr," -"
+$!DEBUG!$     write sys$output "''libentry' = ''pr' #1"
 $   else
 $     write 'libwrch' "    ,",libentry,"=",pr," -"
+$!DEBUG!$     write sys$output ",''libentry' = ''pr'"
 $   endif
 $   libfirstentry := false
 $   textcount = textcount + textcount_this
 $   return
 $
-$! ----- Subroutines for AXP
+$! ----- Subroutines for VAX
 $! -----
 $! The creator routine
 $ create_vax_shr:
@@ -153,23 +256,23 @@ $   type sys$input:/out=mar:
 ;
 ; Transfer vector for VAX shareable image
 ;
-$   write mar "	.TITLE ",libtit
-$   write mar "	.IDENT /",libid,"/"
+$   write mar " .TITLE ",libtit
+$   write mar " .IDENT /",libid,"/"
 $   type sys$input:/out=mar:
 ;
 ; Define macro to assist in building transfer vector entries.  Each entry
 ; should take no more than 8 bytes.
 ;
-	.MACRO FTRANSFER_ENTRY routine
-	.ALIGN QUAD
-	.TRANSFER routine
-	.MASK	routine
-	JMP	routine+2
-	.ENDM FTRANSFER_ENTRY
+        .MACRO FTRANSFER_ENTRY routine
+        .ALIGN QUAD
+        .TRANSFER routine
+        .MASK   routine
+        JMP     routine+2
+        .ENDM TRANSFER_ENTRY
 ;
 ; Place entries in own program section.
 ;
-$   write mar "	.PSECT $$",libvec,",QUAD,PIC,USR,CON,REL,LCL,SHR,EXE,RD,NOWRT"
+$   write mar " .PSECT $$",libvec,"QUAD,PIC,USR,CON,REL,LCL,SHR,EXE,RD,NOWRT"
 $   write mar libvec,"_xfer:"
 $   libwrch   := mar
 $   libwriter := write_vax_ftransfer_entry
@@ -178,10 +281,10 @@ $   type sys$input:/out=mar:
 ;
 ; Allocate extra storage at end of vector to allow for expansion.
 ;
-$   write mar "	.BLKB 32768-<.-",libvec,"_xfer>	; 64 pages total."
-$!   libwriter := write_vax_vtransfer_entry
-$!   gosub read_func_num
-$   write mar "	.END"
+$   write mar " .BLKB 32768-<.-",libvec,"_xfer> ; 64 pages total."
+$   libwriter := write_vax_vtransfer_entry
+$   gosub read_func_num
+$   write mar " .END"
 $   close mar
 $   open/write opt 'libopt'
 $   write opt "identification=""",libid," ",libverstr,""""
@@ -202,7 +305,7 @@ $   type sys$input:/out=opt:
 PSECT_ATTR=$CHAR_STRING_CONSTANTS,NOWRT
 $   libwrch   := opt
 $   libwriter := write_vax_psect_attr
-$   gosub read_func_num
+$   gosub read_var_num
 $   close opt
 $   macro/obj='libobj' 'libmar'
 $   link/map='libmap'/full/share='libgoal' 'libopt'/option
@@ -213,9 +316,9 @@ $ write_vax_ftransfer_entry:
 $   if info_kind .nes. "FUNCTION" then return
 $   if libentry .eqs ".dummy"
 $   then
-$     write 'libwrch' "	.BLKB 8" ! Dummy is zeroes...
+$     write 'libwrch' " .BLKB 8" ! Dummy is zeroes...
 $   else
-$     write 'libwrch' "	FTRANSFER_ENTRY ",libentry
+$     write 'libwrch' " FTRANSFER_ENTRY ",libentry
 $   endif
 $   return
 $! The record writer routine for VAX variables (should never happen!)
@@ -245,6 +348,16 @@ $     info_exist=f$element(0,":",entryinfo)
 $     info_platforms=","+f$element(1,":",entryinfo)+","
 $     info_kind=f$element(2,":",entryinfo)
 $     info_algorithms=","+f$element(3,":",entryinfo)+","
+$!
+$!DEBUG!$ write sys$output " Processing ... ", line
+$!DEBUG!$ write sys$output "Entry num = ",entrynum
+$!DEBUG!$ write sys$output "Entry info = ",entryinfo
+$!DEBUG!$ write sys$output "Cur Entry = ",curentry
+$!DEBUG!$ write sys$output "info exist = ",info_exist
+$!DEBUG!$ write sys$output "info platforms = ",info_platforms
+$!DEBUG!$ write sys$output "info kind = ",info_kind
+$!DEBUG!$ write sys$output "info algs = ",info_algorithms
+$!
 $     if info_exist .eqs. "NOEXIST" then goto loop
 $     truesum = 0
 $     falsesum = 0
@@ -252,10 +365,15 @@ $     negatives = 1
 $     plat_i = 0
 $     loop1:
 $       plat_entry = f$element(plat_i,",",info_platforms)
+$!DEBUG!$ write sys$output "plat entry = ",plat_entry
+$! 
 $       plat_i = plat_i + 1
+$!DEBUG!$ write sys$output "plat i = ", plat_i
 $       if plat_entry .eqs. "" then goto loop1
-$       if plat_entry .nes. ","
+$       if plat_entry .eqs. ","
 $       then
+$	  goto endloop1
+$       else
 $         if f$extract(0,1,plat_entry) .nes. "!" then negatives = 0
 $         if f$getsyi("CPU") .lt. 128
 $         then
@@ -264,30 +382,48 @@ $             truesum = truesum + 1
 $           if plat_entry .eqs. "!EXPORT_VAR_AS_FUNCTION" then -
 $             falsesum = falsesum + 1
 $         endif
-$         if plat_entry .eqs. "VMS" then truesum = truesum + 1
-$         if plat_entry .eqs. "!VMS" then falsesum = falsesum + 1
-$	  goto loop1
+$         if plat_entry .eqs. "VMS" 
+$	  then 
+$		truesum = truesum + 1
+$!DEBUG!$		write sys$output "plat_entry = VMS"
+$         endif
+$!
+$         if plat_entry .eqs. "!VMS" 
+$	  then 
+$		falsesum = falsesum + 1
+$!DEBUG!$		write sys$output "plat_entry <> VMS"
+$         endif
 $       endif
+$       goto loop1
+$! 
 $     endloop1:
 $!DEBUG!$     if info_platforms - "EXPORT_VAR_AS_FUNCTION" .nes. info_platforms
 $!DEBUG!$     then
 $!DEBUG!$       write sys$output line
 $!DEBUG!$       write sys$output "        truesum = ",truesum,-
-$!DEBUG!		", negatives = ",negatives,", falsesum = ",falsesum
+$!DEBUG!                ", negatives = ",negatives,", falsesum = ",falsesum
 $!DEBUG!$     endif
 $     if falsesum .ne. 0 then goto loop
-$     if truesum+negatives .eq. 0 then goto loop
+$     if truesum+negatives .eq. 0 
+$     then
+$!DEBUG!$	write sys$output "truesum+negatives .eq. 0. Going to loop." 
+$	goto loop
+$     endif
 $     alg_i = 0
 $     loop2:
 $       alg_entry = f$element(alg_i,",",info_algorithms)
-$	alg_i = alg_i + 1
+$!DEBUG!$ write sys$output "alg entry = ",alg_entry
+$       alg_i = alg_i + 1
 $       if alg_entry .eqs. "" then goto loop2
-$       if alg_entry .nes. ","
+$       if alg_entry .eqs. ","
 $       then
+$	  goto endloop2
+$       else
 $         if alg_entry .eqs. "KRB5" then goto loop ! Special for now
 $         if f$trnlnm("OPENSSL_NO_"+alg_entry) .nes. "" then goto loop
-$	  goto loop2
 $       endif
+$	goto loop2
+$!
 $     endloop2:
 $     if info_platforms - "EXPORT_VAR_AS_FUNCTION" .nes. info_platforms
 $     then
@@ -323,15 +459,16 @@ $     goto 'next'
 $   loop_end:
 $   close libnum
 $   return
-$
+$!
 $! The version number reader
-$ read_version_info:
+$!
+$read_version_info:
 $   libver = ""
 $   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 -
-	goto loop_rvi
+        goto loop_rvi
 $     libverstr = f$element(1,"""",rvi_line)
 $     libvmajor = f$element(0,".",libverstr)
 $     libvminor = f$element(1,".",libverstr)
@@ -339,7 +476,7 @@ $     libvedit = f$element(2,".",libverstr)
 $     libvpatch = f$cvui(0,8,f$extract(1,1,libvedit)+"@")-f$cvui(0,8,"@")
 $     libvedit = f$extract(0,1,libvedit)
 $     libver = f$string(f$int(libvmajor)*100)+","+-
-	f$string(f$int(libvminor)*100+f$int(libvedit)*10+f$int(libvpatch))
+        f$string(f$int(libvminor)*100+f$int(libvedit)*10+f$int(libvpatch))
 $     if libvmajor .eqs. "0"
 $     then
 $       libvmatch = "EQUAL"
--- a/VMS/ssl$syshutdown.com
+++ b/VMS/ssl$syshutdown.com
@@ -0,0 +1,8 @@
+$!
+$! SSL$SYSHUTDOWN.COM - This command procedure is used for site specific SSL
+$!			shutdown tasks.  Anything setup in SSL$SYSTARTUP.COM
+$!			should be cleaned up in this command procedure.
+$!
+$ DEASSIGN/SYSTEM/EXEC  RANDFILE
+$ DEASSIGN/SYSTEM/EXEC  SSL$RANDFILE
+$!
--- a/VMS/ssl$systartup.com
+++ b/VMS/ssl$systartup.com
@@ -0,0 +1,7 @@
+$!
+$!
+$!  Add logical to aid random number generators.  --  http://www.free.lp.se/openssl/docs/openssl3.html#ss3.1
+$!
+$ DEFINE/SYSTEM/EXEC  RANDFILE		SSL$ROOT:[PRIVATE]RANDFILE.;
+$ DEFINE/SYSTEM/EXEC  SSL$RANDFILE	SSL$ROOT:[PRIVATE]RANDFILE.;
+$!
--- a/VMS/ssl$utils.com
+++ b/VMS/ssl$utils.com
@@ -0,0 +1,76 @@
+$!
+$!  APPS.COM
+$!  Written By:  Robert Byer
+$!               Vice-President
+$!               A-Com Computing, Inc.
+$!               byer@mail.all-net.net
+$!
+$!
+$! Slightly modified by Richard Levitte <richard@levitte.org>
+$!
+$ IF P1 .NES. "" THEN GOTO 'P1
+$!
+$DEFINE:
+$!
+$ OPENSSL  :== $SSL$EXE:OPENSSL
+$ VERIFY   :== $SSL$EXE:OPENSSL VERIFY
+$ ASN1PARSE:== $SSL$EXE:OPENSSL ASN1PARS
+$ REQ      :== $SSL$EXE:OPENSSL REQ
+$ DGST     :== $SSL$EXE:OPENSSL DGST
+$ DH       :== $SSL$EXE:OPENSSL DH
+$ ENC      :== $SSL$EXE:OPENSSL ENC
+$ GENDH    :== $SSL$EXE:OPENSSL GENDH
+$ ERRSTR   :== $SSL$EXE:OPENSSL ERRSTR
+$ CA       :== $SSL$EXE:OPENSSL CA
+$ CRL      :== $SSL$EXE:OPENSSL CRL
+$ RSA      :== $SSL$EXE:OPENSSL RSA
+$ DSA      :== $SSL$EXE:OPENSSL DSA
+$ DSAPARAM :== $SSL$EXE:OPENSSL DSAPARAM
+$ X509     :== $SSL$EXE:OPENSSL X509
+$ GENRSA   :== $SSL$EXE:OPENSSL GENRSA
+$ GENDSA   :== $SSL$EXE:OPENSSL GENDSA
+$ S_SERVER :== $SSL$EXE:OPENSSL S_SERVER
+$ S_CLIENT :== $SSL$EXE:OPENSSL S_CLIENT
+$ SPEED    :== $SSL$EXE:OPENSSL SPEED
+$ S_TIME   :== $SSL$EXE:OPENSSL S_TIME
+$ VERSION  :== $SSL$EXE:OPENSSL VERSION
+$ PKCS7    :== $SSL$EXE:OPENSSL PKCS7
+$ CRL2PKCS7:== $SSL$EXE:OPENSSL CRL2P7
+$ SESS_ID  :== $SSL$EXE:OPENSSL SESS_ID
+$ CIPHERS  :== $SSL$EXE:OPENSSL CIPHERS
+$ NSEQ     :== $SSL$EXE:OPENSSL NSEQ
+$ PKCS12   :== $SSL$EXE:OPENSSL PKCS12
+$!
+$EXIT
+$!
+$REMOVE:
+$ DELETE/SYMBOL/GLOBAL OPENSSL
+$ DELETE/SYMBOL/GLOBAL VERIFY
+$ DELETE/SYMBOL/GLOBAL ASN1PARSE
+$ DELETE/SYMBOL/GLOBAL REQ
+$ DELETE/SYMBOL/GLOBAL DGST
+$ DELETE/SYMBOL/GLOBAL DH
+$ DELETE/SYMBOL/GLOBAL ENC
+$ DELETE/SYMBOL/GLOBAL GENDH
+$ DELETE/SYMBOL/GLOBAL ERRSTR
+$ DELETE/SYMBOL/GLOBAL CA
+$ DELETE/SYMBOL/GLOBAL CRL
+$ DELETE/SYMBOL/GLOBAL RSA
+$ DELETE/SYMBOL/GLOBAL DSA
+$ DELETE/SYMBOL/GLOBAL DSAPARAM
+$ DELETE/SYMBOL/GLOBAL X509
+$ DELETE/SYMBOL/GLOBAL GENRSA
+$ DELETE/SYMBOL/GLOBAL GENDSA
+$ DELETE/SYMBOL/GLOBAL S_SERVER
+$ DELETE/SYMBOL/GLOBAL S_CLIENT
+$ DELETE/SYMBOL/GLOBAL SPEED
+$ DELETE/SYMBOL/GLOBAL S_TIME
+$ DELETE/SYMBOL/GLOBAL VERSION
+$ DELETE/SYMBOL/GLOBAL PKCS7
+$ DELETE/SYMBOL/GLOBAL CRL2PKCS7
+$ DELETE/SYMBOL/GLOBAL SESS_ID
+$ DELETE/SYMBOL/GLOBAL CIPHERS
+$ DELETE/SYMBOL/GLOBAL NSEQ
+$ DELETE/SYMBOL/GLOBAL PKCS12
+$!
+$EXIT
--- a/VMS/ssl010.release_notes
+++ b/VMS/ssl010.release_notes
@@ -0,0 +1,25 @@
+
+      Compaq SSL for OpenVMS Alpha
+
+      Field Test Release Notes
+
+      February 2002
+
+      Based on OpenSSL 0.9.6B
+
+      Compaq SSL T1.0 for OpenVMS Alpha
+      CPQ-AXPVMS-SSL-T0100--1.PCSI-DCX-AXPEXE
+
+      ----------------------------------------------
+
+      Compaq is pleased to provide you with the first release of Compaq
+      SSL for OpenVMS Alpha.  Compaq SSL (Secure Sockets Layer)
+      is based on the 0.9.6B release from the Open Group.  See
+      http://www.openssl.org for more information about OpenSSL.
+
+      Documentation for this kit, including installation and configuration
+      information, release notes, a programming tutorial and API reference,
+      is included in "Open Source Security for OpenVMS Alpha
+      Volume 2: SSL" in HTML, PDF, and PostScript format. This document
+      is included on the OpenVMS field test documentation CD-ROM.
+
--- a/apps/Makefile.ssl
+++ b/apps/Makefile.ssl
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -114,7 +114,9 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <ctype.h>
+#define NON_MAIN
+#include "apps.h"
+#undef NON_MAIN
 #include <openssl/err.h>
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
@@ -127,17 +129,9 @@
 #ifdef OPENSSL_SYS_WINDOWS
 #define strcasecmp _stricmp
 #else
-#  ifdef NO_STRINGS_H
-    int	strcasecmp();
-#  else
-#    include <strings.h>
-#  endif /* NO_STRINGS_H */
+#include <strings.h>
 #endif

-#define NON_MAIN
-#include "apps.h"
-#undef NON_MAIN
-
 #ifdef OPENSSL_SYS_WINDOWS
 #  include "bss_file.c"
 #endif
@@ -316,16 +310,9 @@ void program_name(char *in, char *out, int size)

 	q=strrchr(p,'.');
 	if (q == NULL)
-		q = p + strlen(p);
-	strncpy(out,p,size-1);
-	if (q-p >= size)
-		{
-		out[size-1]='\0';
-		}
-	else
-		{
-		out[q-p]='\0';
-		}
+		q = in+size;
+	strncpy(out,p,q-p);
+	out[q-p]='\0';
 	}
 #else
 void program_name(char *in, char *out, int size)
@@ -337,7 +324,8 @@ void program_name(char *in, char *out, int size)
 		p++;
 	else
 		p=in;
-	BUF_strlcpy(out,p,size);
+	strncpy(out,p,size-1);
+	out[size-1]='\0';
 	}
 #endif
 #endif
@@ -345,7 +333,6 @@ void program_name(char *in, char *out, int size)
 #ifdef OPENSSL_SYS_WIN32
 int WIN32_rename(char *from, char *to)
 	{
-#ifndef OPENSSL_SYS_WINCE
 	/* Windows rename gives an error if 'to' exists, so delete it
 	 * first and ignore file not found errror
 	 */
@@ -353,46 +340,6 @@ int WIN32_rename(char *from, char *to)
 		return -1;
 #undef rename
 	return rename(from, to);
-#else
-	/* convert strings to UNICODE */
-	{
-	BOOL result = FALSE;
-	WCHAR* wfrom;
-	WCHAR* wto;
-	int i;
-	wfrom = malloc((strlen(from)+1)*2);
-	wto = malloc((strlen(to)+1)*2);
-	if (wfrom != NULL && wto != NULL)
-		{
-		for (i=0; i<(int)strlen(from)+1; i++)
-			wfrom[i] = (short)from[i];
-		for (i=0; i<(int)strlen(to)+1; i++)
-			wto[i] = (short)to[i];
-		result = MoveFile(wfrom, wto);
-		}
-	if (wfrom != NULL)
-		free(wfrom);
-	if (wto != NULL)
-		free(wto);
-	return result;
-	}
-#endif
-	}
-#endif
-
-#ifdef OPENSSL_SYS_VMS
-int VMS_strcasecmp(const char *str1, const char *str2)
-	{
-	while (*str1 && *str2)
-		{
-		int res = toupper(*str1) - toupper(*str2);
-		if (res) return res < 0 ? -1 : 1;
-		}
-	if (*str1)
-		return 1;
-	if (*str2)
-		return -1;
-	return 0;
 	}
 #endif

@@ -471,20 +418,16 @@ int app_init(long mesgwin)

 int dump_cert_text (BIO *out, X509 *x)
 {
-	char *p;
-
-	p=X509_NAME_oneline(X509_get_subject_name(x),NULL,0);
+	char buf[256];
+	X509_NAME_oneline(X509_get_subject_name(x),buf,256);
 	BIO_puts(out,"subject=");
-	BIO_puts(out,p);
-	OPENSSL_free(p);
+	BIO_puts(out,buf);

-	p=X509_NAME_oneline(X509_get_issuer_name(x),NULL,0);
-	BIO_puts(out,"\nissuer=");
-	BIO_puts(out,p);
+	X509_NAME_oneline(X509_get_issuer_name(x),buf,256);
+	BIO_puts(out,"\nissuer= ");
+	BIO_puts(out,buf);
 	BIO_puts(out,"\n");
-	OPENSSL_free(p);
-
-	return 0;
+        return 0;
 }

 static int ui_open(UI *ui)
@@ -540,7 +483,7 @@ static int ui_close(UI *ui)
 	{
 	return UI_method_get_closer(UI_OpenSSL())(ui);
 	}
-int setup_ui_method(void)
+int setup_ui_method()
 	{
 	ui_method = UI_create_method("OpenSSL application user interface");
 	UI_method_set_opener(ui_method, ui_open);
@@ -549,7 +492,7 @@ int setup_ui_method(void)
 	UI_method_set_closer(ui_method, ui_close);
 	return 0;
 	}
-void destroy_ui_method(void)
+void destroy_ui_method()
 	{
 	if(ui_method)
 		{
@@ -615,7 +558,7 @@ int password_callback(char *buf, int bufsiz, int verify,

 		if (buff)
 			{
-			OPENSSL_cleanse(buff,(unsigned int)bufsiz);
+			memset(buff,0,(unsigned int)bufsiz);
 			OPENSSL_free(buff);
 			}

@@ -625,13 +568,13 @@ int password_callback(char *buf, int bufsiz, int verify,
 			{
 			BIO_printf(bio_err, "User interface error\n");
 			ERR_print_errors(bio_err);
-			OPENSSL_cleanse(buf,(unsigned int)bufsiz);
+			memset(buf,0,(unsigned int)bufsiz);
 			res = 0;
 			}
 		if (ok == -2)
 			{
 			BIO_printf(bio_err,"aborted!\n");
-			OPENSSL_cleanse(buf,(unsigned int)bufsiz);
+			memset(buf,0,(unsigned int)bufsiz);
 			res = 0;
 			}
 		UI_free(ui);
@@ -844,7 +787,7 @@ end:
 	return(x);
 	}

-EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
+EVP_PKEY *load_key(BIO *err, const char *file, int format,
 	const char *pass, ENGINE *e, const char *key_descrip)
 	{
 	BIO *key=NULL;
@@ -854,7 +797,7 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
 	cb_data.password = pass;
 	cb_data.prompt_info = file;

-	if (file == NULL && (!maybe_stdin || format == FORMAT_ENGINE))
+	if (file == NULL)
 		{
 		BIO_printf(err,"no keyfile specified\n");
 		goto end;
@@ -874,19 +817,12 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
 		ERR_print_errors(err);
 		goto end;
 		}
-	if (file == NULL && maybe_stdin)
+	if (BIO_read_filename(key,file) <= 0)
 		{
-		setvbuf(stdin, NULL, _IONBF, 0);
-		BIO_set_fp(key,stdin,BIO_NOCLOSE);
+		BIO_printf(err, "Error opening %s %s\n", key_descrip, file);
+		ERR_print_errors(err);
+		goto end;
 		}
-	else
-		if (BIO_read_filename(key,file) <= 0)
-			{
-			BIO_printf(err, "Error opening %s %s\n",
-				key_descrip, file);
-			ERR_print_errors(err);
-			goto end;
-			}
 	if (format == FORMAT_ASN1)
 		{
 		pkey=d2i_PrivateKey_bio(key, NULL);
@@ -920,7 +856,7 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
 	return(pkey);
 	}

-EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
+EVP_PKEY *load_pubkey(BIO *err, const char *file, int format,
 	const char *pass, ENGINE *e, const char *key_descrip)
 	{
 	BIO *key=NULL;
@@ -930,7 +866,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
 	cb_data.password = pass;
 	cb_data.prompt_info = file;

-	if (file == NULL && (!maybe_stdin || format == FORMAT_ENGINE))
+	if (file == NULL)
 		{
 		BIO_printf(err,"no keyfile specified\n");
 		goto end;
@@ -950,18 +886,11 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
 		ERR_print_errors(err);
 		goto end;
 		}
-	if (file == NULL && maybe_stdin)
+	if (BIO_read_filename(key,file) <= 0)
 		{
-		setvbuf(stdin, NULL, _IONBF, 0);
-		BIO_set_fp(key,stdin,BIO_NOCLOSE);
-		}
-	else
-		if (BIO_read_filename(key,file) <= 0)
-			{
-			BIO_printf(err, "Error opening %s %s\n",
-				key_descrip, file);
-			ERR_print_errors(err);
-			goto end;
+		BIO_printf(err, "Error opening %s %s\n", key_descrip, file);
+		ERR_print_errors(err);
+		goto end;
 		}
 	if (format == FORMAT_ASN1)
 		{
@@ -989,7 +918,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
 	}

 #if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
-static EVP_PKEY *
+EVP_PKEY *
 load_netscape_key(BIO *err, BIO *key, const char *file,
 		const char *key_descrip, int format)
 	{
@@ -1006,7 +935,7 @@ load_netscape_key(BIO *err, BIO *key, const char *file,
 		goto error;
 	for (;;)
 		{
-		if (!BUF_MEM_grow_clean(buf,size+1024*10))
+		if (!BUF_MEM_grow(buf,size+1024*10))
 			goto error;
 		i = BIO_read(key, &(buf->data[size]), 1024*10);
 		size += i;
@@ -1134,7 +1063,6 @@ int set_cert_ex(unsigned long *flags, const char *arg)
 		{ "no_extensions", X509_FLAG_NO_EXTENSIONS, 0},
 		{ "no_sigdump", X509_FLAG_NO_SIGDUMP, 0},
 		{ "no_aux", X509_FLAG_NO_AUX, 0},
-		{ "no_attributes", X509_FLAG_NO_ATTRIBUTES, 0},
 		{ "ext_default", X509V3_EXT_DEFAULT, X509V3_EXT_UNKNOWN_MASK},
 		{ "ext_error", X509V3_EXT_ERROR_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
 		{ "ext_parse", X509V3_EXT_PARSE_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
@@ -1278,20 +1206,18 @@ static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_T

 void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags)
 {
-	char *buf;
+	char buf[256];
 	char mline = 0;
 	int indent = 0;
-
 	if(title) BIO_puts(out, title);
 	if((lflags & XN_FLAG_SEP_MASK) == XN_FLAG_SEP_MULTILINE) {
 		mline = 1;
 		indent = 4;
 	}
 	if(lflags == XN_FLAG_COMPAT) {
-		buf = X509_NAME_oneline(nm, 0, 0);
-		BIO_puts(out, buf);
+		X509_NAME_oneline(nm,buf,256);
+		BIO_puts(out,buf);
 		BIO_puts(out, "\n");
-		OPENSSL_free(buf);
 	} else {
 		if(mline) BIO_puts(out, "\n");
 		X509_NAME_print_ex(out, nm, indent, lflags);
@@ -1330,7 +1256,7 @@ X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath)
 }

 /* Try to load an engine in a shareable library */
-static ENGINE *try_load_engine(BIO *err, const char *engine, int debug)
+ENGINE *try_load_engine(BIO *err, const char *engine, int debug)
 	{
 	ENGINE *e = ENGINE_by_id("dynamic");
 	if (e)
@@ -1403,18 +1329,3 @@ int load_config(BIO *err, CONF *cnf)
 		}
 	return 1;
 	}
-
-char *make_config_name()
-	{
-	const char *t=X509_get_default_cert_area();
-	char *p;
-
-	p=OPENSSL_malloc(strlen(t)+strlen(OPENSSL_CONF)+2);
-	strcpy(p,t);
-#ifndef OPENSSL_SYS_VMS
-	strcat(p,"/");
-#endif
-	strcat(p,OPENSSL_CONF);
-
-	return p;
-	}
--- a/apps/apps.h
+++ b/apps/apps.h
@@ -134,26 +134,22 @@ long app_RAND_load_files(char *file); /* `file' is a list of files to read,
                                       * (see e_os.h).  The string is
                                       * destroyed! */

+#ifdef OPENSSL_NO_STDIO
+BIO_METHOD *BIO_s_file();
+#endif
+
 #ifdef OPENSSL_SYS_WIN32
 #define rename(from,to) WIN32_rename((from),(to))
 int WIN32_rename(char *oldname,char *newname);
 #endif

-/* VMS below version 7.0 doesn't have strcasecmp() */
-#ifdef OPENSSL_SYS_VMS
-#define strcasecmp(str1,str2) VMS_strcasecmp((str1),(str2))
-int VMS_strcasecmp(const char *str1, const char *str2);
-#endif
-
 #ifndef MONOLITH

 #define MAIN(a,v)	main(a,v)

 #ifndef NON_MAIN
-CONF *config=NULL;
 BIO *bio_err=NULL;
 #else
-extern CONF *config;
 extern BIO *bio_err;
 #endif

@@ -221,8 +217,8 @@ typedef struct 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 setup_ui_method();
+void destroy_ui_method();

 int should_retry(int i);
 int args_from_file(char *file, int *argc, char **argv[]);
@@ -241,9 +237,9 @@ int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2);
 int add_oid_section(BIO *err, CONF *conf);
 X509 *load_cert(BIO *err, const char *file, int format,
 	const char *pass, ENGINE *e, const char *cert_descrip);
-EVP_PKEY *load_key(BIO *err, const char *file, int format, int maybe_stdin,
+EVP_PKEY *load_key(BIO *err, const char *file, int format,
 	const char *pass, ENGINE *e, const char *key_descrip);
-EVP_PKEY *load_pubkey(BIO *err, const char *file, int format, int maybe_stdin,
+EVP_PKEY *load_pubkey(BIO *err, const char *file, int format,
 	const char *pass, ENGINE *e, const char *key_descrip);
 STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
 	const char *pass, ENGINE *e, const char *cert_descrip);
@@ -251,7 +247,6 @@ X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath);
 ENGINE *setup_engine(BIO *err, const char *engine, int debug);

 int load_config(BIO *err, CONF *cnf);
-char *make_config_name(void);

 /* Functions defined in ca.c and also used in ocsp.c */
 int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -184,7 +184,7 @@ bad:
 		BIO_printf(bio_err,"where options are\n");
 		BIO_printf(bio_err," -inform arg   input format - one of DER TXT PEM\n");
 		BIO_printf(bio_err," -in arg       input file\n");
-		BIO_printf(bio_err," -out arg      output file (output format is always DER\n");
+		BIO_printf(bio_err," -out arg      output file\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");
@@ -195,6 +195,7 @@ bad:
 		BIO_printf(bio_err," -strparse offset\n");
 		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
 		BIO_printf(bio_err,"               ASN1 blob wrappings\n");
+		BIO_printf(bio_err," -out filename output DER encoding to file\n");
 		goto end;
 		}

@@ -332,6 +333,6 @@ end:
 	if (osk != NULL) sk_free(osk);
 	OBJ_cleanup();
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

--- a/apps/ca.c
+++ b/apps/ca.c
@@ -64,6 +64,7 @@
 #include <ctype.h>
 #include <sys/types.h>
 #include <sys/stat.h>
+#include "apps.h"
 #include <openssl/conf.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
@@ -79,11 +80,7 @@
 #ifdef OPENSSL_SYS_WINDOWS
 #define strcasecmp _stricmp
 #else
-#  ifdef NO_STRINGS_H
-    int	strcasecmp();
-#  else
-#    include <strings.h>
-#  endif /* NO_STRINGS_H */
+#include <strings.h>
 #endif

 #ifndef W_OK
@@ -93,13 +90,11 @@
 #    else
 #      include <unixlib.h>
 #    endif
-#  elif !defined(OPENSSL_SYS_VXWORKS) && !defined(OPENSSL_SYS_WINDOWS)
+#  elif !defined(OPENSSL_SYS_VXWORKS)
 #    include <sys/file.h>
 #  endif
 #endif

-#include "apps.h"
-
 #ifndef W_OK
 #  define F_OK 0
 #  define X_OK 1
@@ -334,7 +329,6 @@ int MAIN(int argc, char **argv)
 	MS_STATIC char buf[3][BSIZE];
 	char *randfile=NULL;
 	char *engine = NULL;
-	char *tofree=NULL;

 #ifdef EFENCE
 EF_PROTECT_FREE=1;
@@ -562,26 +556,25 @@ bad:

 	ERR_load_crypto_strings();

-	e = setup_engine(bio_err, engine, 0);
+        e = setup_engine(bio_err, engine, 0);

 	/*****************************************************************/
-	tofree=NULL;
 	if (configfile == NULL) configfile = getenv("OPENSSL_CONF");
 	if (configfile == NULL) configfile = getenv("SSLEAY_CONF");
 	if (configfile == NULL)
 		{
-		const char *s=X509_get_default_cert_area();
-
+		/* We will just use 'buf[0]' as a temporary buffer.  */
 #ifdef OPENSSL_SYS_VMS
-		tofree=OPENSSL_malloc(strlen(s)+sizeof(CONFIG_FILE));
-		strcpy(tofree,s);
+		strncpy(buf[0],X509_get_default_cert_area(),
+			sizeof(buf[0])-1-sizeof(CONFIG_FILE));
 #else
-		tofree=OPENSSL_malloc(strlen(s)+sizeof(CONFIG_FILE)+1);
-		strcpy(tofree,s);
-		strcat(tofree,"/");
+		strncpy(buf[0],X509_get_default_cert_area(),
+			sizeof(buf[0])-2-sizeof(CONFIG_FILE));
+		buf[0][sizeof(buf[0])-2-sizeof(CONFIG_FILE)]='\0';
+		strcat(buf[0],"/");
 #endif
-		strcat(tofree,CONFIG_FILE);
-		configfile=tofree;
+		strcat(buf[0],CONFIG_FILE);
+		configfile=buf[0];
 		}

 	BIO_printf(bio_err,"Using configuration from %s\n",configfile);
@@ -596,8 +589,6 @@ bad:
 				,errorline,configfile);
 		goto err;
 		}
-	if(tofree)
-		OPENSSL_free(tofree);

 	if (!load_config(bio_err, conf))
 		goto err;
@@ -704,9 +695,9 @@ bad:
 			goto err;
 			}
 		}
-	pkey = load_key(bio_err, keyfile, keyform, 0, key, e, 
+	pkey = load_key(bio_err, keyfile, keyform, key, e, 
 		"CA private key");
-	if (key) OPENSSL_cleanse(key,strlen(key));
+	if (key) memset(key,0,strlen(key));
 	if (pkey == NULL)
 		{
 		/* load_key() has already printed an appropriate message */
@@ -1021,7 +1012,7 @@ bad:
 			}

 		if (verbose)
-			BIO_printf(bio_err, "Successfully loaded extensions file %s\n", extfile);
+			BIO_printf(bio_err, "Succesfully loaded extensions file %s\n", extfile);

 		/* We can have sections in the ext file */
 		if (!extensions && !(extensions = NCONF_get_string(extconf, "default", "extensions")))
@@ -1163,14 +1154,9 @@ bad:
 			}
 		if (verbose)
 			{
-			if (BN_is_zero(serial))
-				BIO_printf(bio_err,"next serial number is 00\n");
-			else
-				{
-				if ((f=BN_bn2hex(serial)) == NULL) goto err;
-				BIO_printf(bio_err,"next serial number is %s\n",f);
-				OPENSSL_free(f);
-				}
+			if ((f=BN_bn2hex(serial)) == NULL) goto err;
+			BIO_printf(bio_err,"next serial number is %s\n",f);
+			OPENSSL_free(f);
 			}

 		if ((attribs=NCONF_get_section(conf,policy)) == NULL)
@@ -1290,13 +1276,8 @@ bad:

 			BIO_printf(bio_err,"Write out database with %d new entries\n",sk_X509_num(cert_sk));

-			if(strlen(serialfile) > BSIZE-5 || strlen(dbfile) > BSIZE-5)
-				{
-				BIO_printf(bio_err,"file name too long\n");
-				goto err;
-				}
-
-			strcpy(buf[0],serialfile);
+			strncpy(buf[0],serialfile,BSIZE-4);
+			buf[0][BSIZE-4]='\0';

 #ifdef OPENSSL_SYS_VMS
 			strcat(buf[0],"-new");
@@ -1306,7 +1287,8 @@ bad:

 			if (!save_serial(buf[0],serial)) goto err;

-			strcpy(buf[1],dbfile);
+			strncpy(buf[1],dbfile,BSIZE-4);
+			buf[1][BSIZE-4]='\0';

 #ifdef OPENSSL_SYS_VMS
 			strcat(buf[1],"-new");
@@ -1336,13 +1318,8 @@ bad:
 			j=x->cert_info->serialNumber->length;
 			p=(char *)x->cert_info->serialNumber->data;
 			
-			if(strlen(outdir) >= (size_t)(j ? BSIZE-j*2-6 : BSIZE-8))
-				{
-				BIO_printf(bio_err,"certificate file name too long\n");
-				goto err;
-				}
-
-			strcpy(buf[2],outdir);
+			strncpy(buf[2],outdir,BSIZE-(j*2)-6);
+			buf[2][BSIZE-(j*2)-6]='\0';

 #ifndef OPENSSL_SYS_VMS
 			strcat(buf[2],"/");
@@ -1473,13 +1450,13 @@ bad:
 			}
 		if ((crldays == 0) && (crlhours == 0))
 			{
-			BIO_printf(bio_err,"cannot lookup how long until the next CRL is issued\n");
+			BIO_printf(bio_err,"cannot lookup how long until the next CRL is issuer\n");
 			goto err;
 			}

 		if (verbose) BIO_printf(bio_err,"making CRL\n");
 		if ((crl=X509_CRL_new()) == NULL) goto err;
-		if (!X509_CRL_set_issuer_name(crl, X509_get_subject_name(x509))) goto err;
+		if (!X509_CRL_set_issuer_name(crl, X509_get_issuer_name(x509))) goto err;

 		tmptm = ASN1_TIME_new();
 		if (!tmptm) goto err;
@@ -1532,6 +1509,11 @@ bad:
 			if (pkey->type == EVP_PKEY_DSA) 
 				dgst=EVP_dss1();
 			else
+#endif
+#ifndef OPENSSL_NO_ECDSA
+			if (pkey->type == EVP_PKEY_ECDSA)
+				dgst=EVP_ecdsa();
+			else
 #endif
 				dgst=EVP_md5();
 			}
@@ -1576,13 +1558,8 @@ bad:
 			if (j <= 0) goto err;
 			X509_free(revcert);

-			if(strlen(dbfile) > BSIZE-5)
-				{
-				BIO_printf(bio_err,"filename too long\n");
-				goto err;
-				}
-
-			strcpy(buf[0],dbfile);
+			strncpy(buf[0],dbfile,BSIZE-4);
+			buf[0][BSIZE-4]='\0';
 #ifndef OPENSSL_SYS_VMS
 			strcat(buf[0],".new");
 #else
@@ -1596,10 +1573,6 @@ bad:
 				}
 			j=TXT_DB_write(out,db);
 			if (j <= 0) goto err;
-			BIO_free_all(out);
-			out = NULL;
-			BIO_free_all(in);
-			in = NULL;
 			strncpy(buf[1],dbfile,BSIZE-4);
 			buf[1][BSIZE-4]='\0';
 #ifndef OPENSSL_SYS_VMS
@@ -1607,6 +1580,10 @@ bad:
 #else
 			strcat(buf[1],"-old");
 #endif
+			BIO_free(in);
+			in = NULL;
+			BIO_free(out);
+			out = NULL;
 			if (rename(dbfile,buf[1]) < 0)
 				{
 				BIO_printf(bio_err,"unable to rename %s to %s\n", dbfile, buf[1]);
@@ -1626,8 +1603,6 @@ bad:
 	/*****************************************************************/
 	ret=0;
 err:
-	if(tofree)
-		OPENSSL_free(tofree);
 	BIO_free_all(Cout);
 	BIO_free_all(Sout);
 	BIO_free_all(out);
@@ -1647,7 +1622,7 @@ err:
 	NCONF_free(conf);
 	OBJ_cleanup();
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 static void lookup_fail(char *name, char *tag)
@@ -1712,7 +1687,7 @@ static BIGNUM *load_serial(char *serialfile)
 	ret=ASN1_INTEGER_to_BN(ai,NULL);
 	if (ret == NULL)
 		{
-		BIO_printf(bio_err,"error converting number from bin to BIGNUM\n");
+		BIO_printf(bio_err,"error converting number from bin to BIGNUM");
 		goto err;
 		}
 err:
@@ -2115,11 +2090,9 @@ again2:
 			}
 		}

-	if (BN_is_zero(serial))
-		row[DB_serial]=BUF_strdup("00");
-	else
-		row[DB_serial]=BN_bn2hex(serial);
-	if (row[DB_serial] == NULL)
+	row[DB_name]=X509_NAME_oneline(dn_subject,NULL,0);
+	row[DB_serial]=BN_bn2hex(serial);
+	if ((row[DB_name] == NULL) || (row[DB_serial] == NULL))
 		{
 		BIO_printf(bio_err,"Memory allocation failure\n");
 		goto err;
@@ -2316,6 +2289,16 @@ again2:
 		EVP_PKEY_copy_parameters(pktmp,pkey);
 	EVP_PKEY_free(pktmp);
 #endif
+#ifndef OPENSSL_NO_ECDSA
+	if (pkey->type == EVP_PKEY_ECDSA)
+		dgst = EVP_ecdsa();
+	pktmp = X509_get_pubkey(ret);
+	if (EVP_PKEY_missing_parameters(pktmp) &&
+		!EVP_PKEY_missing_parameters(pkey))
+		EVP_PKEY_copy_parameters(pktmp, pkey);
+	EVP_PKEY_free(pktmp);
+#endif
+

 	if (!X509_sign(ret,pkey,dgst))
 		goto err;
@@ -2332,10 +2315,10 @@ again2:

 	/* row[DB_serial] done already */
 	row[DB_file]=(char *)OPENSSL_malloc(8);
-	row[DB_name]=X509_NAME_oneline(X509_get_subject_name(ret),NULL,0);
+	/* row[DB_name] done already */

 	if ((row[DB_type] == NULL) || (row[DB_exp_date] == NULL) ||
-		(row[DB_file] == NULL) || (row[DB_name] == NULL))
+		(row[DB_file] == NULL))
 		{
 		BIO_printf(bio_err,"Memory allocation failure\n");
 		goto err;
@@ -2602,10 +2585,7 @@ static int do_revoke(X509 *x509, TXT_DB *db, int type, char *value)
 		row[i]=NULL;
 	row[DB_name]=X509_NAME_oneline(X509_get_subject_name(x509),NULL,0);
 	bn = ASN1_INTEGER_to_BN(X509_get_serialNumber(x509),NULL);
-	if (BN_is_zero(bn))
-		row[DB_serial]=BUF_strdup("00");
-	else
-		row[DB_serial]=BN_bn2hex(bn);
+	row[DB_serial]=BN_bn2hex(bn);
 	BN_free(bn);
 	if ((row[DB_name] == NULL) || (row[DB_serial] == NULL))
 		{
@@ -3074,59 +3054,55 @@ X509_NAME *do_subject(char *subject, long chtype)
 	sp++; /* skip leading / */

 	while (*sp)
-		{
+	{
 		/* collect type */
 		ne_types[ne_num] = bp;
 		while (*sp)
-			{
+		{
 			if (*sp == '\\') /* is there anything to escape in the type...? */
-				{
 				if (*++sp)
 					*bp++ = *sp++;
 				else
-					{
+				{
 					BIO_printf(bio_err, "escape character at end of string\n");
 					goto error;
-					}
 				}
 			else if (*sp == '=')
-				{
+			{
 				sp++;
 				*bp++ = '\0';
 				break;
-				}
+			}
 			else
 				*bp++ = *sp++;
-			}
+		}
 		if (!*sp)
-			{
+		{
 			BIO_printf(bio_err, "end of string encountered while processing type of subject name element #%d\n", ne_num);
 			goto error;
-			}
+		}
 		ne_values[ne_num] = bp;
 		while (*sp)
-			{
+		{
 			if (*sp == '\\')
-				{
 				if (*++sp)
 					*bp++ = *sp++;
 				else
-					{
+				{
 					BIO_printf(bio_err, "escape character at end of string\n");
 					goto error;
-					}
 				}
 			else if (*sp == '/')
-				{
+			{
 				sp++;
 				break;
-				}
+			}
 			else
 				*bp++ = *sp++;
-			}
+		}
 		*bp++ = '\0';
 		ne_num++;
-		}
+	}

 	if (!(n = X509_NAME_new()))
 		goto error;
--- a/apps/ciphers.c
+++ b/apps/ciphers.c
@@ -187,7 +187,7 @@ int MAIN(int argc, char **argv)
 			{
 			BIO_puts(STDout,SSL_CIPHER_description(
 				sk_SSL_CIPHER_value(sk,i),
-				buf,sizeof buf));
+				buf,512));
 			}
 		}

@@ -203,6 +203,6 @@ end:
 	if (ssl != NULL) SSL_free(ssl);
 	if (STDout != NULL) BIO_free_all(STDout);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

--- a/apps/crl.c
+++ b/apps/crl.c
@@ -377,7 +377,7 @@ end:
 		X509_STORE_free(store);
 	}
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 static X509_CRL *load_crl(char *infile, int format)
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -280,7 +280,7 @@ end:
 	if (crl != NULL) X509_CRL_free(crl);

 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 /*
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -73,9 +73,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, const char *title,
-	  const char *file);
+void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
+		EVP_PKEY *key, unsigned char *sigin, int siglen);

 int MAIN(int, char **);

@@ -117,7 +116,7 @@ int MAIN(int argc, char **argv)
 		goto end;

 	/* first check the program name */
-	program_name(argv[0],pname,sizeof pname);
+	program_name(argv[0],pname,PROG_NAME_SIZE);

 	md=EVP_get_digestbyname(pname);

@@ -277,10 +276,10 @@ int MAIN(int argc, char **argv)
 	if(keyfile)
 		{
 		if (want_pub)
-			sigkey = load_pubkey(bio_err, keyfile, keyform, 0, NULL,
+			sigkey = load_pubkey(bio_err, keyfile, keyform, NULL,
 				e, "key file");
 		else
-			sigkey = load_key(bio_err, keyfile, keyform, 0, NULL,
+			sigkey = load_key(bio_err, keyfile, keyform, NULL,
 				e, "key file");
 		if (!sigkey)
 			{
@@ -320,43 +319,29 @@ int MAIN(int argc, char **argv)
 	if (argc == 0)
 		{
 		BIO_set_fp(in,stdin,BIO_NOCLOSE);
-		err=do_fp(out, buf,inp,separator, out_bin, sigkey, sigbuf,
-			  siglen,"","(stdin)");
+		do_fp(out, buf,inp,separator, out_bin, sigkey, sigbuf, siglen);
 		}
 	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)
-				{
-				tmp=tofree=OPENSSL_malloc(strlen(name)+strlen(argv[i])+5);
-				sprintf(tmp,"%s(%s)= ",name,argv[i]);
-				}
-			else
-				tmp="";
-			r=do_fp(out,buf,inp,separator,out_bin,sigkey,sigbuf,
-				siglen,tmp,argv[i]);
-			if(r)
-			    err=r;
-			if(tofree)
-				OPENSSL_free(tofree);
+			if(!out_bin) BIO_printf(out, "%s(%s)= ",name,argv[i]);
+			do_fp(out, buf,inp,separator, out_bin, sigkey, 
+								sigbuf, siglen);
 			(void)BIO_reset(bmd);
 			}
 		}
 end:
 	if (buf != NULL)
 		{
-		OPENSSL_cleanse(buf,BUFSIZE);
+		memset(buf,0,BUFSIZE);
 		OPENSSL_free(buf);
 		}
 	if (in != NULL) BIO_free(in);
@@ -365,12 +350,11 @@ end:
 	if(sigbuf) OPENSSL_free(sigbuf);
 	if (bmd != NULL) BIO_free(bmd);
 	apps_shutdown();
-	OPENSSL_EXIT(err);
+	EXIT(err);
 	}

-int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
-	  EVP_PKEY *key, unsigned char *sigin, int siglen, const char *title,
-	  const char *file)
+void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
+			EVP_PKEY *key, unsigned char *sigin, int siglen)
 	{
 	int len;
 	int i;
@@ -378,33 +362,21 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 	for (;;)
 		{
 		i=BIO_read(bp,(char *)buf,BUFSIZE);
-		if(i < 0)
-			{
-			BIO_printf(bio_err, "Read Error in %s\n",file);
-			ERR_print_errors(bio_err);
-			return 1;
-			}
-		if (i == 0) break;
+		if (i <= 0) break;
 		}
 	if(sigin)
 		{
 		EVP_MD_CTX *ctx;
 		BIO_get_md_ctx(bp, &ctx);
 		i = EVP_VerifyFinal(ctx, sigin, (unsigned int)siglen, key); 
-		if(i > 0)
-			BIO_printf(out, "Verified OK\n");
-		else if(i == 0)
-			{
-			BIO_printf(out, "Verification Failure\n");
-			return 1;
-			}
+		if(i > 0) BIO_printf(out, "Verified OK\n");
+		else if(i == 0) BIO_printf(out, "Verification Failure\n");
 		else
 			{
 			BIO_printf(bio_err, "Error Verifying Data\n");
 			ERR_print_errors(bio_err);
-			return 1;
 			}
-		return 0;
+		return;
 		}
 	if(key)
 		{
@@ -414,7 +386,7 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 			{
 			BIO_printf(bio_err, "Error Signing Data\n");
 			ERR_print_errors(bio_err);
-			return 1;
+			return;
 			}
 		}
 	else
@@ -423,7 +395,6 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 	if(binout) BIO_write(out, buf, len);
 	else 
 		{
-		BIO_write(out,title,strlen(title));
 		for (i=0; i<len; i++)
 			{
 			if (sep && (i != 0))
@@ -432,6 +403,5 @@ int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
 			}
 		BIO_printf(out, "\n");
 		}
-	return 0;
 	}

--- a/apps/dh.c
+++ b/apps/dh.c
@@ -333,6 +333,6 @@ end:
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
 #endif
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -519,7 +519,7 @@ end:
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 /* dh_cb is identical to dsa_cb in apps/dsaparam.c */
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -314,6 +314,6 @@ end:
 	if(passin) OPENSSL_free(passin);
 	if(passout) OPENSSL_free(passout);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
 #endif
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -372,7 +372,7 @@ end:
 	if (out != NULL) BIO_free_all(out);
 	if (dsa != NULL) DSA_free(dsa);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 static void MS_CALLBACK dsa_cb(int p, int n, void *arg)
--- a/apps/ecdsa.c
+++ b/apps/ecdsa.c
@@ -0,0 +1,445 @@
+/* apps/ecdsa.c */
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* Copyright (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.]
+ */
+
+#ifndef OPENSSL_NO_ECDSA
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <time.h>
+#include "apps.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/ecdsa.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+
+#undef PROG
+#define PROG	ecdsa_main
+
+/* -inform arg	- input format - default PEM (one of DER, NET or PEM)
+ * -outform arg - output format - default PEM
+ * -in arg	- input file - default stdin
+ * -out arg	- output file - default stdout
+ * -des		- encrypt output if PEM format with DES in cbc mode
+ * -des3	- encrypt output if PEM format
+ * -idea	- encrypt output if PEM format
+ * -aes128	- encrypt output if PEM format
+ * -aes192	- encrypt output if PEM format
+ * -aes256	- encrypt output if PEM format
+ * -text	- print a text version
+ * -pub		- print the ECDSA public key
+ * -compressed  - print the public key in compressed form ( default )   
+ * -hybrid 	- print the public key in hybrid form
+ * -uncompressed - print the public key in uncompressed form
+ *		  the last three options ( compressed, hybrid and uncompressed )
+ *		  are only used if the "-pub" option is also selected.
+ *	  	  For a precise description of the the meaning of compressed,
+ *		  hybrid and uncompressed please refer to the X9.62 standart.
+ *		  All three forms represents ways to express the ecdsa public
+ *		  key ( a point on a elliptic curve ) as octet string. Let len be
+ *		  the length ( in bytes ) of an element of the field over which
+ *		  the curve is defined, then a compressed octet string has the form
+ *		  0x02 + result of BN_bn2bin() of the x coordinate of the public key
+ */
+
+int MAIN(int, char **);
+
+int MAIN(int argc, char **argv)
+{
+	ENGINE 	*e = NULL;
+	int 	ret = 1;
+	ECDSA 	*ecdsa = NULL;
+	int 	i, badops = 0;
+	const EVP_CIPHER *enc = NULL;
+	BIO 	*in = NULL, *out = NULL;
+	int 	informat, outformat, text=0, noout=0;
+	int  	pubin = 0, pubout = 0;
+	char 	*infile, *outfile, *prog, *engine;
+	char 	*passargin = NULL, *passargout = NULL;
+	char 	*passin = NULL, *passout = NULL;
+	int 	pub = 0, point_form = 0;
+	unsigned char *buffer = NULL;
+	unsigned int  buf_len = 0;
+	BIGNUM	*tmp_bn = NULL;
+
+	apps_startup();
+
+	if (bio_err == NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
+
+	if (!load_config(bio_err, NULL))
+		goto end;
+
+	engine = NULL;
+	infile = NULL;
+	outfile = NULL;
+	informat = FORMAT_PEM;
+	outformat = FORMAT_PEM;
+
+	prog = argv[0];
+	argc--;
+	argv++;
+	while (argc >= 1)
+	{
+		if (strcmp(*argv,"-inform") == 0)
+		{
+			if (--argc < 1) goto bad;
+			informat=str2fmt(*(++argv));
+		}
+		else if (strcmp(*argv,"-outform") == 0)
+		{
+			if (--argc < 1) goto bad;
+			outformat=str2fmt(*(++argv));
+		}
+		else if (strcmp(*argv,"-in") == 0)
+		{
+			if (--argc < 1) goto bad;
+			infile= *(++argv);
+		}
+		else if (strcmp(*argv,"-out") == 0)
+		{
+			if (--argc < 1) goto bad;
+			outfile= *(++argv);
+		}
+		else if (strcmp(*argv,"-passin") == 0)
+		{
+			if (--argc < 1) goto bad;
+			passargin= *(++argv);
+		}
+		else if (strcmp(*argv,"-passout") == 0)
+		{
+			if (--argc < 1) goto bad;
+			passargout= *(++argv);
+		}
+		else if (strcmp(*argv, "-engine") == 0)
+		{
+			if (--argc < 1) goto bad;
+			engine= *(++argv);
+		}
+		else if (strcmp(*argv, "-noout") == 0)
+			noout = 1;
+		else if (strcmp(*argv, "-text") == 0)
+			text = 1;
+		else if (strcmp(*argv, "-pub") == 0)
+		{
+			pub = 1;
+			buffer = (unsigned char *)(*(argv+1));
+			if (strcmp((char *)buffer, "compressed") == 0)
+				point_form = POINT_CONVERSION_COMPRESSED;
+			else if (strcmp((char *)buffer, "hybrid") == 0)
+				point_form = POINT_CONVERSION_HYBRID;
+			else if (strcmp((char *)buffer, "uncompressed") == 0)
+				point_form = POINT_CONVERSION_UNCOMPRESSED;
+			if (point_form)
+			{
+				argc--;
+				argv++;
+			}
+		}
+		else if (strcmp(*argv, "-pubin") == 0)
+			pubin=1;
+		else if (strcmp(*argv, "-pubout") == 0)
+			pubout=1;
+		else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
+		{
+			BIO_printf(bio_err,"unknown option %s\n",*argv);
+			badops=1;
+			break;
+		}
+		argc--;
+		argv++;
+	}
+
+	if (badops)
+	{
+bad:
+		BIO_printf(bio_err, "%s [options] <infile >outfile\n",prog);
+		BIO_printf(bio_err, "where options are\n");
+		BIO_printf(bio_err, " -inform arg     input format - DER or PEM\n");
+		BIO_printf(bio_err, " -outform arg    output format - DER or PEM\n");
+		BIO_printf(bio_err, " -in arg         input file\n");
+		BIO_printf(bio_err, " -passin arg     input file pass phrase source\n");
+		BIO_printf(bio_err, " -out arg        output file\n");
+		BIO_printf(bio_err, " -passout arg    output file pass phrase source\n");
+		BIO_printf(bio_err, " -engine e       use engine e, possibly a hardware device.\n");
+		BIO_printf(bio_err, " -des            encrypt PEM output with cbc des\n");
+		BIO_printf(bio_err, " -des3           encrypt PEM output with ede cbc des using 168 bit key\n");
+#ifndef OPENSSL_NO_IDEA
+		BIO_printf(bio_err, " -idea           encrypt PEM output with cbc idea\n");
+#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
+		BIO_printf(bio_err, " -text           print the key in text\n");
+		BIO_printf(bio_err, " -noout          don't print key out\n");
+		BIO_printf(bio_err, " -pub [compressed | hybrid | uncompressed] \n");
+		BIO_printf(bio_err, "         compressed     print the public key in compressed form ( default )\n");   
+		BIO_printf(bio_err, "         hybrid         print the public key in hybrid form\n");
+ 		BIO_printf(bio_err, "         uncompressed   print the public key in uncompressed form\n");
+		goto end;
+	}
+
+	ERR_load_crypto_strings();
+
+        e = setup_engine(bio_err, engine, 0);
+
+	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 ECDSA key\n");
+	if (informat == FORMAT_ASN1) 
+	{
+		if (pubin) 
+			ecdsa = d2i_ECDSA_PUBKEY_bio(in, NULL);
+		else 
+			ecdsa = d2i_ECDSAPrivateKey_bio(in, NULL);
+	} else if (informat == FORMAT_PEM) 
+	{
+		if (pubin) 
+			ecdsa = PEM_read_bio_ECDSA_PUBKEY(in, NULL, NULL, NULL);
+		else 
+			ecdsa = PEM_read_bio_ECDSAPrivateKey(in, NULL, NULL, passin);
+	} else
+	{
+		BIO_printf(bio_err, "bad input format specified for key\n");
+		goto end;
+	}
+	if (ecdsa == 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 (!ECDSA_print(out, ecdsa, 0))
+		{
+			perror(outfile);
+			ERR_print_errors(bio_err);
+			goto end;
+		}
+
+	if (pub)
+	{
+		fprintf(stdout, "Public Key (");
+		if (point_form == POINT_CONVERSION_COMPRESSED)
+			fprintf(stdout, "COMPRESSED");
+		else if (point_form == POINT_CONVERSION_UNCOMPRESSED)
+			fprintf(stdout, "UNCOMPRESSED");
+		else if (point_form == POINT_CONVERSION_HYBRID)
+			fprintf(stdout, "HYBRID");
+		fprintf(stdout, ")=");
+		buf_len = EC_POINT_point2oct(ecdsa->group, EC_GROUP_get0_generator(ecdsa->group),
+					     point_form, NULL, 0, NULL);
+		if (!buf_len)
+		{
+			BIO_printf(bio_err,"invalid public key length\n");
+			ERR_print_errors(bio_err);
+			goto end;
+		}
+		if ((tmp_bn = BN_new()) == NULL ||
+		    (buffer = OPENSSL_malloc(buf_len)) == NULL) goto end;
+		if (!EC_POINT_point2oct(ecdsa->group, EC_GROUP_get0_generator(ecdsa->group),
+					     point_form, buffer, buf_len, NULL) ||
+		    !BN_bin2bn(buffer, buf_len, tmp_bn))
+		{
+			BIO_printf(bio_err,"can not encode public key\n");
+			ERR_print_errors(bio_err);
+			OPENSSL_free(buffer);
+			goto end;
+		}
+		BN_print(out, tmp_bn);
+		fprintf(stdout,"\n");
+	}
+
+	if (noout) 
+		goto end;
+	BIO_printf(bio_err, "writing ECDSA key\n");
+	if (outformat == FORMAT_ASN1) 
+	{
+		if(pubin || pubout) 
+			i = i2d_ECDSA_PUBKEY_bio(out, ecdsa);
+		else 
+			i = i2d_ECDSAPrivateKey_bio(out, ecdsa);
+	} else if (outformat == FORMAT_PEM) 
+	{
+		if(pubin || pubout)
+			i = PEM_write_bio_ECDSA_PUBKEY(out, ecdsa);
+		else 
+			i = PEM_write_bio_ECDSAPrivateKey(out, ecdsa, 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 (ecdsa) 	ECDSA_free(ecdsa);
+	if (tmp_bn)	BN_free(tmp_bn);
+	if (passin) 	OPENSSL_free(passin);
+	if (passout) 	OPENSSL_free(passout);
+	apps_shutdown();
+	EXIT(ret);
+}
+#endif
--- a/apps/ecdsaparam.c
+++ b/apps/ecdsaparam.c
@@ -0,0 +1,660 @@
+/* apps/ecdsaparam.c */
+/* ====================================================================
+ * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
+ */
+/* Copyright (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.]
+ */
+
+#ifndef OPENSSL_NO_ECDSA
+#include <assert.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <time.h>
+#include <string.h>
+#include "apps.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/bn.h>
+#include <openssl/ec.h>
+#include <openssl/ecdsa.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
+
+#undef PROG
+#define PROG	ecdsaparam_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
+ * -check               - validate the ec parameters
+ * -C
+ * -noout
+ * -genkey		- generate a private public keypair based on the supplied curve
+ * -named_curve		- use the curve oid instead of the parameters
+ * -NIST_192		- use the NIST recommended curve parameters over a 192 bit prime field
+ * -NIST_224		- use the NIST recommended curve parameters over a 224 bit prime field
+ * -NIST_256		- use the NIST recommended curve parameters over a 256 bit prime field
+ * -NIST_384		- use the NIST recommended curve parameters over a 384 bit prime field
+ * -NIST_521		- use the NIST recommended curve parameters over a 521 bit prime field
+ * -X9_62_192v1		- use the X9_62 192v1 example curve over a 192 bit prime field
+ * -X9_62_192v2		- use the X9_62 192v2 example curve over a 192 bit prime field
+ * -X9_62_192v3		- use the X9_62 192v3 example curve over a 192 bit prime field
+ * -X9_62_239v1		- use the X9_62 239v1 example curve over a 239 bit prime field
+ * -X9_62_239v2		- use the X9_62 239v2 example curve over a 239 bit prime field
+ * -X9_62_239v3		- use the X9_62 239v3 example curve over a 239 bit prime field
+ * -X9_62_256v1		- use the X9_62 239v1 example curve over a 256 bit prime field
+ * -SECG_PRIME_112R1    - use the SECG 112r1 recommended curve over a 112 bit prime field
+ * -SECG_PRIME_112R2    - use the SECG 112r2 recommended curve over a 112 bit prime field
+ * -SECG_PRIME_128R1    - use the SECG 128r1 recommended curve over a 128 bit prime field
+ * -SECG_PRIME_128R2    - use the SECG 128r2 recommended curve over a 128 bit prime field
+ * -SECG_PRIME_160K1    - use the SECG 160k1 recommended curve over a 160 bit prime field
+ * -SECG_PRIME_160R1    - use the SECG 160r1 recommended curve over a 160 bit prime field
+ * -SECG_PRIME_160R2    - use the SECG 160r2 recommended curve over a 160 bit prime field
+ * -SECG_PRIME_192K1    - use the SECG 192k1 recommended curve over a 192 bit prime field
+ * -SECG_PRIME_192R1    - use the SECG 192r1 recommended curve over a 192 bit prime field
+ * -SECG_PRIME_224K1    - use the SECG 224k1 recommended curve over a 224 bit prime field
+ * -SECG_PRIME_224R1    - use the SECG 224r1 recommended curve over a 224 bit prime field
+ * -SECG_PRIME_256K1    - use the SECG 256k1 recommended curve over a 256 bit prime field
+ * -SECG_PRIME_256R1    - use the SECG 256r1 recommended curve over a 256 bit prime field
+ * -SECG_PRIME_384R1    - use the SECG 384r1 recommended curve over a 384 bit prime field
+ * -SECG_PRIME_521R1    - use the SECG 521r1 recommended curve over a 521 bit prime field
+ * -WTLS_6              - use the WAP/WTLS recommended curve number 6 over a 112 bit field
+ * -WTLS_8              - use the WAP/WTLS recommended curve number 8 over a 112 bit field
+ * -WTLS_9              - use the WAP/WTLS recommended curve number 9 over a 160 bit field
+ */
+
+int MAIN(int, char **);
+
+int MAIN(int argc, char **argv)
+{
+	ENGINE 	*e = NULL;
+	ECDSA 	*ecdsa = 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 	genkey = 0;
+	int	check = 0;
+	int 	need_rand = 0;
+	char 	*engine=NULL;
+	int	curve_type = EC_GROUP_NO_CURVE;
+	int	named_curve = 0;
+	BIGNUM	*tmp_1 = NULL, *tmp_2 = NULL, *tmp_3 = NULL, *tmp_4 = NULL, *tmp_5 = NULL,
+		*tmp_6 = NULL, *tmp_7 = NULL;
+	BN_CTX	*ctx = NULL;
+	EC_POINT *point = NULL;
+	unsigned char *data = NULL;
+
+	apps_startup();
+
+	if (bio_err == NULL)
+		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
+			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
+
+	if (!load_config(bio_err, NULL))
+		goto end;
+
+	infile=NULL;
+	outfile=NULL;
+	informat=FORMAT_PEM;
+	outformat=FORMAT_PEM;
+
+	prog=argv[0];
+	argc--;
+	argv++;
+	while (argc >= 1)
+		{
+		if 	(strcmp(*argv,"-inform") == 0)
+		{
+			if (--argc < 1) goto bad;
+			informat=str2fmt(*(++argv));
+		}
+		else if (strcmp(*argv,"-outform") == 0)
+		{
+			if (--argc < 1) goto bad;
+			outformat=str2fmt(*(++argv));
+		}
+		else if (strcmp(*argv,"-in") == 0)
+		{
+			if (--argc < 1) goto bad;
+			infile= *(++argv);
+		}
+		else if (strcmp(*argv,"-out") == 0)
+		{
+			if (--argc < 1) goto bad;
+			outfile= *(++argv);
+		}
+		else if(strcmp(*argv, "-engine") == 0)
+		{
+			if (--argc < 1) goto bad;
+			engine = *(++argv);
+		}
+		else if (strcmp(*argv,"-text") == 0)
+			text = 1;
+		else if (strcmp(*argv,"-C") == 0)
+			C = 1;
+		else if (strcmp(*argv,"-check") == 0)
+			check = 1;
+		else if (strcmp(*argv,"-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, "-named_curve") == 0)
+			named_curve = 1;
+		else if (strcmp(*argv, "-NIST_192") == 0)
+			curve_type = EC_GROUP_NIST_PRIME_192;
+		else if (strcmp(*argv, "-NIST_224") == 0)
+			curve_type = EC_GROUP_NIST_PRIME_224;
+		else if (strcmp(*argv, "-NIST_256") == 0)
+			curve_type = EC_GROUP_NIST_PRIME_256;
+		else if (strcmp(*argv, "-NIST_384") == 0)
+			curve_type = EC_GROUP_NIST_PRIME_384;
+		else if (strcmp(*argv, "-NIST_521") == 0)
+			curve_type = EC_GROUP_NIST_PRIME_521;
+		else if (strcmp(*argv, "-X9_62_192v1") == 0)
+			curve_type = EC_GROUP_X9_62_PRIME_192V1;
+		else if (strcmp(*argv, "-X9_62_192v2") == 0)
+			curve_type = EC_GROUP_X9_62_PRIME_192V2;
+		else if (strcmp(*argv, "-X9_62_192v3") == 0)
+			curve_type = EC_GROUP_X9_62_PRIME_192V3;
+		else if (strcmp(*argv, "-X9_62_239v1") == 0)
+			curve_type = EC_GROUP_X9_62_PRIME_239V1;
+		else if (strcmp(*argv, "-X9_62_239v2") == 0)
+			curve_type = EC_GROUP_X9_62_PRIME_239V2;
+		else if (strcmp(*argv, "-X9_62_239v3") == 0)
+			curve_type = EC_GROUP_X9_62_PRIME_239V3;
+		else if (strcmp(*argv, "-X9_62_256v1") == 0)
+			curve_type = EC_GROUP_X9_62_PRIME_256V1;
+		else if (strcmp(*argv, "-SECG_PRIME_112R1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_112R1;
+		else if (strcmp(*argv, "-SECG_PRIME_112R2") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_112R2;
+		else if (strcmp(*argv, "-SECG_PRIME_128R1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_128R1;
+		else if (strcmp(*argv, "-SECG_PRIME_128R2") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_128R2;
+		else if (strcmp(*argv, "-SECG_PRIME_160K1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_160K1;
+		else if (strcmp(*argv, "-SECG_PRIME_160R1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_160R1;
+		else if (strcmp(*argv, "-SECG_PRIME_160R2") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_160R2;
+		else if (strcmp(*argv, "-SECG_PRIME_192K1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_192K1;
+		else if (strcmp(*argv, "-SECG_PRIME_192R1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_192R1;
+		else if (strcmp(*argv, "-SECG_PRIME_224K1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_224K1;
+		else if (strcmp(*argv, "-SECG_PRIME_224R1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_224R1;
+		else if (strcmp(*argv, "-SECG_PRIME_256K1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_256K1;
+		else if (strcmp(*argv, "-SECG_PRIME_256R1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_256R1;
+		else if (strcmp(*argv, "-SECG_PRIME_384R1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_384R1;
+		else if (strcmp(*argv, "-SECG_PRIME_521R1") == 0)
+			curve_type = EC_GROUP_SECG_PRIME_521R1;
+		else if (strcmp(*argv, "-WTLS_6") == 0)
+			curve_type = EC_GROUP_WTLS_6;
+		else if (strcmp(*argv, "-WTLS_8") == 0)
+			curve_type = EC_GROUP_WTLS_8;
+		else if (strcmp(*argv, "-WTLS_9") == 0)
+			curve_type = EC_GROUP_WTLS_9;
+		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] [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," -check             validate the ec parameters\n");
+		BIO_printf(bio_err," -noout             no output\n");
+		BIO_printf(bio_err," -rand              files to use for random number input\n");
+		BIO_printf(bio_err," -engine e          use engine e, possibly a hardware device.\n");
+		BIO_printf(bio_err," -named_curve       use the curve oid instead of the parameters\n");
+		BIO_printf(bio_err," -NIST_192          use the NIST recommended curve parameters over a 192 bit prime field\n");
+		BIO_printf(bio_err," -NIST_224          use the NIST recommended curve parameters over a 224 bit prime field\n");
+		BIO_printf(bio_err," -NIST_256          use the NIST recommended curve parameters over a 256 bit prime field\n");
+		BIO_printf(bio_err," -NIST_384          use the NIST recommended curve parameters over a 384 bit prime field\n");
+		BIO_printf(bio_err," -NIST_521          use the NIST recommended curve parameters over a 521 bit prime field\n");
+		BIO_printf(bio_err," -X9_62_192v1       use the X9_62 192v1 example curve over a 192 bit prime field\n");
+		BIO_printf(bio_err," -X9_62_192v2       use the X9_62 192v2 example curve over a 192 bit prime field\n");
+		BIO_printf(bio_err," -X9_62_192v3       use the X9_62 192v3 example curve over a 192 bit prime field\n");
+		BIO_printf(bio_err," -X9_62_239v1       use the X9_62 239v1 example curve over a 239 bit prime field\n");
+		BIO_printf(bio_err," -X9_62_239v2       use the X9_62 239v2 example curve over a 239 bit prime field\n");
+		BIO_printf(bio_err," -X9_62_239v3       use the X9_62 239v3 example curve over a 239 bit prime field\n");
+		BIO_printf(bio_err," -X9_62_256v1       use the X9_62 239v1 example curve over a 256 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_112R1  use the SECG 112r1 recommended curve over a 112 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_112R2  use the SECG 112r2 recommended curve over a 112 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_128R1  use the SECG 128r1 recommended curve over a 128 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_128R2  use the SECG 128r2 recommended curve over a 128 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_160K1  use the SECG 160k1 recommended curve over a 160 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_160R1  use the SECG 160r1 recommended curve over a 160 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_160R2  use the SECG 160r2 recommended curve over a 160 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_192K1  use the SECG 192k1 recommended curve over a 192 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_192R1  use the SECG 192r1 recommended curve over a 192 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_224K1  use the SECG 224k1 recommended curve over a 224 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_224R1  use the SECG 224r1 recommended curve over a 224 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_256K1  use the SECG 256k1 recommended curve over a 256 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_256R1  use the SECG 256r1 recommended curve over a 256 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_384R1  use the SECG 384r1 recommended curve over a 384 bit prime field\n");
+		BIO_printf(bio_err," -SECG_PRIME_521R1  use the SECG 521r1 recommended curve over a 521 bit prime field\n");
+		BIO_printf(bio_err," -WTLS_6            use the WAP/WTLS recommended curve number 6 over a 112 bit field\n");
+		BIO_printf(bio_err," -WTLS_8            use the WAP/WTLS recommended curve number 8 over a 112 bit field\n");
+		BIO_printf(bio_err," -WTLS_9            use the WAP/WTLS recommended curve number 9 over a 112 bit field\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;
+		}
+	}
+
+        e = setup_engine(bio_err, engine, 0);
+
+	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 (curve_type != EC_GROUP_NO_CURVE)
+	{
+		if ((ecdsa = ECDSA_new()) == NULL)
+			goto end;
+		ecdsa->group = EC_GROUP_new_by_name(curve_type);
+		if (named_curve)
+			ECDSA_set_parameter_flags(ecdsa, ECDSA_FLAG_NAMED_CURVE);
+	}
+	else if (informat == FORMAT_ASN1)
+		ecdsa = d2i_ECDSAParameters_bio(in,NULL);
+	else if (informat == FORMAT_PEM)
+		ecdsa = PEM_read_bio_ECDSAParameters(in, NULL, NULL, NULL);
+	else
+	{
+		BIO_printf(bio_err, "bad input format specified\n");
+		goto end;
+	}
+	if (ecdsa == NULL)
+	{
+		BIO_printf(bio_err, "unable to load ECDSA parameters\n");
+		ERR_print_errors(bio_err);
+		goto end;
+	}
+
+	if (text)
+	{
+		ECDSAParameters_print(out, ecdsa);
+	}
+
+	if (check)
+	{
+		if (ecdsa == NULL)
+			BIO_printf(bio_err, "no elliptic curve parameters\n");
+		BIO_printf(bio_err, "checking elliptic curve parameters: ");
+		if (!EC_GROUP_check(ecdsa->group, NULL))
+		{
+			BIO_printf(bio_err, "failed\n");
+			ERR_print_errors(bio_err);
+		}
+		else
+			BIO_printf(bio_err, "ok\n");
+			
+	}
+	
+	if (C)
+	{	/* TODO: characteristic two */
+		int 	l, len, bits_p;
+		if ((tmp_1 = BN_new()) == NULL || (tmp_2 = BN_new()) == NULL ||
+		    (tmp_3 = BN_new()) == NULL || (tmp_4 = BN_new()) == NULL ||
+		    (tmp_5 = BN_new()) == NULL || (tmp_6 = BN_new()) == NULL ||
+                    (tmp_7 = BN_new()) == NULL || (ctx = BN_CTX_new()) == NULL)
+		{
+			perror("OPENSSL_malloc");
+			goto end;
+		}
+		if (!EC_GROUP_get_curve_GFp(ecdsa->group, tmp_1, tmp_2, tmp_3, ctx))
+			goto end;
+		if ((point = EC_GROUP_get0_generator(ecdsa->group)) == NULL)
+			goto end;
+		if (!EC_POINT_get_affine_coordinates_GFp(ecdsa->group, point, tmp_4, tmp_5, ctx))
+			goto end;
+		if (!EC_GROUP_get_order(ecdsa->group, tmp_6, ctx))
+			goto end;
+		if (!EC_GROUP_get_cofactor(ecdsa->group, tmp_7, ctx))
+			goto end;
+		
+		len    = BN_num_bytes(tmp_1);
+		bits_p = BN_num_bits(tmp_1);
+		data=(unsigned char *)OPENSSL_malloc(len+20);
+		if (data == NULL)
+		{
+			perror("OPENSSL_malloc");
+			goto end;
+		}
+		l = BN_bn2bin(tmp_1, data);
+		printf("static unsigned char ecdsa%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\n");
+
+		l = BN_bn2bin(tmp_2, data);
+		printf("static unsigned char ecdsa%d_a[]={",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(tmp_3, data);
+		printf("static unsigned char ecdsa%d_b[]={", 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");
+
+		l = BN_bn2bin(tmp_4, data);
+		printf("static unsigned char ecdsa%d_x[]={", 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(tmp_5, data);
+		printf("static unsigned char ecdsa%d_y[]={", 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(tmp_6, data);
+		printf("static unsigned char ecdsa%d_o[]={", 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(tmp_7, data);
+		printf("static unsigned char ecdsa%d_c[]={", 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");
+
+		/* FIXME:
+		 * generated code should check for errors
+		 */
+
+		printf("ECDSA *get_ecdsa%d(void)\n\t{\n",bits_p);
+		printf("\tint ok=0;\n");
+		printf("\tECDSA    *ecdsa=NULL;\n");
+		printf("\tEC_POINT *point=NULL;\n");
+		printf("\tBIGNUM   *tmp_1=NULL,*tmp_2=NULL,*tmp_3=NULL;\n\n");
+		printf("\tif ((ecdsa=ECDSA_new()) == NULL)\n");
+		printf("\t\treturn(NULL);\n\n");
+		printf("\t/* generate EC_GROUP structure */\n");
+		printf("\tif ((tmp_1 = BN_bin2bn(ecdsa%d_p, sizeof(ecdsa%d_p), NULL)) == NULL) goto err;\n", bits_p, bits_p);
+		printf("\tif ((tmp_2 = BN_bin2bn(ecdsa%d_a, sizeof(ecdsa%d_a), NULL)) == NULL) goto err;\n", bits_p, bits_p);
+		printf("\tif ((tmp_3 = BN_bin2bn(ecdsa%d_b, sizeof(ecdsa%d_b), NULL)) == NULL) goto err;\n", bits_p, bits_p);
+		printf("\tif ((ecdsa->group = EC_GROUP_new_curve_GFp(tmp_1, tmp_2, tmp_3, NULL)) == NULL) goto err;\n\n");
+		printf("\t/* build generator */\n");
+		printf("\tif (!BN_bin2bn(ecdsa%d_x, sizeof(ecdsa%d_x), tmp_1)) goto err;\n", bits_p, bits_p);
+		printf("\tif (!BN_bin2bn(ecdsa%d_y, sizeof(ecdsa%d_y), tmp_2)) goto err;\n", bits_p, bits_p);
+		printf("\tif ((point = EC_POINT_new(ecdsa->group)) == NULL) goto err;\n");
+		printf("\tif (!EC_POINT_set_affine_coordinates_GFp(ecdsa->group, point, tmp_1, tmp_2, NULL)) goto err;\n");
+		printf("\t/* set generator, order and cofactor */\n");
+		printf("\tif (!BN_bin2bn(ecdsa%d_o, sizeof(ecdsa%d_o), tmp_1)) goto err;\n", bits_p, bits_p);
+		printf("\tif (!BN_bin2bn(ecdsa%d_c, sizeof(ecdsa%d_c), tmp_2)) goto err;\n", bits_p, bits_p);
+		printf("\tif (!EC_GROUP_set_generator(ecdsa->group, point, tmp_1, tmp_2)) goto err;\n");
+		printf("\n\tok=1;\n");
+		printf("err:\n");
+		printf("\tif (tmp_1) BN_free(tmp_1);\n");
+		printf("\tif (tmp_2) BN_free(tmp_2);\n");
+		printf("\tif (tmp_3) BN_free(tmp_3);\n");
+		printf("\tif (point) EC_POINT_free(point);\n");
+		printf("\tif (!ok)\n");
+		printf("\t\t{\n");
+		printf("\t\tECDSA_free(ecdsa);\n");
+		printf("\t\tecdsa = NULL;\n");
+		printf("\t\t}\n");
+		printf("\treturn(ecdsa);\n\t}\n");
+	}
+
+
+	if (!noout)
+	{
+		if (outformat == FORMAT_ASN1)
+			i = i2d_ECDSAParameters_bio(out, ecdsa);
+		else if (outformat == FORMAT_PEM)
+			i = PEM_write_bio_ECDSAParameters(out, ecdsa);
+		else	
+		{
+			BIO_printf(bio_err,"bad output format specified for outfile\n");
+			goto end;
+		}
+		if (!i)
+		{
+			BIO_printf(bio_err, "unable to write ECDSA parameters\n");
+			ERR_print_errors(bio_err);
+			goto end;
+		}
+	}
+	if (genkey)
+	{
+		ECDSA *ecdsakey;
+
+		assert(need_rand);
+		if ((ecdsakey = ECDSAParameters_dup(ecdsa)) == NULL) goto end;
+		if (!ECDSA_generate_key(ecdsakey)) goto end;
+		if (outformat == FORMAT_ASN1)
+			i = i2d_ECDSAPrivateKey_bio(out, ecdsakey);
+		else if (outformat == FORMAT_PEM)
+			i = PEM_write_bio_ECDSAPrivateKey(out, ecdsakey, NULL, NULL, 0, NULL, NULL);
+		else	
+		{
+			BIO_printf(bio_err, "bad output format specified for outfile\n");
+			goto end;
+		}
+		ECDSA_free(ecdsakey);
+	}
+	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 (ecdsa != NULL) 	ECDSA_free(ecdsa);
+	if (tmp_1)		BN_free(tmp_1);
+	if (tmp_2)		BN_free(tmp_2);
+	if (tmp_3)		BN_free(tmp_3);
+	if (tmp_3)		BN_free(tmp_4);
+	if (tmp_3)		BN_free(tmp_5);
+	if (tmp_3)		BN_free(tmp_6);
+	if (tmp_3)		BN_free(tmp_7);
+	if (ctx)		BN_CTX_free(ctx);
+	if (data)		OPENSSL_free(data);
+	apps_shutdown();
+	EXIT(ret);
+}
+#endif
--- a/apps/enc.c
+++ b/apps/enc.c
@@ -78,7 +78,7 @@ int set_hex(char *in,unsigned char *out,int size);
 #define BSIZE	(8*1024)
 #define	PROG	enc_main

-static void show_ciphers(const OBJ_NAME *name,void *bio_)
+void show_ciphers(const OBJ_NAME *name,void *bio_)
 	{
 	BIO *bio=bio_;
 	static int n;
@@ -102,7 +102,7 @@ int MAIN(int argc, char **argv)
 	{
 	ENGINE *e = NULL;
 	static const char magic[]="Salted__";
-	char mbuf[sizeof magic-1];
+	char mbuf[8];	/* should be 1 smaller than magic */
 	char *strbuf=NULL;
 	unsigned char *buff=NULL,*bufsize=NULL;
 	int bsize=BSIZE,verbose=0;
@@ -131,7 +131,7 @@ int MAIN(int argc, char **argv)
 		goto end;

 	/* first check the program name */
-	program_name(argv[0],pname,sizeof pname);
+	program_name(argv[0],pname,PROG_NAME_SIZE);
 	if (strcmp(pname,"base64") == 0)
 		base64=1;

@@ -216,7 +216,7 @@ int MAIN(int argc, char **argv)
 				goto bad;
 				}
 			buf[0]='\0';
-			fgets(buf,sizeof buf,infile);
+			fgets(buf,128,infile);
 			fclose(infile);
 			i=strlen(buf);
 			if ((i > 0) &&
@@ -442,12 +442,12 @@ bad:
 			else {
 				if(enc) {
 					if(hsalt) {
-						if(!set_hex(hsalt,salt,sizeof salt)) {
+						if(!set_hex(hsalt,salt,PKCS5_SALT_LEN)) {
 							BIO_printf(bio_err,
 								"invalid hex salt value\n");
 							goto end;
 						}
-					} else if (RAND_pseudo_bytes(salt, sizeof salt) < 0)
+					} else if (RAND_pseudo_bytes(salt, PKCS5_SALT_LEN) < 0)
 						goto end;
 					/* If -P option then don't bother writing */
 					if((printkey != 2)
@@ -455,14 +455,14 @@ bad:
 							 sizeof magic-1) != sizeof magic-1
 					       || BIO_write(wbio,
 							    (char *)salt,
-							    sizeof salt) != sizeof salt)) {
+							    PKCS5_SALT_LEN) != PKCS5_SALT_LEN)) {
 						BIO_printf(bio_err,"error writing output file\n");
 						goto end;
 					}
 				} else if(BIO_read(rbio,mbuf,sizeof mbuf) != sizeof mbuf
 					  || BIO_read(rbio,
 						      (unsigned char *)salt,
-				    sizeof salt) != sizeof salt) {
+				    PKCS5_SALT_LEN) != PKCS5_SALT_LEN) {
 					BIO_printf(bio_err,"error reading input file\n");
 					goto end;
 				} else if(memcmp(mbuf,magic,sizeof magic-1)) {
@@ -481,14 +481,9 @@ bad:
 			 * bug picked up by
 			 * Larry J. Hughes Jr. <hughes@indiana.edu> */
 			if (str == strbuf)
-				OPENSSL_cleanse(str,SIZE);
+				memset(str,0,SIZE);
 			else
-				OPENSSL_cleanse(str,strlen(str));
-			}
-		if ((hiv != NULL) && !set_hex(hiv,iv,sizeof iv))
-			{
-			BIO_printf(bio_err,"invalid hex iv value\n");
-			goto end;
+				memset(str,0,strlen(str));
 			}
 		if ((hiv == NULL) && (str == NULL))
 			{
@@ -498,6 +493,11 @@ bad:
 			BIO_printf(bio_err, "iv undefined\n");
 			goto end;
 			}
+		if ((hiv != NULL) && !set_hex(hiv,iv,sizeof iv))
+			{
+			BIO_printf(bio_err,"invalid hex iv value\n");
+			goto end;
+			}
 		if ((hkey != NULL) && !set_hex(hkey,key,sizeof key))
 			{
 			BIO_printf(bio_err,"invalid hex key value\n");
@@ -524,7 +524,7 @@ bad:
 			if (!nosalt)
 				{
 				printf("salt=");
-				for (i=0; i<sizeof salt; i++)
+				for (i=0; i<PKCS5_SALT_LEN; i++)
 					printf("%02X",salt[i]);
 				printf("\n");
 				}
@@ -586,7 +586,7 @@ end:
 	if (b64 != NULL) BIO_free(b64);
 	if(pass) OPENSSL_free(pass);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 int set_hex(char *in, unsigned char *out, int size)
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -516,5 +516,5 @@ end:
 	sk_pop_free(post_cmds, identity);
 	if (bio_out != NULL) BIO_free_all(bio_out);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -122,5 +122,5 @@ int MAIN(int argc, char **argv)
 			}
 		}
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
--- a/apps/gendh.c
+++ b/apps/gendh.c
@@ -198,7 +198,7 @@ end:
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 static void MS_CALLBACK dh_cb(int p, int n, void *arg)
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -246,6 +246,6 @@ end:
 	if (dsa != NULL) DSA_free(dsa);
 	if(passout) OPENSSL_free(passout);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
 #endif
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -258,7 +258,7 @@ err:
 	if (ret != 0)
 		ERR_print_errors(bio_err);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
--- a/apps/install.com
+++ b/apps/install.com
@@ -62,7 +62,9 @@ $	COPY CA.COM WRK_SSLAEXE:CA.COM/LOG
 $	SET FILE/PROT=W:RE WRK_SSLAEXE:CA.COM
 $	COPY CA.COM WRK_SSLVEXE:CA.COM/LOG
 $	SET FILE/PROT=W:RE WRK_SSLVEXE:CA.COM
-$	COPY OPENSSL-VMS.CNF WRK_SSLROOT:[000000]OPENSSL.CNF/LOG
+$	COPY OPENSSL-VMS.CNF WRK_SSLROOT:[000000]OPENSSL-VMS.CNF/LOG
+$	SET FILE/PROT=W:R WRK_SSLROOT:[000000]OPENSSL-VMS.CNF
+$	COPY OPENSSL.CNF WRK_SSLROOT:[000000]OPENSSL.CNF/LOG
 $	SET FILE/PROT=W:R WRK_SSLROOT:[000000]OPENSSL.CNF
 $	SET ON
 $
--- a/apps/makeapps.com
+++ b/apps/makeapps.com
@@ -15,10 +15,22 @@ $!
 $!  It was written so it would try to determine what "C" compiler to
 $!  use or you can specify which "C" compiler to use.
 $!
-$!  Specify DEBUG or NODEBUG as P1 to compile with or without debugger
+$!  Specify RSAREF as P1 to compile with the RSAREF library instead of
+$!  the regular one.  If you specify NORSAREF it will compile with the
+$!  regular RSAREF routines.  (Note: If you are in the United States
+$!  you MUST compile with RSAREF unless you have a license from RSA).
+$!
+$!  Note: The RSAREF libraries are NOT INCLUDED and you have to
+$!        download it from "ftp://ftp.rsa.com/rsaref".  You have to
+$!        get the ".tar-Z" file as the ".zip" file dosen't have the
+$!        directory structure stored.  You have to extract the file
+$!        into the [.RSAREF] directory under the root directory as that
+$!        is where the scripts will look for the files.
+$!
+$!  Specify DEBUG or NODEBUG as P2 to compile with or without debugger
 $!  information.
 $!
-$!  Specify which compiler at P2 to try to compile under.
+$!  Specify which compiler at P3 to try to compile under.
 $!
 $!	   VAXC	 For VAX C.
 $!	   DECC	 For DEC C.
@@ -27,18 +39,24 @@ $!
 $!  If you don't speficy a compiler, it will try to determine which
 $!  "C" compiler to use.
 $!
-$!  P3, if defined, sets a TCP/IP library to use, through one of the following
+$!  P4, if defined, sets a TCP/IP library to use, through one of the following
 $!  keywords:
 $!
 $!	UCX		for UCX
 $!	SOCKETSHR	for SOCKETSHR+NETLIB
 $!	TCPIP		for TCPIP (post UCX)
 $!
-$!  P4, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
+$!  P5, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
 $!
-$!  P5, if defined, sets a choice of programs to compile.
+$!  P6, if defined, sets a choice of programs to compile.
 $!
 $!
+$!
+$! Define USER_CCFLAGS
+$!
+$ @[-]vms_build_info.com
+$ WRITE SYS$OUTPUT " Using USER_CCFLAGS = ", USER_CCFLAGS
+$!
 $! Define A TCP/IP Library That We Will Need To Link To.
 $! (That Is, If We Need To Link To One.)
 $!
@@ -87,11 +105,15 @@ $ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."
 $!
 $! Define The CRYPTO Library.
 $!
-$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
+$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO'build_bits'.OLB
+$!
+$! Define The RSAREF Library.
+$!
+$ RSAREF_LIB := SYS$DISK:[-.'ARCH'.EXE.RSAREF]LIBRSAGLUE'build_bits'.OLB
 $!
 $! Define The SSL Library.
 $!
-$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
+$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL'build_bits'.OLB
 $!
 $! Define The OBJ Directory.
 $!
@@ -110,6 +132,23 @@ $! End The OBJ Directory Check.
 $!
 $ ENDIF
 $!
+$! Define The LIS Directory.
+$!
+$ LIS_DIR := SYS$DISK:[-.'ARCH'.LIS.APPS]
+$!
+$! Check To See If The OBJ Directory Exists.
+$!
+$ IF (F$PARSE(LIS_DIR).EQS."")
+$ THEN
+$!
+$!  It Dosen't Exist, So Create It.
+$!
+$   CREATE/DIRECTORY 'LIS_DIR'
+$!
+$! End The LIS Directory Check.
+$!
+$ ENDIF
+$!
 $! Define The EXE Directory.
 $!
 $ EXE_DIR := SYS$DISK:[-.'ARCH'.EXE.APPS]
@@ -140,13 +179,13 @@ $!
 $ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+-
 	      "CA;PKCS7;CRL2P7;CRL;"+-
 	      "RSA;RSAUTL;DSA;DSAPARAM;"+-
-	      "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+-
+	      "X509;GENRSA;GENDSA;TERM_SOCK;S_SERVER;S_CLIENT;SPEED;"+-
 	      "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+-
 	      "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND;ENGINE;OCSP"
 $ APP_FILES := OPENSSL,'OBJ_DIR'VERIFY.OBJ,ASN1PARS.OBJ,REQ.OBJ,DGST.OBJ,DH.OBJ,DHPARAM.OBJ,ENC.OBJ,PASSWD.OBJ,GENDH.OBJ,ERRSTR.OBJ,-
 	       CA.OBJ,PKCS7.OBJ,CRL2P7.OBJ,CRL.OBJ,-
 	       RSA.OBJ,RSAUTL.OBJ,DSA.OBJ,DSAPARAM.OBJ,-
-	       X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,-
+	       X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,TERM_SOCK.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,-
 	       S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,-
 	       CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ,RAND.OBJ,ENGINE.OBJ,OCSP.OBJ
 $ TCPIP_PROGRAMS = ",,"
@@ -166,7 +205,7 @@ $!     TCPIP_PROGRAMS = ",S_SERVER,S_CLIENT,SESS_ID,CIPHERS,S_TIME,"
 $!
 $! Setup exceptional compilations
 $!
-$ COMPILEWITH_CC2 = ",S_SERVER,S_CLIENT,"
+$ COMPILEWITH_CC2 = ",S_SOCKET,S_SERVER,S_CLIENT,"
 $!
 $ PHASE := LIB
 $!
@@ -219,6 +258,10 @@ $! Create The Object File Name.
 $!
 $ OBJECT_FILE = OBJ_DIR + FILE_NAME + ".OBJ"
 $!
+$! Create The Listing File Name.
+$!
+$ LIST_FILE = LIS_DIR + FILE_NAME + ".LIS"
+$!
 $! Create The Executable File Name.
 $!
 $ EXE_FILE = EXE_DIR + FILE_NAME + ".EXE"
@@ -232,7 +275,7 @@ $!
 $!  Tell The User That The File Dosen't Exist.
 $!
 $   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The File ",SOURCE_FILE," Dosen't Exist."
+$   WRITE SYS$OUTPUT F$MESSAGE("%X10018290") + ".  The File ",SOURCE_FILE," Dosen't Exist."
 $   WRITE SYS$OUTPUT ""
 $!
 $!  Exit The Build.
@@ -257,9 +300,9 @@ $!
 $ ON ERROR THEN GOTO NEXT_FILE
 $ IF COMPILEWITH_CC2 - FILE_NAME .NES. COMPILEWITH_CC2
 $ THEN
-$   CC2/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
+$   CC2/OBJECT='OBJECT_FILE'/LIST='LIST_FILE'/MACHINE_CODE 'SOURCE_FILE'
 $ ELSE
-$   CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
+$   CC/OBJECT='OBJECT_FILE'/LIST='LIST_FILE'/MACHINE_CODE 'SOURCE_FILE'
 $ ENDIF
 $!
 $ ON WARNING THEN GOTO NEXT_FILE
@@ -277,31 +320,87 @@ $   WRITE SYS$OUTPUT FILE_NAME," needs a TCP/IP library.  Can't link.  Skipping.
 $   GOTO NEXT_FILE
 $ ENDIF
 $!
-$! Link The Program.
-$! Check To See If We Are To Link With A Specific TCP/IP Library.
+$! Link The Program, Check To See If We Need To Link With RSAREF Or Not.
 $!
-$ IF (TCPIP_LIB.NES."")
+$ IF (RSAREF.EQS."TRUE")
 $ THEN
 $!
-$! Don't Link With The RSAREF Routines And TCP/IP Library.
+$!  Check To See If We Are To Link With A Specific TCP/IP Library.
 $!
-$   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
-	'OBJECT_FILE''EXTRA_OBJ', -
-        'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
-        'TCPIP_LIB','OPT_FILE'/OPTION
+$   IF (TCPIP_LIB.NES."")
+$   THEN
+$!
+$!    Link With The RSAREF Library And A Specific TCP/IP Library.
+$!
+$     LINK /'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' /MAP='MAP_FILE' /FULL/CROSS -
+	  'OBJECT_FILE''EXTRA_OBJ', -
+          'SSL_LIB'/LIBRARY,-
+	  'CRYPTO_LIB'/LIBRARY, -
+	  'RSAREF_LIB'/LIBRARY, -
+          'TCPIP_LIB', -
+	  'OPT_FILE'/OPTION, -
+	  SYS$DISK:[-]SSL_IDENT.OPT/OPTION
+$!
+$!  Else...
+$!
+$   ELSE
+$!
+$!    Link With The RSAREF Library And NO TCP/IP Library.
+$!
+$     LINK /'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' /MAP='MAP_FILE' /FULL/CROSS -
+	  'OBJECT_FILE''EXTRA_OBJ', -
+          'SSL_LIB'/LIBRARY, -
+	  'CRYPTO_LIB'/LIBRARY, -
+	  'RSAREF_LIB'/LIBRARY, -
+          'OPT_FILE'/OPTION, -
+	  SYS$DISK:[-]SSL_IDENT.OPT/OPTION
+$!
+$!  End The TCP/IP Library Check.
+$!
+$   ENDIF
 $!
 $! Else...
 $!
 $ ELSE
 $!
-$! Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
+$!  Don't Link With The RSAREF Routines.
 $!
-$   LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
-	'OBJECT_FILE''EXTRA_OBJ', -
-        'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
-        'OPT_FILE'/OPTION
 $!
-$! End The TCP/IP Library Check.
+$!  Check To See If We Are To Link With A Specific TCP/IP Library.
+$!
+$   IF (TCPIP_LIB.NES."")
+$   THEN
+$!
+$!    Don't Link With The RSAREF Routines And TCP/IP Library.
+$!
+$       LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' /MAP='MAP_FILE' /FULL/CROSS -
+	    'OBJECT_FILE''EXTRA_OBJ', -
+            'SSL_LIB'/LIBRARY, -
+	    'CRYPTO_LIB'/LIBRARY, -
+            'TCPIP_LIB', -
+	    'OPT_FILE'/OPTION, -
+	  SYS$DISK:[-]SSL_IDENT.OPT/OPTION
+
+$!
+$!  Else...
+$!
+$   ELSE
+$!
+$!    Don't Link With The RSAREF Routines And Link With A TCP/IP Library.
+$!
+$       LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' /MAP='MAP_FILE' /FULL/CROSS -
+	    'OBJECT_FILE''EXTRA_OBJ', -
+            'SSL_LIB'/LIBRARY, -
+	    'CRYPTO_LIB'/LIBRARY, -
+            'OPT_FILE'/OPTION, -
+	  SYS$DISK:[-]SSL_IDENT.OPT/OPTION
+$!
+$!
+$!  End The TCP/IP Library Check.
+$!
+$   ENDIF
+$!
+$! End The RSAREF Link Check.
 $!
 $ ENDIF
 $!
@@ -432,6 +531,7 @@ $!  End The Option File Search.
 $!
 $   ENDIF
 $!
+$!
 $! End The DEC C Check.
 $!
 $ ENDIF
@@ -468,6 +568,32 @@ $! End The Crypto Library Check.
 $!
 $ ENDIF
 $!
+$! See If We Need The RSAREF Library.
+$!
+$ IF (RSAREF.EQS."TRUE")
+$ THEN
+$!
+$!  Look For The Library LIBRSAGLUE.OLB.
+$!
+$   IF (F$SEARCH(RSAREF_LIB).EQS."")
+$   THEN
+$!
+$!    Tell The User We Can't Find The LIBRSAGLUE.OLB Library.
+$!
+$     WRITE SYS$OUTPUT ""
+$     WRITE SYS$OUTPUT "Can't Find The Library ",RSAREF_LIB,"."
+$     WRITE SYS$OUTPUT "We Can't Link Without It."
+$     WRITE SYS$OUTPUT ""
+$!
+$!    Since We Can't Link Without It, Exit.
+$!
+$     EXIT
+$   ENDIF
+$!
+$! End The RSAREF Library Check.
+$!
+$ ENDIF
+$!
 $! Look For The Library LIBSSL.OLB.
 $!
 $ IF (F$SEARCH(SSL_LIB).EQS."")
@@ -498,10 +624,87 @@ $ CHECK_OPTIONS:
 $!
 $! Check To See If P1 Is Blank.
 $!
-$ IF (P1.EQS."NODEBUG")
+$ P1 = "NORSAREF"
+$ IF (P1.EQS."NORSAREF")
 $ THEN
 $!
-$!   P1 Is NODEBUG, So Compile Without Debugger Information.
+$!   P1 Is NORSAREF, So Compile With The Regular RSA Libraries.
+$!
+$    RSAREF = "FALSE"
+$!
+$! Else...
+$!
+$ ELSE
+$!
+$!  Check To See If We Are To Use The RSAREF Library.
+$!
+$   IF (P1.EQS."RSAREF")
+$   THEN
+$!
+$!    Check To Make Sure We Have The RSAREF Source Code Directory.
+$!
+$     IF (F$SEARCH("SYS$DISK:[-.RSAREF]SOURCE.DIR").EQS."")
+$     THEN
+$!
+$!      We Don't Have The RSAREF Souce Code Directory, So Tell The
+$!      User This.
+$!
+$       WRITE SYS$OUTPUT ""
+$       WRITE SYS$OUTPUT "It appears that you don't have the RSAREF Souce Code."
+$       WRITE SYS$OUTPUT "You need to go to 'ftp://ftp.rsa.com/rsaref'.  You have to"
+$       WRITE SYS$OUTPUT "get the '.tar-Z' file as the '.zip' file dosen't have the"
+$       WRITE SYS$OUTPUT "directory structure stored.  You have to extract the file"
+$       WRITE SYS$OUTPUT "into the [.RSAREF] directory under the root directory"
+$       WRITE SYS$OUTPUT "as that is where the scripts will look for the files."
+$       WRITE SYS$OUTPUT ""
+$!
+$!      Time To Exit.
+$!
+$       EXIT
+$!
+$!    Else...
+$!
+$     ELSE
+$!
+$!      Compile Using The RSAREF Library.
+$!
+$       RSAREF = "TRUE"
+$!
+$!    End The RSAREF Soure Directory Check.
+$!
+$     ENDIF
+$!
+$!  Else...
+$!
+$   ELSE 
+$!
+$!    They Entered An Invalid Option..
+$!
+$     WRITE SYS$OUTPUT ""
+$     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
+$     WRITE SYS$OUTPUT ""
+$     WRITE SYS$OUTPUT "     RSAREF   :  Compile With The RSAREF Library."
+$     WRITE SYS$OUTPUT "     NORSAREF :  Compile With The Regular RSA Library."
+$     WRITE SYS$OUTPUT ""
+$!
+$!    Time To EXIT.
+$!
+$     EXIT
+$!
+$!  End The Valid Arguement Check.
+$!
+$   ENDIF
+$!
+$! End P1 Check.
+$!
+$ ENDIF
+$!
+$! Check To See If P2 Is Blank.
+$!
+$ IF (P2.EQS."NODEBUG")
+$ THEN
+$!
+$!   P2 Is NODEBUG, So Compile Without Debugger Information.
 $!
 $    DEBUGGER  = "NODEBUG"
 $    TRACEBACK = "NOTRACEBACK" 
@@ -516,7 +719,7 @@ $ ELSE
 $!
 $!  Check To See If We Are To Compile With Debugger Information.
 $!
-$   IF (P1.EQS."DEBUG")
+$   IF (P2.EQS."DEBUG")
 $   THEN
 $!
 $!    Compile With Debugger Information.
@@ -532,7 +735,7 @@ $!
 $!    Tell The User Entered An Invalid Option..
 $!
 $     WRITE SYS$OUTPUT ""
-$     WRITE SYS$OUTPUT "The Option ",P1," Is Invalid.  The Valid Options Are:"
+$     WRITE SYS$OUTPUT "The Option ",P2," Is Invalid.  The Valid Options Are:"
 $     WRITE SYS$OUTPUT ""
 $     WRITE SYS$OUTPUT "    DEBUG    :  Compile With The Debugger Information."
 $     WRITE SYS$OUTPUT "    NODEBUG  :  Compile Without The Debugger Information."
@@ -546,13 +749,13 @@ $!  End The Valid Arguement Check.
 $!
 $   ENDIF
 $!
-$! End The P1 Check.
+$! End The P2 Check.
 $!
 $ ENDIF
 $!
-$! Check To See If P2 Is Blank.
+$! Check To See If P3 Is Blank.
 $!
-$ IF (P2.EQS."")
+$ IF (P3.EQS."")
 $ THEN
 $!
 $!  O.K., The User Didn't Specify A Compiler, Let's Try To
@@ -565,7 +768,7 @@ $   THEN
 $!
 $!    Looks Like GNUC, Set To Use GNUC.
 $!
-$     P2 = "GNUC"
+$     P3 = "GNUC"
 $!
 $!  Else...
 $!
@@ -578,7 +781,7 @@ $     THEN
 $!
 $!      Looks Like DECC, Set To Use DECC.
 $!
-$       P2 = "DECC"
+$       P3 = "DECC"
 $!
 $!    Else...
 $!
@@ -586,7 +789,7 @@ $     ELSE
 $!
 $!      Looks Like VAXC, Set To Use VAXC.
 $!
-$       P2 = "VAXC"
+$       P3 = "VAXC"
 $!
 $!    End The VAXC Compiler Check.
 $!
@@ -600,9 +803,9 @@ $!  End The Compiler Check.
 $!
 $ ENDIF
 $!
-$! Check To See If We Have A Option For P3.
+$! Check To See If We Have A Option For P4.
 $!
-$ IF (P3.EQS."")
+$ IF (P4.EQS."")
 $ THEN
 $!
 $!  Find out what socket library we have available
@@ -612,7 +815,7 @@ $   THEN
 $!
 $!    We have SOCKETSHR, and it is my opinion that it's the best to use.
 $!
-$     P3 = "SOCKETSHR"
+$     P4 = "SOCKETSHR"
 $!
 $!    Tell the user
 $!
@@ -632,7 +835,7 @@ $     THEN
 $!
 $!	Last resort: a UCX or UCX-compatible library
 $!
-$	P3 = "UCX"
+$	P4 = "UCX"
 $!
 $!      Tell the user
 $!
@@ -656,12 +859,12 @@ $ IF F$TYPE(USER_CCDISABLEWARNINGS) .NES. "" THEN -
 $!
 $!  Check To See If The User Entered A Valid Paramter.
 $!
-$ IF (P2.EQS."VAXC").OR.(P2.EQS."DECC").OR.(P2.EQS."GNUC")
+$ IF (P3.EQS."VAXC").OR.(P3.EQS."DECC").OR.(P3.EQS."GNUC")
 $ THEN
 $!
 $!  Check To See If The User Wanted DECC.
 $!
-$   IF (P2.EQS."DECC")
+$   IF (P3.EQS."DECC")
 $   THEN
 $!
 $!    Looks Like DECC, Set To Use DECC.
@@ -678,12 +881,12 @@ $     CC = "CC"
 $     IF ARCH.EQS."VAX" .AND. F$TRNLNM("DECC$CC_DEFAULT").NES."/DECC" -
 	 THEN CC = "CC/DECC"
 $     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/STANDARD=ANSI89" + -
-           "/NOLIST/PREFIX=ALL" + -
+           "/PREFIX=ALL" + -
 	   "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]''arch'_DECC_OPTIONS.OPT"
 $!
 $!  End DECC Check.
 $!
@@ -691,7 +894,7 @@ $   ENDIF
 $!
 $!  Check To See If We Are To Use VAXC.
 $!
-$   IF (P2.EQS."VAXC")
+$   IF (P3.EQS."VAXC")
 $   THEN
 $!
 $!    Looks Like VAXC, Set To Use VAXC.
@@ -710,7 +913,7 @@ $	WRITE SYS$OUTPUT "There is no VAX C on Alpha!"
 $	EXIT
 $     ENDIF
 $     IF F$TRNLNM("DECC$CC_DEFAULT").EQS."/DECC" THEN CC = "CC/VAXC"
-$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
+$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'" + -
 	   "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS
 $     CCDEFS = CCDEFS + ",""VAXC"""
 $!
@@ -720,7 +923,7 @@ $     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]''arch'_VAXC_OPTIONS.OPT"
 $!
 $!  End VAXC Check
 $!
@@ -728,7 +931,7 @@ $   ENDIF
 $!
 $!  Check To See If We Are To Use GNU C.
 $!
-$   IF (P2.EQS."GNUC")
+$   IF (P3.EQS."GNUC")
 $   THEN
 $!
 $!    Looks Like GNUC, Set To Use GNUC.
@@ -742,12 +945,12 @@ $!
 $!    Use GNU C...
 $!
 $     IF F$TYPE(GCC) .EQS. "" THEN GCC := GCC
-$     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + -
+$     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'" + -
 	   "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]''arch'_GNUC_OPTIONS.OPT"
 $!
 $!  End The GNU C Check.
 $!
@@ -757,6 +960,31 @@ $!  Set up default defines
 $!
 $   CCDEFS = """FLAT_INC=1""," + CCDEFS
 $!
+$!  Check To See If We Are To Compile With RSAREF Routines.
+$!
+$   IF (RSAREF.EQS."TRUE")
+$   THEN
+$!
+$!    Compile With RSAREF.
+$!
+$     CCDEFS = CCDEFS + ",""RSAref=1"""
+$!
+$!    Tell The User This.
+$!
+$     WRITE SYS$OUTPUT "Compiling With RSAREF Routines."
+$!
+$!    Else, We Don't Care.  Compile Without The RSAREF Library.
+$!
+$   ELSE
+$!
+$!    Tell The User We Are Compile Without The RSAREF Routines.
+$!
+$     WRITE SYS$OUTPUT "Compiling Without The RSAREF Routines.
+$!
+$!  End The RSAREF Check.
+$!
+$   ENDIF
+$!
 $!  Else The User Entered An Invalid Arguement.
 $!
 $ ELSE
@@ -764,7 +992,7 @@ $!
 $!  Tell The User We Don't Know What They Want.
 $!
 $   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The Option ",P2," Is Invalid.  The Valid Options Are:"
+$   WRITE SYS$OUTPUT "The Option ",P3," Is Invalid.  The Valid Options Are:"
 $   WRITE SYS$OUTPUT ""
 $   WRITE SYS$OUTPUT "    VAXC  :  To Compile With VAX C."
 $   WRITE SYS$OUTPUT "    DECC  :  To Compile With DEC C."
@@ -778,13 +1006,12 @@ $ ENDIF
 $!
 $! Time to check the contents, and to make sure we get the correct library.
 $!
-$ IF P3.EQS."SOCKETSHR" .OR. P3.EQS."MULTINET" .OR. P3.EQS."UCX" -
-     .OR. P3.EQS."TCPIP" .OR. P3.EQS."NONE"
+$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
 $ THEN
 $!
 $!  Check to see if SOCKETSHR was chosen
 $!
-$   IF P3.EQS."SOCKETSHR"
+$   IF P4.EQS."SOCKETSHR"
 $   THEN
 $!
 $!    Set the library to use SOCKETSHR
@@ -797,12 +1024,12 @@ $   ENDIF
 $!
 $!  Check to see if MULTINET was chosen
 $!
-$   IF P3.EQS."MULTINET"
+$   IF P4.EQS."MULTINET"
 $   THEN
 $!
 $!    Set the library to use UCX emulation.
 $!
-$     P3 = "UCX"
+$     P4 = "UCX"
 $!
 $!    Done with MULTINET
 $!
@@ -810,7 +1037,7 @@ $   ENDIF
 $!
 $!  Check to see if UCX was chosen
 $!
-$   IF P3.EQS."UCX"
+$   IF P4.EQS."UCX"
 $   THEN
 $!
 $!    Set the library to use UCX.
@@ -830,7 +1057,7 @@ $   ENDIF
 $!
 $!  Check to see if TCPIP (post UCX) was chosen
 $!
-$   IF P3.EQS."TCPIP"
+$   IF P4.EQS."TCPIP"
 $   THEN
 $!
 $!    Set the library to use TCPIP.
@@ -843,7 +1070,7 @@ $   ENDIF
 $!
 $!  Check to see if NONE was chosen
 $!
-$   IF P3.EQS."NONE"
+$   IF P4.EQS."NONE"
 $   THEN
 $!
 $!    Do not use TCPIP.
@@ -856,7 +1083,7 @@ $   ENDIF
 $!
 $!  Add TCP/IP type to CC definitions.
 $!
-$   CCDEFS = CCDEFS + ",TCPIP_TYPE_''P3'"
+$   CCDEFS = CCDEFS + ",TCPIP_TYPE_''P4'"
 $!
 $!  Print info
 $!
@@ -869,7 +1096,7 @@ $!
 $!  Tell The User We Don't Know What They Want.
 $!
 $   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT "The Option ",P3," Is Invalid.  The Valid Options Are:"
+$   WRITE SYS$OUTPUT "The Option ",P4," Is Invalid.  The Valid Options Are:"
 $   WRITE SYS$OUTPUT ""
 $   WRITE SYS$OUTPUT "    SOCKETSHR  :  To link with SOCKETSHR TCP/IP library."
 $   WRITE SYS$OUTPUT "    UCX        :  To link with UCX TCP/IP library."
@@ -900,7 +1127,7 @@ $ CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
 $!
 $! Show user the result
 $!
-$ WRITE/SYMBOL SYS$OUTPUT "Main Compiling Command: ",CC
+$ WRITE SYS$OUTPUT "Main Compiling Command: ",CC
 $!
 $! Special Threads For OpenVMS v7.1 Or Later
 $!
@@ -908,9 +1135,9 @@ $! Written By:  Richard Levitte
 $!              richard@levitte.org
 $!
 $!
-$! Check To See If We Have A Option For P4.
+$! Check To See If We Have A Option For P5.
 $!
-$ IF (P4.EQS."")
+$ IF (P5.EQS."")
 $ THEN
 $!
 $!  Get The Version Of VMS We Are Using.
@@ -932,15 +1159,15 @@ $!  End The VMS Version Check.
 $!
 $   ENDIF
 $!
-$! End The P4 Check.
+$! End The P5 Check.
 $!
 $ ENDIF
 $!
 $! Check if the user wanted to compile just a subset of all the programs.
 $!
-$ IF P5 .NES. ""
+$ IF P6 .NES. ""
 $ THEN
-$   PROGRAMS = P5
+$   PROGRAMS = P6
 $ ENDIF
 $!
 $!  Time To RETURN...
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -58,9 +58,9 @@

 #include <stdio.h>
 #include <string.h>
-#include "apps.h"
 #include <openssl/pem.h>
 #include <openssl/err.h>
+#include "apps.h"

 #undef PROG
 #define PROG nseq_main
@@ -102,7 +102,7 @@ int MAIN(int argc, char **argv)
 		BIO_printf (bio_err, "-in file  input file\n");
 		BIO_printf (bio_err, "-out file output file\n");
 		BIO_printf (bio_err, "-toseq    output NS Sequence file\n");
-		OPENSSL_EXIT(1);
+		EXIT(1);
 	}

 	if (infile) {
@@ -162,6 +162,6 @@ end:
 	BIO_free_all(out);
 	NETSCAPE_CERT_SEQUENCE_free(seq);

-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 }

--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -58,11 +58,11 @@

 #include <stdio.h>
 #include <string.h>
-#include "apps.h"
 #include <openssl/pem.h>
 #include <openssl/ocsp.h>
 #include <openssl/err.h>
 #include <openssl/ssl.h>
+#include "apps.h"

 /* Maximum leeway in validity period: default 5 minutes */
 #define MAX_VALIDITY_PERIOD	(5 * 60)
@@ -553,8 +553,8 @@ int MAIN(int argc, char **argv)
 		BIO_printf (bio_err, "-port num		 port to run responder on\n");
 		BIO_printf (bio_err, "-index file	 certificate status index file\n");
 		BIO_printf (bio_err, "-CA file		 CA certificate\n");
-		BIO_printf (bio_err, "-rsigner file	 responder certificate to sign responses with\n");
-		BIO_printf (bio_err, "-rkey file	 responder key to sign responses with\n");
+		BIO_printf (bio_err, "-rsigner file	 responder certificate to sign requests with\n");
+		BIO_printf (bio_err, "-rkey file	 responder key to sign requests with\n");
 		BIO_printf (bio_err, "-rother file	 other certificates to include in response\n");
 		BIO_printf (bio_err, "-resp_no_certs     don't include any certificates in response\n");
 		BIO_printf (bio_err, "-nmin n	 	 number of minutes before next update\n");
@@ -613,11 +613,11 @@ int MAIN(int argc, char **argv)
 			NULL, e, "CA certificate");
 		if (rcertfile)
 			{
-			rother = load_certs(bio_err, rcertfile, FORMAT_PEM,
+			rother = load_certs(bio_err, sign_certfile, FORMAT_PEM,
 				NULL, e, "responder other certificates");
-			if (!rother) goto end;
+			if (!sign_other) goto end;
 			}
-		rkey = load_key(bio_err, rkeyfile, FORMAT_PEM, 0, NULL, NULL,
+		rkey = load_key(bio_err, rkeyfile, FORMAT_PEM, NULL, NULL,
 			"responder private key");
 		if (!rkey)
 			goto end;
@@ -663,7 +663,7 @@ int MAIN(int argc, char **argv)
 				NULL, e, "signer certificates");
 			if (!sign_other) goto end;
 			}
-		key = load_key(bio_err, keyfile, FORMAT_PEM, 0, NULL, NULL,
+		key = load_key(bio_err, keyfile, FORMAT_PEM, NULL, NULL,
 			"signer private key");
 		if (!key)
 			goto end;
@@ -676,18 +676,6 @@ int MAIN(int argc, char **argv)

 	if (req_text && req) OCSP_REQUEST_print(out, req, 0);

-	if (reqout)
-		{
-		derbio = BIO_new_file(reqout, "wb");
-		if(!derbio)
-			{
-			BIO_printf(bio_err, "Error opening file %s\n", reqout);
-			goto end;
-			}
-		i2d_OCSP_REQUEST_bio(derbio, req);
-		BIO_free(derbio);
-		}
-
 	if (ridx_filename && (!rkey || !rsigner || !rca_cert))
 		{
 		BIO_printf(bio_err, "Need a responder certificate, key and CA for this operation!\n");
@@ -821,8 +809,6 @@ int MAIN(int argc, char **argv)

 	if (!store)
 		store = setup_verify(bio_err, CAfile, CApath);
-	if (!store)
-		goto end;
 	if (verify_certfile)
 		{
 		verify_other = load_certs(bio_err, verify_certfile, FORMAT_PEM,
@@ -899,7 +885,7 @@ end:
 		SSL_CTX_free(ctx);
 		}

-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 }

 static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert, X509 *issuer,
@@ -1120,10 +1106,7 @@ static char **lookup_serial(TXT_DB *db, ASN1_INTEGER *ser)
 	char *itmp, *row[DB_NUMBER],**rrow;
 	for (i = 0; i < DB_NUMBER; i++) row[i] = NULL;
 	bn = ASN1_INTEGER_to_BN(ser,NULL);
-	if (BN_is_zero(bn))
-		itmp = BUF_strdup("00");
-	else
-		itmp = BN_bn2hex(bn);
+	itmp = BN_bn2hex(bn);
 	row[DB_serial] = itmp;
 	BN_free(bn);
 	rrow=TXT_DB_get_by_index(db,DB_serial,row);
@@ -1179,7 +1162,7 @@ static int do_responder(OCSP_REQUEST **preq, BIO **pcbio, BIO *acbio, char *port

 	for(;;)
 		{
-		len = BIO_gets(cbio, inbuf, sizeof inbuf);
+		len = BIO_gets(cbio, inbuf, 1024);
 		if (len <= 0)
 			return 1;
 		/* Look for "POST" signalling start of query */
--- a/apps/openssl-vms.cnf
+++ b/apps/openssl-vms.cnf
@@ -3,8 +3,8 @@
 # This is mostly being used for generation of certificate requests.
 #

-RANDFILE		= $ENV::HOME/.rnd
-oid_file		= $ENV::HOME/.oid
+RANDFILE		= ${ENV::HOME}/.rnd
+oid_file		= ${ENV::HOME}/.oid
 oid_section		= new_oids

 # To use this configuration file with the "-extfile" option of the
@@ -29,17 +29,17 @@ default_ca	= CA_default		# The default ca section
 ####################################################################
 [ CA_default ]

-dir		= sys\$disk:[.demoCA	# Where everything is kept
-certs		= $dir.certs]		# Where the issued certs are kept
-crl_dir		= $dir.crl]		# Where the issued crl are kept
-database	= $dir]index.txt	# database index file.
-new_certs_dir	= $dir.newcerts]	# default place for new certs.
+dir		= ssl$root:[000000		# Where everything is kept
+certs		= ${dir}.certs]			# Where the issued certs are kept
+crl_dir		= ${dir}.certs]			# Where the issued crl are kept
+database	= ${dir}.private]index.txt	# database index file.
+new_certs_dir	= ${dir}.certs]			# default place for new certs.

-certificate	= $dir]cacert.pem 	# The CA certificate
-serial		= $dir]serial.		# The current serial number
-crl		= $dir]crl.pem 		# The current CRL
-private_key	= $dir.private]cakey.pem# The private key
-RANDFILE	= $dir.private].rand	# private random number file
+certificate	= ${dir}]cacert.pem		# The CA certificate
+serial		= ${dir}.private]serial.txt	# The current serial number
+crl		= ${dir}]crl.pem 		# The current CRL
+private_key	= ${dir}.private]cakey.pem	# The private key
+RANDFILE	= ${dir}.private].rand		# private random number file

 x509_extensions	= usr_cert		# The extentions to add to the cert

@@ -60,8 +60,8 @@ policy		= policy_match
 # For the CA policy
 [ policy_match ]
 countryName		= match
-stateOrProvinceName	= match
-organizationName	= match
+stateOrProvinceName	= supplied
+organizationName	= supplied
 organizationalUnitName	= optional
 commonName		= supplied
 emailAddress		= optional
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -114,7 +114,6 @@
 #include <string.h>
 #include <stdlib.h>
 #define OPENSSL_C /* tells apps.h to use complete apps_startup() */
-#include "apps.h"
 #include <openssl/bio.h>
 #include <openssl/crypto.h>
 #include <openssl/lhash.h>
@@ -124,6 +123,7 @@
 #include <openssl/ssl.h>
 #include <openssl/engine.h>
 #define USE_SOCKETS /* needed for the _O_BINARY defs in the MS world */
+#include "apps.h"
 #include "progs.h"
 #include "s_apps.h"
 #include <openssl/err.h>
@@ -138,12 +138,24 @@ static unsigned long MS_CALLBACK hash(const void *a_void);
 /* static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b); */
 static int MS_CALLBACK cmp(const void *a_void,const void *b_void);
 static LHASH *prog_init(void );
+
+#ifdef OPENSSL_SYS_VMS
+#if __INITIAL_POINTER_SIZE == 64
+#pragma __required_pointer_size __save
+#pragma __required_pointer_size 32
+#endif
+typedef char ** Argv_32;
+#if __INITIAL_POINTER_SIZE == 64
+#pragma __required_pointer_size __restore
+#endif
+#endif
+
 static int do_cmd(LHASH *prog,int argc,char *argv[]);
+CONF *config=NULL;
 char *default_config_file=NULL;

 /* Make sure there is only one when MONOLITH is defined */
 #ifdef MONOLITH
-CONF *config=NULL;
 BIO *bio_err=NULL;
 #endif

@@ -212,27 +224,34 @@ static void lock_dbg_cb(int mode, int type, const char *file, int line)
 	}


+#ifdef OPENSSL_SYS_VMS
+int main(int Argc, Argv_32 argv32)
+#else
 int main(int Argc, char *Argv[])
+#endif
 	{
 	ARGS arg;
 #define PROG_NAME_SIZE	39
 	char pname[PROG_NAME_SIZE+1];
 	FUNCTION f,*fp;
-	MS_STATIC char *prompt,buf[1024];
-	char *to_free=NULL;
+	MS_STATIC char *prompt,buf[1024],config_name[256];
 	int n,i,ret=0;
 	int argc;
 	char **argv,*p;
+
+#ifdef OPENSSL_SYS_VMS
+#if __INITIAL_POINTER_SIZE == 64
+	char **argv64;
+#endif
+#endif
+
 	LHASH *prog=NULL;
 	long errline;
+	int loop;  /* For checking if it's first round in the OpenSSL commandline loop */
 
 	arg.data=NULL;
 	arg.count=0;

-	if (bio_err == NULL)
-		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
-			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
-
 	if (getenv("OPENSSL_DEBUG_MEMORY") != NULL) /* if not defined, use compiled-in library defaults */
 		{
 		if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off")))
@@ -257,12 +276,23 @@ int main(int Argc, char *Argv[])

 	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);
+
 	/* Lets load up our environment a little */
 	p=getenv("OPENSSL_CONF");
 	if (p == NULL)
 		p=getenv("SSLEAY_CONF");
 	if (p == NULL)
-		p=to_free=make_config_name();
+		{
+		strcpy(config_name,X509_get_default_cert_area());
+#ifndef OPENSSL_SYS_VMS
+		strcat(config_name,"/");
+#endif
+		strcat(config_name,OPENSSL_CONF);
+		p=config_name;
+		}

 	default_config_file=p;

@@ -278,14 +308,23 @@ int main(int Argc, char *Argv[])
 	prog=prog_init();

 	/* first check the program name */
-	program_name(Argv[0],pname,sizeof pname);
+#ifdef OPENSSL_SYS_VMS
+	program_name(argv32[0],pname,PROG_NAME_SIZE);
+#else
+	program_name(Argv[0],pname,PROG_NAME_SIZE);
+#endif

 	f.name=pname;
 	fp=(FUNCTION *)lh_retrieve(prog,&f);
 	if (fp != NULL)
 		{
+#ifdef OPENSSL_SYS_VMS
+		argv32[0]=pname;
+		ret=fp->func(Argc,argv32);
+#else
 		Argv[0]=pname;
 		ret=fp->func(Argc,Argv);
+#endif
 		goto end;
 		}

@@ -294,26 +333,51 @@ int main(int Argc, char *Argv[])
 	if (Argc != 1)
 		{
 		Argc--;
+#ifdef OPENSSL_SYS_VMS
+		argv32++;
+ #if __INITIAL_POINTER_SIZE == 64
+		argv64=(char **)_malloc64(sizeof(char *)*Argc);  /* memory allocation in 64-bit address */
+
+        	for (i=0;i<Argc;i++)
+        	{
+                	argv64[i]=argv32[i];  /* copying 32-bit Argv to 64-bit argv*/
+        	}
+
+		ret=do_cmd(prog,Argc,argv64);
+		free(argv64);
+ #else
+		ret=do_cmd(prog,Argc,argv32);
+ #endif
+#else
 		Argv++;
 		ret=do_cmd(prog,Argc,Argv);
+#endif
+
 		if (ret < 0) ret=0;
 		goto end;
 		}

 	/* ok, lets enter the old 'OpenSSL>' mode */
-	
+	loop=0;
 	for (;;)
 		{
 		ret=0;
 		p=buf;
-		n=sizeof buf;
+		n=1024;
 		i=0;
 		for (;;)
 			{
 			p[0]='\0';
 			if (i++)
 				prompt=">";
-			else	prompt="OpenSSL> ";
+			else 
+			   if(loop == 0){  /* first round in this loop*/
+				prompt="OpenSSL> ";
+				loop++;
+			   }
+			   else 
+				prompt="\nOpenSSL> ";
+
 			fputs(prompt,stdout);
 			fflush(stdout);
 			fgets(p,n,stdin);
@@ -340,8 +404,6 @@ int main(int Argc, char *Argv[])
 	BIO_printf(bio_err,"bad exit\n");
 	ret=1;
 end:
-	if (to_free)
-		OPENSSL_free(to_free);
 	if (config != NULL)
 		{
 		NCONF_free(config);
@@ -358,13 +420,14 @@ end:
 		BIO_free(bio_err);
 		bio_err=NULL;
 		}
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 #define LIST_STANDARD_COMMANDS "list-standard-commands"
 #define LIST_MESSAGE_DIGEST_COMMANDS "list-message-digest-commands"
 #define LIST_CIPHER_COMMANDS "list-cipher-commands"

+
 static int do_cmd(LHASH *prog, int argc, char *argv[])
 	{
 	FUNCTION f,*fp;
--- a/apps/openssl.cnf
+++ b/apps/openssl.cnf
@@ -6,7 +6,15 @@
 # This definition stops the following lines choking if HOME isn't
 # defined.
 HOME			= .
-RANDFILE		= $ENV::HOME/.rnd
+
+#
+# From the instructions at http://www.free.lp.se/openssl/docs/openssl3.html#ss3.1,
+# change the value of RANDFILE.  Also moved definition of dir up since RANDFILE
+# depends on it.
+#
+#RANDFILE               = $ENV::HOME/.rnd
+dir             = SSLROOT:[000000       # Where everything is kept
+RANDFILE                = $dir.private]RANDFILE.;

 # Extra OBJECT IDENTIFIER info:
 #oid_file		= $ENV::HOME/.oid
@@ -33,8 +41,12 @@ default_ca	= CA_default		# The default ca section

 ####################################################################
 [ CA_default ]
-
-dir		= ./demoCA		# Where everything is kept
+#
+# From the instructions at http://www.free.lp.se/openssl/docs/openssl3.html#ss3.1,
+# change the value of dir.
+#
+#dir            = sys\$disk:[.demoCA    # Where everything is kept
+dir             = SSLROOT:[000000       # Where everything is kept
 certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
@@ -174,6 +186,11 @@ basicConstraints=CA:FALSE

 # and for everything including object signing:
 # nsCertType = client, email, objsign
+#
+# From the instructions at http://www.free.lp.se/openssl/docs/openssl3.html#ss3.1,
+# include server in the nsCertType.
+#
+nsCertType = client, email, objsign, server

 # This is typical in keyUsage for a client certificate.
 # keyUsage = nonRepudiation, digitalSignature, keyEncipherment
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -19,6 +19,7 @@
 # include <openssl/des.h>
 #endif
 #ifndef NO_MD5CRYPT_1
+# include <openssl/evp.h>
 # include <openssl/md5.h>
 #endif

@@ -292,7 +293,7 @@ err:
 	if (out)
 		BIO_free_all(out);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}


@@ -505,6 +506,6 @@ err:
 int MAIN(int argc, char **argv)
 	{
 	fputs("Program not available.\n", stderr)
-	OPENSSL_EXIT(1);
+	EXIT(1);
 	}
 #endif
--- a/apps/pkcs12.c
+++ b/apps/pkcs12.c
@@ -399,7 +399,7 @@ int MAIN(int argc, char **argv)
 #ifdef CRYPTO_MDEBUG
    CRYPTO_push_info("read MAC password");
 #endif
-	if(EVP_read_pw_string (macpass, sizeof macpass, "Enter MAC Password:", export_cert))
+	if(EVP_read_pw_string (macpass, 50, "Enter MAC Password:", export_cert))
 	{
    	    BIO_printf (bio_err, "Can't read Password\n");
    	    goto end;
@@ -427,7 +427,7 @@ int MAIN(int argc, char **argv)
 	CRYPTO_push_info("process -export_cert");
 	CRYPTO_push_info("reading private key");
 #endif
-	key = load_key(bio_err, keyname ? keyname : infile, FORMAT_PEM, 1,
+	key = load_key(bio_err, keyname ? keyname : infile, FORMAT_PEM,
 		passin, e, "private key");
 	if (!key) {
 		goto export_end;
@@ -508,10 +508,9 @@ int MAIN(int argc, char **argv)
 		    /* Exclude verified certificate */
 		    for (i = 1; i < sk_X509_num (chain2) ; i++) 
 			sk_X509_push(certs, sk_X509_value (chain2, i));
-		    /* Free first certificate */
-		    X509_free(sk_X509_value(chain2, 0));
-		    sk_X509_free(chain2);
-		} else {
+		}
+		sk_X509_free(chain2);
+		if (vret) {
 			BIO_printf (bio_err, "Error %s getting chain.\n",
 					X509_verify_cert_error_string(vret));
 			goto export_end;
@@ -538,6 +537,8 @@ int MAIN(int argc, char **argv)
 	}
 	sk_X509_pop_free(certs, X509_free);
 	certs = NULL;
+	/* ucert is part of certs so it is already freed */
+	ucert = NULL;

 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
@@ -545,7 +546,7 @@ int MAIN(int argc, char **argv)
 #endif

 	if(!noprompt &&
-		EVP_read_pw_string(pass, sizeof pass, "Enter Export Password:", 1)) {
+		EVP_read_pw_string(pass, 50, "Enter Export Password:", 1)) {
 	    BIO_printf (bio_err, "Can't read Password\n");
 	    goto export_end;
        }
@@ -626,6 +627,7 @@ int MAIN(int argc, char **argv)
 	if (certs) sk_X509_pop_free(certs, X509_free);
 	if (safes) sk_PKCS7_pop_free(safes, PKCS7_free);
 	if (bags) sk_PKCS12_SAFEBAG_pop_free(bags, PKCS12_SAFEBAG_free);
+	if (ucert) X509_free(ucert);

 #ifdef CRYPTO_MDEBUG
 	CRYPTO_pop_info();
@@ -642,7 +644,7 @@ int MAIN(int argc, char **argv)
 #ifdef CRYPTO_MDEBUG
    CRYPTO_push_info("read import password");
 #endif
-    if(!noprompt && EVP_read_pw_string(pass, sizeof pass, "Enter Import Password:", 0)) {
+    if(!noprompt && EVP_read_pw_string(pass, 50, "Enter Import Password:", 0)) {
 	BIO_printf (bio_err, "Can't read Password\n");
 	goto end;
    }
@@ -696,7 +698,7 @@ int MAIN(int argc, char **argv)
    if(passin) OPENSSL_free(passin);
    if(passout) OPENSSL_free(passout);
    apps_shutdown();
-    OPENSSL_EXIT(ret);
+    EXIT(ret);
 }

 int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -89,7 +89,7 @@ int MAIN(int argc, char **argv)
 	int informat,outformat;
 	char *infile,*outfile,*prog;
 	int print_certs=0,text=0,noout=0;
-	int ret=1;
+	int ret=0;
 	char *engine=NULL;

 	apps_startup();
@@ -301,5 +301,5 @@ end:
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
--- a/apps/pkcs8.c
+++ b/apps/pkcs8.c
@@ -63,6 +63,7 @@
 #include <openssl/evp.h>
 #include <openssl/pkcs12.h>

+#include "apps.h"
 #define PROG pkcs8_main

 int MAIN(int, char **);
@@ -221,8 +222,7 @@ int MAIN(int argc, char **argv)
 	if (topk8)
 		{
 		BIO_free(in); /* Not needed in this section */
-		pkey = load_key(bio_err, infile, informat, 1,
-			passin, e, "key");
+		pkey = load_key(bio_err, infile, informat, passin, e, "key");
 		if (!pkey) {
 			return (1);
 		}
@@ -244,8 +244,7 @@ int MAIN(int argc, char **argv)
 			if(passout) p8pass = passout;
 			else {
 				p8pass = pass;
-				if (EVP_read_pw_string(pass, sizeof pass, "Enter Encryption Password:", 1))
-					return (1);
+				EVP_read_pw_string(pass, 50, "Enter Encryption Password:", 1);
 			}
 			app_RAND_load_file(NULL, bio_err, 0);
 			if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
@@ -302,7 +301,7 @@ int MAIN(int argc, char **argv)
 		if(passin) p8pass = passin;
 		else {
 			p8pass = pass;
-			EVP_read_pw_string(pass, sizeof pass, "Enter Password:", 0);
+			EVP_read_pw_string(pass, 50, "Enter Password:", 0);
 		}
 		p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
 		X509_SIG_free(p8);
--- a/apps/progs.h
+++ b/apps/progs.h
@@ -17,6 +17,8 @@ extern int rsa_main(int argc,char *argv[]);
 extern int rsautl_main(int argc,char *argv[]);
 extern int dsa_main(int argc,char *argv[]);
 extern int dsaparam_main(int argc,char *argv[]);
+extern int ecdsa_main(int argc,char *argv[]);
+extern int ecdsaparam_main(int argc,char *argv[]);
 extern int x509_main(int argc,char *argv[]);
 extern int genrsa_main(int argc,char *argv[]);
 extern int gendsa_main(int argc,char *argv[]);
@@ -78,6 +80,12 @@ FUNCTION functions[] = {
 #endif
 #ifndef OPENSSL_NO_DSA
 	{FUNC_TYPE_GENERAL,"dsaparam",dsaparam_main},
+#endif
+#ifndef OPENSSL_NO_ECDSA
+	{FUNC_TYPE_GENERAL,"ecdsa",ecdsa_main},
+#endif
+#ifndef OPENSSL_NO_ECDSA
+	{FUNC_TYPE_GENERAL,"ecdsaparam",ecdsaparam_main},
 #endif
 	{FUNC_TYPE_GENERAL,"x509",x509_main},
 #ifndef OPENSSL_NO_RSA
--- a/apps/progs.pl
+++ b/apps/progs.pl
@@ -33,6 +33,8 @@ foreach (@ARGV)
 		{ print "#ifndef OPENSSL_NO_RSA\n${str}#endif\n";  }
 	elsif ( ($_ =~ /^dsa$/) || ($_ =~ /^gendsa$/) || ($_ =~ /^dsaparam$/))
 		{ print "#ifndef OPENSSL_NO_DSA\n${str}#endif\n"; }
+	elsif ( ($_ =~ /^ecdsa$/) || ($_ =~ /^ecdsaparam$/))
+		{ print "#ifndef OPENSSL_NO_ECDSA\n${str}#endif\n";}
 	elsif ( ($_ =~ /^dh$/) || ($_ =~ /^gendh$/) || ($_ =~ /^dhparam$/))
 		{ print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^pkcs12$/))
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -213,5 +213,5 @@ err:
 	if (out)
 		BIO_free_all(out);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
--- a/apps/req.c
+++ b/apps/req.c
@@ -73,7 +73,6 @@
 #include <openssl/x509v3.h>
 #include <openssl/objects.h>
 #include <openssl/pem.h>
-#include "../crypto/cryptlib.h"

 #define SECTION		"req"

@@ -135,6 +134,7 @@ static int req_check_len(int len,int n_min,int n_max);
 static int check_end(char *str, char *end);
 #ifndef MONOLITH
 static char *default_config_file=NULL;
+static CONF *config=NULL;
 #endif
 static CONF *req_conf=NULL;
 static int batch=0;
@@ -142,6 +142,7 @@ static int batch=0;
 #define TYPE_RSA	1
 #define TYPE_DSA	2
 #define TYPE_DH		3
+#define TYPE_ECDSA	4

 int MAIN(int, char **);

@@ -151,7 +152,10 @@ int MAIN(int argc, char **argv)
 #ifndef OPENSSL_NO_DSA
 	DSA *dsa_params=NULL;
 #endif
-	unsigned long nmflag = 0, reqflag = 0;
+#ifndef OPENSSL_NO_ECDSA
+	ECDSA *ecdsa_params = NULL;
+#endif
+	unsigned long nmflag = 0;
 	int ex=1,x509=0,days=30;
 	X509 *x509ss=NULL;
 	X509_REQ *req=NULL;
@@ -176,7 +180,7 @@ int MAIN(int argc, char **argv)
 	const EVP_MD *md_alg=NULL,*digest=EVP_md5();
 	unsigned long chtype = MBSTRING_ASC;
 #ifndef MONOLITH
-	char *to_free;
+	MS_STATIC char config_name[256];
 	long errline;
 #endif

@@ -318,11 +322,63 @@ int MAIN(int argc, char **argv)
 						}
 					}
 				BIO_free(in);
-				newkey=BN_num_bits(dsa_params->p);
 				in=NULL;
+				newkey=BN_num_bits(dsa_params->p);
 				}
 			else 
 #endif
+#ifndef OPENSSL_NO_ECDSA
+				if (strncmp("ecdsa:",p,4) == 0)
+				{
+				X509 *xtmp=NULL;
+				EVP_PKEY *dtmp;
+
+				pkey_type=TYPE_ECDSA;
+				p+=6;
+				if ((in=BIO_new_file(p,"r")) == NULL)
+					{
+					perror(p);
+					goto end;
+					}
+				if ((ecdsa_params = PEM_read_bio_ECDSAParameters(in, NULL, NULL, NULL)) == NULL)
+					{
+					ERR_clear_error();
+					(void)BIO_reset(in);
+					if ((xtmp=PEM_read_bio_X509(in,NULL,NULL,NULL)) == NULL)
+						{	
+						BIO_printf(bio_err,"unable to load ECDSA parameters from file\n");
+						goto end;
+						}
+
+					if ((dtmp=X509_get_pubkey(xtmp)) == NULL) goto end;
+					if (dtmp->type == EVP_PKEY_ECDSA)
+						ecdsa_params = ECDSAParameters_dup(dtmp->pkey.ecdsa);
+					EVP_PKEY_free(dtmp);
+					X509_free(xtmp);
+					if (ecdsa_params == NULL)
+						{
+						BIO_printf(bio_err,"Certificate does not contain ECDSA parameters\n");
+						goto end;
+						}
+					}
+
+				BIO_free(in);
+				in=NULL;
+				
+				{
+				BIGNUM *order = BN_new();
+				
+				if (!order)
+					goto end;
+				if (!EC_GROUP_get_order(ecdsa_params->group, order, NULL))
+					goto end;
+				newkey = BN_num_bits(order);
+				BN_free(order);
+				}
+
+				}
+			else
+#endif
 #ifndef OPENSSL_NO_DH
 				if (strncmp("dh:",p,4) == 0)
 				{
@@ -356,11 +412,6 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
 			}
-		else if (strcmp(*argv,"-reqopt") == 0)
-			{
-			if (--argc < 1) goto bad;
-			if (!set_cert_ex(&reqflag, *(++argv))) goto bad;
-			}
 		else if (strcmp(*argv,"-subject") == 0)
 			subject=1;
 		else if (strcmp(*argv,"-text") == 0)
@@ -439,6 +490,7 @@ bad:
 		BIO_printf(bio_err,"                the random number generator\n");
 		BIO_printf(bio_err," -newkey rsa:bits generate a new RSA key of 'bits' in size\n");
 		BIO_printf(bio_err," -newkey dsa:file generate a new DSA key, parameters taken from CA in 'file'\n");
+		BIO_printf(bio_err," -newkey ecdsa:file generate a new ECDSA key, parameters taken from CA in 'file'\n");
 		BIO_printf(bio_err," -[digest]      Digest to sign with (md5, sha1, md2, mdc2, md4)\n");
 		BIO_printf(bio_err," -config file   request template file.\n");
 		BIO_printf(bio_err," -subj arg      set or modify request subject\n");
@@ -453,8 +505,7 @@ bad:
 		BIO_printf(bio_err," -extensions .. specify certificate extension section (override value in config file)\n");
 		BIO_printf(bio_err," -reqexts ..    specify request extension section (override value in config file)\n");
 		BIO_printf(bio_err," -utf8          input characters are UTF8 (default ASCII)\n");
-		BIO_printf(bio_err," -nameopt arg   - various certificate name options\n");
-		BIO_printf(bio_err," -reqopt arg    - various request text options\n\n");
+		BIO_printf(bio_err," -nameopt arg    - various certificate name options\n");
 		goto end;
 		}

@@ -470,7 +521,14 @@ bad:
 	if (p == NULL)
 		p=getenv("SSLEAY_CONF");
 	if (p == NULL)
-		p=to_free=make_config_name();
+		{
+		strcpy(config_name,X509_get_default_cert_area());
+#ifndef OPENSSL_SYS_VMS
+		strcat(config_name,"/");
+#endif
+		strcat(config_name,OPENSSL_CONF);
+		p=config_name;
+		}
 	default_config_file=p;
 	config=NCONF_new(NULL);
 	i=NCONF_load(config, p, &errline);
@@ -478,7 +536,7 @@ bad:

 	if (template != NULL)
 		{
-		long errline = -1;
+		long errline;

 		if( verbose )
 			BIO_printf(bio_err,"Using configuration from %s\n",template);
@@ -621,7 +679,7 @@ bad:

 	if (keyfile != NULL)
 		{
-		pkey = load_key(bio_err, keyfile, keyform, 0, passin, e,
+		pkey = load_key(bio_err, keyfile, keyform, passin, e,
 			"Private Key");
 		if (!pkey)
 			{
@@ -629,7 +687,7 @@ bad:
 			   message */
 			goto end;
 			}
-		if (EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA)
+		if (EVP_PKEY_type(pkey->type) == EVP_PKEY_DSA || EVP_PKEY_type(pkey->type) == EVP_PKEY_ECDSA)
 			{
 			char *randfile = NCONF_get_string(req_conf,SECTION,"RANDFILE");
 			if (randfile == NULL)
@@ -653,14 +711,15 @@ bad:
 				newkey=DEFAULT_KEY_LENGTH;
 			}

-		if (newkey < MIN_KEY_LENGTH)
+		if (newkey < MIN_KEY_LENGTH && (pkey_type == TYPE_RSA || pkey_type == TYPE_DSA))
+		/* TODO: appropriate minimal keylength for the different algorithm (esp. ECDSA) */
 			{
 			BIO_printf(bio_err,"private key length is too short,\n");
 			BIO_printf(bio_err,"it needs to be at least %d bits, not %d\n",MIN_KEY_LENGTH,newkey);
 			goto end;
 			}
 		BIO_printf(bio_err,"Generating a %d bit %s private key\n",
-			newkey,(pkey_type == TYPE_RSA)?"RSA":"DSA");
+			newkey,(pkey_type == TYPE_RSA)?"RSA":(pkey_type == TYPE_DSA)?"DSA":"ECDSA");

 		if ((pkey=EVP_PKEY_new()) == NULL) goto end;

@@ -682,6 +741,14 @@ bad:
 			dsa_params=NULL;
 			}
 #endif
+#ifndef OPENSSL_NO_ECDSA
+			if (pkey_type == TYPE_ECDSA)
+			{
+			if (!ECDSA_generate_key(ecdsa_params)) goto end;
+			if (!EVP_PKEY_assign_ECDSA(pkey, ecdsa_params)) goto end;
+			ecdsa_params = NULL;
+			}
+#endif

 		app_RAND_write_file(randfile, bio_err);

@@ -787,6 +854,10 @@ loop:
 #ifndef OPENSSL_NO_DSA
 		if (pkey->type == EVP_PKEY_DSA)
 			digest=EVP_dss1();
+#endif
+#ifndef OPENSSL_NO_ECDSA
+		if (pkey->type == EVP_PKEY_ECDSA)
+			digest=EVP_ecdsa();
 #endif
 		if (req == NULL)
 			{
@@ -980,9 +1051,9 @@ loop:
 	if (text)
 		{
 		if (x509)
-			X509_print_ex(out, x509ss, nmflag, reqflag);
+			X509_print(out,x509ss);
 		else	
-			X509_REQ_print_ex(out, req, nmflag, reqflag);
+			X509_REQ_print(out,req);
 		}

 	if(subject) 
@@ -1052,10 +1123,6 @@ loop:
 		}
 	ex=0;
 end:
-#ifndef MONOLITH
-	if(to_free)
-		OPENSSL_free(to_free);
-#endif
 	if (ex)
 		{
 		ERR_print_errors(bio_err);
@@ -1072,9 +1139,12 @@ end:
 	OBJ_cleanup();
 #ifndef OPENSSL_NO_DSA
 	if (dsa_params != NULL) DSA_free(dsa_params);
+#endif
+#ifndef OPENSSL_NO_ECDSA
+	if (ecdsa_params != NULL) ECDSA_free(ecdsa_params);
 #endif
 	apps_shutdown();
-	OPENSSL_EXIT(ex);
+	EXIT(ex);
 	}

 static int make_REQ(X509_REQ *req, EVP_PKEY *pkey, char *subj, int attribs,
@@ -1215,19 +1285,13 @@ start:		for (;;)
 				}
 			/* If OBJ not recognised ignore it */
 			if ((nid=OBJ_txt2nid(type)) == NID_undef) goto start;
-
-			if(strlen(v->name) > sizeof buf-9)
-			   {
-			   BIO_printf(bio_err,"Name '%s' too long\n",v->name);
-			   return 0;
-			   }
-
 			sprintf(buf,"%s_default",v->name);
 			if ((def=NCONF_get_string(req_conf,dn_sect,buf)) == NULL)
 				{
 				ERR_clear_error();
 				def="";
 				}
+				
 			sprintf(buf,"%s_value",v->name);
 			if ((value=NCONF_get_string(req_conf,dn_sect,buf)) == NULL)
 				{
@@ -1274,12 +1338,6 @@ start2:			for (;;)
 				if ((nid=OBJ_txt2nid(type)) == NID_undef)
 					goto start2;

-				if(strlen(v->name) > sizeof buf-9)
-				   {
-				   BIO_printf(bio_err,"Name '%s' too long\n",v->name);
-				   return 0;
-				   }
-
 				sprintf(buf,"%s_default",type);
 				if ((def=NCONF_get_string(req_conf,attr_sect,buf))
 					== NULL)
@@ -1383,7 +1441,6 @@ start:
 	(void)BIO_flush(bio_err);
 	if(value != NULL)
 		{
-		OPENSSL_assert(strlen(value) < sizeof buf-2);
 		strcpy(buf,value);
 		strcat(buf,"\n");
 		BIO_printf(bio_err,"%s\n",value);
@@ -1393,7 +1450,7 @@ start:
 		buf[0]='\0';
 		if (!batch)
 			{
-			fgets(buf,sizeof buf,stdin);
+			fgets(buf,1024,stdin);
 			}
 		else
 			{
@@ -1442,7 +1499,6 @@ start:
 	(void)BIO_flush(bio_err);
 	if (value != NULL)
 		{
-		OPENSSL_assert(strlen(value) < sizeof buf-2);
 		strcpy(buf,value);
 		strcat(buf,"\n");
 		BIO_printf(bio_err,"%s\n",value);
@@ -1452,7 +1508,7 @@ start:
 		buf[0]='\0';
 		if (!batch)
 			{
-			fgets(buf,sizeof buf,stdin);
+			fgets(buf,1024,stdin);
 			}
 		else
 			{
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -238,12 +238,12 @@ bad:
 		if (pubin)
 			pkey = load_pubkey(bio_err, infile,
 				(informat == FORMAT_NETSCAPE && sgckey ?
-					FORMAT_IISSGC : informat), 1,
+					FORMAT_IISSGC : informat),
 				passin, e, "Public Key");
 		else
 			pkey = load_key(bio_err, infile,
 				(informat == FORMAT_NETSCAPE && sgckey ?
-					FORMAT_IISSGC : informat), 1,
+					FORMAT_IISSGC : informat),
 				passin, e, "Private Key");

 		if (pkey != NULL)
@@ -369,7 +369,7 @@ end:
 	if(passin) OPENSSL_free(passin);
 	if(passout) OPENSSL_free(passout);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
 #else /* !OPENSSL_NO_RSA */

--- a/apps/rsautl.c
+++ b/apps/rsautl.c
@@ -169,12 +169,12 @@ int MAIN(int argc, char **argv)
 	
 	switch(key_type) {
 		case KEY_PRIVKEY:
-		pkey = load_key(bio_err, keyfile, keyform, 0,
+		pkey = load_key(bio_err, keyfile, keyform,
 			NULL, e, "Private Key");
 		break;

 		case KEY_PUBKEY:
-		pkey = load_pubkey(bio_err, keyfile, keyform, 0,
+		pkey = load_pubkey(bio_err, keyfile, keyform,
 			NULL, e, "Public Key");
 		break;

--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -134,7 +134,7 @@ int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
 	err=	X509_STORE_CTX_get_error(ctx);
 	depth=	X509_STORE_CTX_get_error_depth(ctx);

-	X509_NAME_oneline(X509_get_subject_name(err_cert),buf,sizeof buf);
+	X509_NAME_oneline(X509_get_subject_name(err_cert),buf,256);
 	BIO_printf(bio_err,"depth=%d %s\n",depth,buf);
 	if (!ok)
 		{
@@ -154,7 +154,7 @@ int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx)
 	switch (ctx->error)
 		{
 	case X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT:
-		X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert),buf,sizeof buf);
+		X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert),buf,256);
 		BIO_printf(bio_err,"issuer= %s\n",buf);
 		break;
 	case X509_V_ERR_CERT_NOT_YET_VALID:
@@ -239,16 +239,18 @@ long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp, int argi,

 	if (cmd == (BIO_CB_READ|BIO_CB_RETURN))
 		{
-		BIO_printf(out,"read from %08X [%08lX] (%d bytes => %ld (0x%X))\n",
+		BIO_printf(out,"read from %08X [%08lX] (%d bytes => %ld (0x%X))\n\n",
 			bio,argp,argi,ret,ret);
 		BIO_dump(out,argp,(int)ret);
+		BIO_printf(out,"\n");
 		return(ret);
 		}
 	else if (cmd == (BIO_CB_WRITE|BIO_CB_RETURN))
 		{
-		BIO_printf(out,"write to %08X [%08lX] (%d bytes => %ld (0x%X))\n",
+		BIO_printf(out,"write to %08X [%08lX] (%d bytes => %ld (0x%X))\n\n",
 			bio,argp,argi,ret,ret);
 		BIO_dump(out,argp,(int)ret);
+		BIO_printf(out,"\n");
 		}
 	return(ret);
 	}
@@ -266,7 +268,7 @@ void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret)

 	if (where & SSL_CB_LOOP)
 		{
-		BIO_printf(bio_err,"%s:%s\n",str,SSL_state_string_long(s));
+		BIO_printf(bio_err,"%s:%s\n\n",str,SSL_state_string_long(s));
 		}
 	else if (where & SSL_CB_ALERT)
 		{
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -140,15 +140,11 @@ typedef unsigned int u_int;
 #include <conio.h>
 #endif

-#ifdef OPENSSL_SYS_WINCE
-/* Windows CE incorrectly defines fileno as returning void*, so to avoid problems below... */
-#ifdef fileno
-#undef fileno
-#endif
-#define fileno(a) (int)_fileno(a)
-#endif
-

+#ifdef OPENSSL_SYS_VMS
+#include "term_sock.h"
+#endif
+      
 #if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
 /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
@@ -259,6 +255,10 @@ int MAIN(int argc, char **argv)
 #ifdef OPENSSL_SYS_WINDOWS
 	struct timeval tv;
 #endif
+#ifdef OPENSSL_SYS_VMS
+        int stdin_sock;
+        TerminalSocket (TERM_SOCK_CREATE, &stdin_sock);
+#endif

 #if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
 	meth=SSLv23_client_method();
@@ -441,18 +441,13 @@ bad:
 		goto end;
 		}

-	OpenSSL_add_ssl_algorithms();
-	SSL_load_error_strings();
-
-        e = setup_engine(bio_err, engine_id, 1);
-
 	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
 		&& !RAND_status())
 		{
-		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
+		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n\n");
 		}
 	if (inrand != NULL)
-		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+		BIO_printf(bio_err,"%ld semi-random bytes loaded\n\n",
 			app_RAND_load_files(inrand));

 	if (bio_c_out == NULL)
@@ -468,6 +463,11 @@ bad:
 			}
 		}

+	OpenSSL_add_ssl_algorithms();
+	SSL_load_error_strings();
+
+        e = setup_engine(bio_err, engine_id, 1);
+
 	ctx=SSL_CTX_new(meth);
 	if (ctx == NULL)
 		{
@@ -524,7 +524,7 @@ re_start:
 		SHUTDOWN(s);
 		goto end;
 		}
-	BIO_printf(bio_c_out,"CONNECTED(%08X)\n",s);
+	BIO_printf(bio_c_out,"CONNECTED(%08X)\n\n",s);

 #ifdef FIONBIO
 	if (c_nbio)
@@ -565,6 +565,11 @@ re_start:
 	SSL_set_connect_state(con);

 	/* ok, lets connect */
+#ifdef OPENSSL_SYS_VMS
+        if (stdin_sock > SSL_get_fd(con))
+            width=stdin_sock+1;
+        else
+#endif
 	width=SSL_get_fd(con)+1;

 	read_tty=1;
@@ -631,8 +636,12 @@ re_start:
 #ifndef OPENSSL_SYS_WINDOWS
 			if (tty_on)
 				{
-				if (read_tty)  FD_SET(fileno(stdin),&readfds);
-				if (write_tty) FD_SET(fileno(stdout),&writefds);
+#ifdef OPENSSL_SYS_VMS
+                                if (read_tty)  FD_SET(stdin_sock,&readfds);
+#else
+                                if (read_tty)  FD_SET(fileno(stdin),&readfds);
+                                if (write_tty) FD_SET(fileno(stdout),&writefds);
+#endif
 				}
 			if (read_ssl)
 				FD_SET(SSL_get_fd(con),&readfds);
@@ -670,11 +679,7 @@ re_start:
 					tv.tv_usec = 0;
 					i=select(width,(void *)&readfds,(void *)&writefds,
 						 NULL,&tv);
-#ifdef OPENSSL_SYS_WINCE
-					if(!i && (!_kbhit() || !read_tty) ) continue;
-#else
 					if(!i && (!((_kbhit()) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0))) || !read_tty) ) continue;
-#endif
 				} else 	i=select(width,(void *)&readfds,(void *)&writefds,
 					 NULL,NULL);
 			}
@@ -758,8 +763,8 @@ re_start:
 				goto shut;
 				}
 			}
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_MSDOS)
-		/* Assume Windows/DOS can always write */
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS)
+		/* Assume Windows can always write */
 		else if (!ssl_pending && write_tty)
 #else
 		else if (!ssl_pending && FD_ISSET(fileno(stdout),&writefds))
@@ -817,7 +822,7 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
 				read_tty=0;
 				break;
 			case SSL_ERROR_WANT_READ:
-				BIO_printf(bio_c_out,"read R BLOCK\n");
+				BIO_printf(bio_c_out,"read R BLOCK\n\n");
 				write_tty=0;
 				read_ssl=1;
 				if ((read_tty == 0) && (write_ssl == 0))
@@ -840,20 +845,24 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
 			}

 #ifdef OPENSSL_SYS_WINDOWS
-#ifdef OPENSSL_SYS_WINCE
-		else if (_kbhit())
-#else
 		else if ((_kbhit()) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
-#endif
 #else
-		else if (FD_ISSET(fileno(stdin),&readfds))
+#ifdef OPENSSL_SYS_VMS
+                else if (FD_ISSET(stdin_sock,&readfds))
+#else
+                else if (FD_ISSET(fileno(stdin),&readfds))
+#endif
 #endif
 			{
 			if (crlf)
 				{
 				int j, lf_num;

-				i=read(fileno(stdin),cbuf,BUFSIZZ/2);
+#ifdef OPENSSL_SYS_VMS
+                                i=recv(stdin_sock,cbuf,BUFSIZZ/2,0);
+#else
+                                i=read(fileno(stdin),cbuf,BUFSIZZ/2);
+#endif
 				lf_num = 0;
 				/* both loops are skipped when i <= 0 */
 				for (j = 0; j < i; j++)
@@ -872,7 +881,11 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
 				assert(lf_num == 0);
 				}
 			else
-				i=read(fileno(stdin),cbuf,BUFSIZZ);
+#ifdef OPENSSL_SYS_VMS
+                                i=recv(stdin_sock,cbuf,BUFSIZZ,0);
+#else
+                                i=read(fileno(stdin),cbuf,BUFSIZZ);
+#endif

 			if ((!c_ign_eof) && ((i <= 0) || (cbuf[0] == 'Q')))
 				{
@@ -908,16 +921,19 @@ end:
 	if (con != NULL) SSL_free(con);
 	if (con2 != NULL) SSL_free(con2);
 	if (ctx != NULL) SSL_CTX_free(ctx);
-	if (cbuf != NULL) { OPENSSL_cleanse(cbuf,BUFSIZZ); OPENSSL_free(cbuf); }
-	if (sbuf != NULL) { OPENSSL_cleanse(sbuf,BUFSIZZ); OPENSSL_free(sbuf); }
-	if (mbuf != NULL) { OPENSSL_cleanse(mbuf,BUFSIZZ); OPENSSL_free(mbuf); }
+	if (cbuf != NULL) { memset(cbuf,0,BUFSIZZ); OPENSSL_free(cbuf); }
+	if (sbuf != NULL) { memset(sbuf,0,BUFSIZZ); OPENSSL_free(sbuf); }
+	if (mbuf != NULL) { memset(mbuf,0,BUFSIZZ); OPENSSL_free(mbuf); }
 	if (bio_c_out != NULL)
 		{
 		BIO_free(bio_c_out);
 		bio_c_out=NULL;
 		}
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+#ifdef OPENSSL_SYS_VMS
+        TerminalSocket (TERM_SOCK_DELETE, &stdin_sock);
+#endif
+	EXIT(ret);
 	}


@@ -946,11 +962,11 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 			for (i=0; i<sk_X509_num(sk); i++)
 				{
 				X509_NAME_oneline(X509_get_subject_name(
-					sk_X509_value(sk,i)),buf,sizeof buf);
+					sk_X509_value(sk,i)),buf,BUFSIZ);
 				BIO_printf(bio,"%2d s:%s\n",i,buf);
 				X509_NAME_oneline(X509_get_issuer_name(
-					sk_X509_value(sk,i)),buf,sizeof buf);
-				BIO_printf(bio,"   i:%s\n",buf);
+					sk_X509_value(sk,i)),buf,BUFSIZ);
+				BIO_printf(bio,"   i:%s\n\n",buf);
 				if (c_showcerts)
 					PEM_write_bio_X509(bio,sk_X509_value(sk,i));
 				}
@@ -964,10 +980,10 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 			if (!(c_showcerts && got_a_chain)) /* Redundant if we showed the whole chain */
 				PEM_write_bio_X509(bio,peer);
 			X509_NAME_oneline(X509_get_subject_name(peer),
-				buf,sizeof buf);
+				buf,BUFSIZ);
 			BIO_printf(bio,"subject=%s\n",buf);
 			X509_NAME_oneline(X509_get_issuer_name(peer),
-				buf,sizeof buf);
+				buf,BUFSIZ);
 			BIO_printf(bio,"issuer=%s\n",buf);
 			}
 		else
@@ -989,7 +1005,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 			{
 			BIO_printf(bio,"---\nNo client certificate CA names sent\n");
 			}
-		p=SSL_get_shared_ciphers(s,buf,sizeof buf);
+		p=SSL_get_shared_ciphers(s,buf,BUFSIZ);
 		if (p != NULL)
 			{
 			/* This works only for SSL 2.  In later protocol
@@ -1024,7 +1040,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 		}
 	BIO_printf(bio,((s->hit)?"---\nReused, ":"---\nNew, "));
 	c=SSL_get_current_cipher(s);
-	BIO_printf(bio,"%s, Cipher is %s\n",
+	BIO_printf(bio,"%s, Cipher is %s\n\n",
 		SSL_CIPHER_get_version(c),
 		SSL_CIPHER_get_name(c));
 	if (peer != NULL) {
@@ -1035,7 +1051,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 		EVP_PKEY_free(pktmp);
 	}
 	SSL_SESSION_print(bio,SSL_get_session(s));
-	BIO_printf(bio,"---\n");
+	BIO_printf(bio,"---\n\n");
 	if (peer != NULL)
 		X509_free(peer);
 	/* flush, or debugging output gets mixed with http response */
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -144,14 +144,10 @@ typedef unsigned int u_int;
 #include <conio.h>
 #endif

-#ifdef OPENSSL_SYS_WINCE
-/* Windows CE incorrectly defines fileno as returning void*, so to avoid problems below... */
-#ifdef fileno
-#undef fileno
+#ifdef OPENSSL_SYS_VMS
+#include "term_sock.h"
 #endif
-#define fileno(a) (int)_fileno(a)
-#endif
-
+       
 #if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
 /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
@@ -328,10 +324,10 @@ static char **local_argv;
 static int ebcdic_new(BIO *bi);
 static int ebcdic_free(BIO *a);
 static int ebcdic_read(BIO *b, char *out, int outl);
-static int ebcdic_write(BIO *b, const char *in, int inl);
-static long ebcdic_ctrl(BIO *b, int cmd, long num, void *ptr);
+static int ebcdic_write(BIO *b, char *in, int inl);
+static long ebcdic_ctrl(BIO *b, int cmd, long num, char *ptr);
 static int ebcdic_gets(BIO *bp, char *buf, int size);
-static int ebcdic_puts(BIO *bp, const char *str);
+static int ebcdic_puts(BIO *bp, char *str);

 #define BIO_TYPE_EBCDIC_FILTER	(18|0x0200)
 static BIO_METHOD methods_ebcdic=
@@ -396,7 +392,7 @@ static int ebcdic_read(BIO *b, char *out, int outl)
 	return(ret);
 }

-static int ebcdic_write(BIO *b, const char *in, int inl)
+static int ebcdic_write(BIO *b, char *in, int inl)
 {
 	EBCDIC_OUTBUFF *wbuf;
 	int ret=0;
@@ -429,7 +425,7 @@ static int ebcdic_write(BIO *b, const char *in, int inl)
 	return(ret);
 }

-static long ebcdic_ctrl(BIO *b, int cmd, long num, void *ptr)
+static long ebcdic_ctrl(BIO *b, int cmd, long num, char *ptr)
 {
 	long ret;

@@ -448,7 +444,7 @@ static long ebcdic_ctrl(BIO *b, int cmd, long num, void *ptr)

 static int ebcdic_gets(BIO *bp, char *buf, int size)
 {
-	int i, ret=0;
+	int i, ret;
 	if (bp->next_bio == NULL) return(0);
 /*	return(BIO_gets(bp->next_bio,buf,size));*/
 	for (i=0; i<size-1; ++i)
@@ -467,7 +463,7 @@ static int ebcdic_gets(BIO *bp, char *buf, int size)
 	return (ret < 0 && i == 0) ? ret : i;
 }

-static int ebcdic_puts(BIO *bp, const char *str)
+static int ebcdic_puts(BIO *bp, char *str)
 {
 	if (bp->next_bio == NULL) return(0);
 	return ebcdic_write(bp, str, strlen(str));
@@ -691,11 +687,6 @@ bad:
 		goto end;
 		}

-	SSL_load_error_strings();
-	OpenSSL_add_ssl_algorithms();
-
-        e = setup_engine(bio_err, engine_id, 1);
-
 	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
 		&& !RAND_status())
 		{
@@ -718,7 +709,7 @@ bad:
 			}
 		}

-#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA)
+#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA)
 	if (nocert)
 #endif
 		{
@@ -728,6 +719,11 @@ bad:
 		s_dkey_file=NULL;
 		}

+	SSL_load_error_strings();
+	OpenSSL_add_ssl_algorithms();
+
+        e = setup_engine(bio_err, engine_id, 1);
+
 	ctx=SSL_CTX_new(meth);
 	if (ctx == NULL)
 		{
@@ -835,7 +831,7 @@ bad:
 			goto end;
 			}
 		RSA_free(rsa);
-		BIO_printf(bio_s_out,"\n");
+		BIO_printf(bio_s_out,"\n\n");
 		}
 #endif
 #endif
@@ -868,7 +864,7 @@ end:
 		bio_s_out=NULL;
 		}
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 static void print_stats(BIO *bio, SSL_CTX *ssl_ctx)
@@ -891,7 +887,7 @@ static void print_stats(BIO *bio, SSL_CTX *ssl_ctx)
 	BIO_printf(bio,"%4d session cache misses\n",SSL_CTX_sess_misses(ssl_ctx));
 	BIO_printf(bio,"%4d session cache timeouts\n",SSL_CTX_sess_timeouts(ssl_ctx));
 	BIO_printf(bio,"%4d callback cache hits\n",SSL_CTX_sess_cb_hits(ssl_ctx));
-	BIO_printf(bio,"%4d cache full overflows (%d allowed)\n",
+	BIO_printf(bio,"%4d cache full overflows (%d allowed)\n\n",
 		SSL_CTX_sess_cache_full(ssl_ctx),
 		SSL_CTX_sess_get_cache_size(ssl_ctx));
 	}
@@ -908,7 +904,12 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 #ifdef OPENSSL_SYS_WINDOWS
 	struct timeval tv;
 #endif
+#ifdef OPENSSL_SYS_VMS
+        int stdin_sock;

+        TerminalSocket (TERM_SOCK_CREATE, &stdin_sock);
+#endif
+         
 	if ((buf=OPENSSL_malloc(bufsize)) == NULL)
 		{
 		BIO_printf(bio_err,"out of memory\n");
@@ -967,7 +968,12 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 		SSL_set_msg_callback_arg(con, bio_s_out);
 		}

-	width=s+1;
+#ifdef OPENSSL_SYS_VMS
+        if (stdin_sock > s)
+            width = stdin_sock + 1;
+        else
+#endif
+        width=s+1;
 	for (;;)
 		{
 		int read_from_terminal;
@@ -980,7 +986,11 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 			{
 			FD_ZERO(&readfds);
 #ifndef OPENSSL_SYS_WINDOWS
+#ifdef OPENSSL_SYS_VMS
+                        FD_SET(stdin_sock,&readfds);
+#else
 			FD_SET(fileno(stdin),&readfds);
+#endif
 #endif
 			FD_SET(s,&readfds);
 			/* Note: under VMS with SOCKETSHR the second parameter is
@@ -1004,8 +1014,12 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 #else
 			i=select(width,(void *)&readfds,NULL,NULL,NULL);
 			if (i <= 0) continue;
-			if (FD_ISSET(fileno(stdin),&readfds))
-				read_from_terminal = 1;
+#ifdef OPENSSL_SYS_VMS
+                        if (FD_ISSET(stdin_sock,&readfds))
+#else
+                        if (FD_ISSET(fileno(stdin),&readfds))
+#endif
+                                read_from_terminal = 1;
 #endif
 			if (FD_ISSET(s,&readfds))
 				read_from_sslcon = 1;
@@ -1016,7 +1030,11 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 				{
 				int j, lf_num;

-				i=read(fileno(stdin), buf, bufsize/2);
+#ifdef OPENSSL_SYS_VMS
+                                i=recv(stdin_sock, buf, bufsize/2, 0);
+#else
+                                i=read(fileno(stdin), buf, bufsize/2);
+#endif
 				lf_num = 0;
 				/* both loops are skipped when i <= 0 */
 				for (j = 0; j < i; j++)
@@ -1035,7 +1053,11 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 				assert(lf_num == 0);
 				}
 			else
-				i=read(fileno(stdin),buf,bufsize);
+#ifdef OPENSSL_SYS_VMS
+                                i=recv(stdin_sock,buf,bufsize, 0);
+#else
+                                i=read(fileno(stdin),buf,bufsize);
+#endif
 			if (!s_quiet)
 				{
 				if ((i <= 0) || (buf[0] == 'Q'))
@@ -1104,7 +1126,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 				case SSL_ERROR_WANT_WRITE:
 				case SSL_ERROR_WANT_READ:
 				case SSL_ERROR_WANT_X509_LOOKUP:
-					BIO_printf(bio_s_out,"Write BLOCK\n");
+					BIO_printf(bio_s_out,"Write BLOCK\n\n");
 					break;
 				case SSL_ERROR_SYSCALL:
 				case SSL_ERROR_SSL:
@@ -1114,7 +1136,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 					goto err;
 					/* break; */
 				case SSL_ERROR_ZERO_RETURN:
-					BIO_printf(bio_s_out,"DONE\n");
+					BIO_printf(bio_s_out,"DONE\n\n");
 					ret=1;
 					goto err;
 					}
@@ -1152,12 +1174,13 @@ again:
 #endif
 					write(fileno(stdout),buf,
 						(unsigned int)i);
+					BIO_printf(bio_s_out,"\n");
 					if (SSL_pending(con)) goto again;
 					break;
 				case SSL_ERROR_WANT_WRITE:
 				case SSL_ERROR_WANT_READ:
 				case SSL_ERROR_WANT_X509_LOOKUP:
-					BIO_printf(bio_s_out,"Read BLOCK\n");
+					BIO_printf(bio_s_out,"Read BLOCK\n\n");
 					break;
 				case SSL_ERROR_SYSCALL:
 				case SSL_ERROR_SSL:
@@ -1184,11 +1207,14 @@ err:
 	BIO_printf(bio_s_out,"CONNECTION CLOSED\n");
 	if (buf != NULL)
 		{
-		OPENSSL_cleanse(buf,bufsize);
+		memset(buf,0,bufsize);
 		OPENSSL_free(buf);
 		}
 	if (ret >= 0)
 		BIO_printf(bio_s_out,"ACCEPT\n");
+#ifdef OPENSSL_SYS_VMS
+        TerminalSocket (TERM_SOCK_DELETE, &stdin_sock);
+#endif
 	return(ret);
 	}

@@ -1236,17 +1262,17 @@ static int init_ssl_connection(SSL *con)
 		{
 		BIO_printf(bio_s_out,"Client certificate\n");
 		PEM_write_bio_X509(bio_s_out,peer);
-		X509_NAME_oneline(X509_get_subject_name(peer),buf,sizeof buf);
+		X509_NAME_oneline(X509_get_subject_name(peer),buf,BUFSIZ);
 		BIO_printf(bio_s_out,"subject=%s\n",buf);
-		X509_NAME_oneline(X509_get_issuer_name(peer),buf,sizeof buf);
+		X509_NAME_oneline(X509_get_issuer_name(peer),buf,BUFSIZ);
 		BIO_printf(bio_s_out,"issuer=%s\n",buf);
 		X509_free(peer);
 		}

-	if (SSL_get_shared_ciphers(con,buf,sizeof buf) != NULL)
+	if (SSL_get_shared_ciphers(con,buf,BUFSIZ) != NULL)
 		BIO_printf(bio_s_out,"Shared ciphers:%s\n",buf);
 	str=SSL_CIPHER_get_name(SSL_get_current_cipher(con));
-	BIO_printf(bio_s_out,"CIPHER is %s\n",(str != NULL)?str:"(NONE)");
+	BIO_printf(bio_s_out,"CIPHER is %s\n\n",(str != NULL)?str:"(NONE)");
 	if (con->hit) BIO_printf(bio_s_out,"Reused session-id\n");
 	if (SSL_ctrl(con,SSL_CTRL_GET_FLAGS,0,NULL) &
 		TLS1_FLAGS_TLS_PADDING_BUG)
@@ -1402,8 +1428,8 @@ static int www_body(char *hostname, int s, unsigned char *context)
 				}
 			else
 				{
-				BIO_printf(bio_s_out,"read R BLOCK\n");
-#if !defined(OPENSSL_SYS_MSDOS) && !defined(__DJGPP__)
+				BIO_printf(bio_s_out,"read R BLOCK\n\n");
+#ifndef OPENSSL_SYS_MSDOS
 				sleep(1);
 #endif
 				continue;
@@ -1628,7 +1654,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
 							goto write_error;
 						else
 							{
-							BIO_printf(bio_s_out,"rwrite W BLOCK\n");
+							BIO_printf(bio_s_out,"rwrite W BLOCK\n\n");
 							}
 						}
 					else
--- a/apps/s_socket.c
+++ b/apps/s_socket.c
@@ -83,9 +83,9 @@ typedef unsigned int u_int;

 static struct hostent *GetHostByName(char *name);
 #ifdef OPENSSL_SYS_WINDOWS
-static void ssl_sock_cleanup(void);
+static void sock_cleanup(void);
 #endif
-static int ssl_sock_init(void);
+static int sock_init(void);
 static int init_client_ip(int *sock,unsigned char ip[4], int port);
 static int init_server(int *sock, int port);
 static int init_server_long(int *sock, int port,char *ip);
@@ -118,7 +118,7 @@ static LONG FAR PASCAL topHookProc(HWND hwnd, UINT message, WPARAM wParam,
 		case WM_DESTROY:
 		case WM_CLOSE:
 			SetWindowLong(topWnd,GWL_WNDPROC,(LONG)lpTopWndProc);
-			ssl_sock_cleanup();
+			sock_cleanup();
 			break;
 			}
 		}
@@ -135,34 +135,26 @@ static BOOL CALLBACK enumproc(HWND hwnd,LPARAM lParam)
 #endif /* OPENSSL_SYS_WINDOWS */

 #ifdef OPENSSL_SYS_WINDOWS
-static void ssl_sock_cleanup(void)
+static void sock_cleanup(void)
 	{
 	if (wsa_init_done)
 		{
 		wsa_init_done=0;
-#ifndef OPENSSL_SYS_WINCE
 		WSACancelBlockingCall();
-#endif
 		WSACleanup();
 		}
 	}
 #endif

-static int ssl_sock_init(void)
+static int sock_init(void)
 	{
-#ifdef WATT32
-	extern int _watt_do_exit;
-	_watt_do_exit = 0;
-	dbug_init();
-	if (sock_init())
-		return (0);
-#elif defined(OPENSSL_SYS_WINDOWS)
+#ifdef OPENSSL_SYS_WINDOWS
 	if (!wsa_init_done)
 		{
 		int err;
 	  
 #ifdef SIGINT
-		signal(SIGINT,(void (*)(int))ssl_sock_cleanup);
+		signal(SIGINT,(void (*)(int))sock_cleanup);
 #endif
 		wsa_init_done=1;
 		memset(&wsa_state,0,sizeof(wsa_state));
@@ -204,7 +196,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port)
 	struct sockaddr_in them;
 	int s,i;

-	if (!ssl_sock_init()) return(0);
+	if (!sock_init()) return(0);

 	memset((char *)&them,0,sizeof(them));
 	them.sin_family=AF_INET;
@@ -269,7 +261,7 @@ static int init_server_long(int *sock, int port, char *ip)
 	struct sockaddr_in server;
 	int s= -1,i;

-	if (!ssl_sock_init()) return(0);
+	if (!sock_init()) return(0);

 	memset((char *)&server,0,sizeof(server));
 	server.sin_family=AF_INET;
@@ -326,7 +318,7 @@ static int do_accept(int acc_sock, int *sock, char **host)
 	int len;
 /*	struct linger ling; */

-	if (!ssl_sock_init()) return(0);
+	if (!sock_init()) return(0);

 #ifndef OPENSSL_SYS_WINDOWS
 redoit:
@@ -456,7 +448,7 @@ static int host_ip(char *str, unsigned char ip[4])
 		{ /* do a gethostbyname */
 		struct hostent *he;

-		if (!ssl_sock_init()) return(0);
+		if (!sock_init()) return(0);

 		he=GetHostByName(str);
 		if (he == NULL)
@@ -537,12 +529,9 @@ static struct hostent *GetHostByName(char *name)
 		ret=gethostbyname(name);
 		if (ret == NULL) return(NULL);
 		/* else add to cache */
-		if(strlen(name) < sizeof ghbn_cache[0].name)
-			{
-			strcpy(ghbn_cache[lowi].name,name);
-			memcpy((char *)&(ghbn_cache[lowi].ent),ret,sizeof(struct hostent));
-			ghbn_cache[lowi].order=ghbn_miss+ghbn_hits;
-			}
+		strncpy(ghbn_cache[lowi].name,name,128);
+		memcpy((char *)&(ghbn_cache[lowi].ent),ret,sizeof(struct hostent));
+		ghbn_cache[lowi].order=ghbn_miss+ghbn_hits;
 		return(ret);
 		}
 	else
--- a/apps/s_time.c
+++ b/apps/s_time.c
@@ -85,7 +85,7 @@
 #include OPENSSL_UNISTD
 #endif

-#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC))
+#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
 #define TIMES
 #endif

@@ -109,6 +109,10 @@
 #include <sys/timeb.h>
 #endif

+#ifdef _AIX
+#include <sys/select.h>
+#endif
+
 #if defined(sun) || defined(__ultrix)
 #define _POSIX_SOURCE
 #include <limits.h>
@@ -146,8 +150,6 @@
 #undef BUFSIZZ
 #define BUFSIZZ 1024*10

-#define MYBUFSIZ 1024*8
-
 #undef min
 #undef max
 #define min(a,b) (((a) < (b)) ? (a) : (b))
@@ -322,11 +324,6 @@ static int parseArgs(int argc, char **argv)
 		{
 		if (--argc < 1) goto bad;
 		s_www_path= *(++argv);
-		if(strlen(s_www_path) > MYBUFSIZ-100)
-			{
-			BIO_printf(bio_err,"-www option too long\n");
-			badop=1;
-			}
 		}
 	else if(strcmp(*argv,"-bugs") == 0)
 	    st_bugs=1;
@@ -487,7 +484,7 @@ int MAIN(int argc, char **argv)
 	tm_Time_F(START);
 	for (;;)
 		{
-		if (finishtime < (long)time(NULL)) break;
+		if (finishtime < time(NULL)) break;
 #ifdef WIN32_STUFF

 		if( flushWinMsgs(0) == -1 )
@@ -538,9 +535,9 @@ int MAIN(int argc, char **argv)
 		}
 	totalTime += tm_Time_F(STOP); /* Add the time for this iteration */

-	i=(int)((long)time(NULL)-finishtime+maxTime);
+	i=(int)(time(NULL)-finishtime+maxTime);
 	printf( "\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n", nConn, totalTime, ((double)nConn/totalTime),bytes_read);
-	printf( "%d connections in %ld real seconds, %ld bytes read per connection\n",nConn,(long)time(NULL)-finishtime+maxTime,bytes_read/nConn);
+	printf( "%d connections in %ld real seconds, %ld bytes read per connection\n",nConn,time(NULL)-finishtime+maxTime,bytes_read/nConn);

 	/* Now loop and time connections using the same session id over and over */

@@ -572,7 +569,7 @@ next:
 	nConn = 0;
 	totalTime = 0.0;

-	finishtime=(long)time(NULL)+maxTime;
+	finishtime=time(NULL)+maxTime;

 	printf( "starting\n" );
 	bytes_read=0;
@@ -580,7 +577,7 @@ next:
 		
 	for (;;)
 		{
-		if (finishtime < (long)time(NULL)) break;
+		if (finishtime < time(NULL)) break;

 #ifdef WIN32_STUFF
 		if( flushWinMsgs(0) == -1 )
@@ -630,7 +627,7 @@ next:


 	printf( "\n\n%d connections in %.2fs; %.2f connections/user sec, bytes read %ld\n", nConn, totalTime, ((double)nConn/totalTime),bytes_read);
-	printf( "%d connections in %ld real seconds, %ld bytes read per connection\n",nConn,(long)time(NULL)-finishtime+maxTime,bytes_read/nConn);
+	printf( "%d connections in %ld real seconds, %ld bytes read per connection\n",nConn,time(NULL)-finishtime+maxTime,bytes_read/nConn);

 	ret=0;
 end:
@@ -642,7 +639,7 @@ end:
 		tm_ctx=NULL;
 		}
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 /***********************************************************************
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -273,7 +273,7 @@ end:
 	if (out != NULL) BIO_free_all(out);
 	if (x != NULL) SSL_SESSION_free(x);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 static SSL_SESSION *load_sess_id(char *infile, int format)
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -428,7 +428,7 @@ int MAIN(int argc, char **argv)
 	} else keyfile = NULL;

 	if(keyfile) {
-		key = load_key(bio_err, keyfile, keyform, 0, passin, e,
+		key = load_key(bio_err, keyfile, keyform, passin, e,
 			       "signing key file");
 		if (!key) {
 			goto end;
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -187,8 +187,7 @@

 /* The following if from times(3) man page.  It may need to be changed */
 #ifndef HZ
-# if defined(_SC_CLK_TCK) \
-     && (!defined(OPENSSL_SYS_VMS) || __CTRL_VER >= 70000000)
+# ifdef _SC_CLK_TCK
 #  define HZ ((double)sysconf(_SC_CLK_TCK))
 # else
 #  ifndef CLK_TCK
@@ -862,7 +861,7 @@ int MAIN(int argc, char **argv)

 			BIO_printf(bio_err,"\n");
 			BIO_printf(bio_err,"Available options:\n");
-#if defined(TIMES) || defined(USE_TOD)
+#ifdef TIMES
 			BIO_printf(bio_err,"-elapsed        measure time in real time instead of CPU user time.\n");
 #endif
 			BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
@@ -1729,7 +1728,7 @@ end:
 			DSA_free(dsa_key[i]);
 #endif
 	apps_shutdown();
-	OPENSSL_EXIT(mret);
+	EXIT(mret);
 	}

 static void print_message(const char *s, long num, int length)
@@ -1782,7 +1781,7 @@ static char *sstrsep(char **string, const char *delim)
    if (**string == 0)
        return NULL;

-    memset(isdelim, 0, sizeof isdelim);
+    memset(isdelim, 0, 256);
    isdelim[0] = 1;

    while (*delim)
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -186,7 +186,7 @@ bad:
 	if(keyfile) {
 		pkey = load_key(bio_err,
 				strcmp(keyfile, "-") ? keyfile : NULL,
-				FORMAT_PEM, 1, passin, e, "private key");
+				FORMAT_PEM, passin, e, "private key");
 		if(!pkey) {
 			goto end;
 		}
@@ -295,5 +295,5 @@ end:
 	EVP_PKEY_free(pkey);
 	if(passin) OPENSSL_free(passin);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
--- a/apps/term_sock.c
+++ b/apps/term_sock.c
@@ -0,0 +1,581 @@
+#ifdef VMS
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <inet.h>
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <starlet.h>
+#include <iodef.h>
+#ifdef __alpha
+#include <iosbdef.h>
+#else
+typedef struct _iosb {			/* Copied from IOSBDEF.H for Alpha  */
+#pragma __nomember_alignment
+    __union  {
+        __struct  {
+            unsigned short int iosb$w_status; /* Final I/O status           */
+            __union  {
+                __struct  {             /* 16-bit byte count variant        */
+                    unsigned short int iosb$w_bcnt; /* 16-bit byte count    */
+                    __union  {
+                        unsigned int iosb$l_dev_depend; /* 32-bit device dependent info */
+                        unsigned int iosb$l_pid; /* 32-bit pid              */
+                        } iosb$r_l;
+                    } iosb$r_bcnt_16;
+                __struct  {             /* 32-bit byte count variant        */
+                    unsigned int iosb$l_bcnt; /* 32-bit byte count (unaligned) */
+                    unsigned short int iosb$w_dev_depend_high; /* 16-bit device dependent info */
+                    } iosb$r_bcnt_32;
+                } iosb$r_devdepend;
+            } iosb$r_io_64;
+        __struct  {
+            __union  {
+                unsigned int iosb$l_getxxi_status; /* Final GETxxI status   */
+                unsigned int iosb$l_reg_status; /* Final $Registry status   */
+                } iosb$r_l_status;
+            unsigned int iosb$l_reserved; /* Reserved field                 */
+            } iosb$r_get_64;
+        } iosb$r_io_get;
+    } IOSB;
+
+#if !defined(__VAXC)
+#define iosb$w_status iosb$r_io_get.iosb$r_io_64.iosb$w_status
+#define iosb$w_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$w_bcnt
+#define iosb$r_l        iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_16.iosb$r_l
+#define iosb$l_dev_depend iosb$r_l.iosb$l_dev_depend
+#define iosb$l_pid iosb$r_l.iosb$l_pid
+#define iosb$l_bcnt iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$l_bcnt
+#define iosb$w_dev_depend_high iosb$r_io_get.iosb$r_io_64.iosb$r_devdepend.iosb$r_bcnt_32.iosb$w_dev_depend_high
+#define iosb$l_getxxi_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_getxxi_status
+#define iosb$l_reg_status iosb$r_io_get.iosb$r_get_64.iosb$r_l_status.iosb$l_reg_status
+#endif          /* #if !defined(__VAXC) */
+
+#endif					/* End of IOSBDEF */
+
+#include <efndef.h>
+#include <stdlib.h>
+#include <ssdef.h>
+#include <time.h>
+#include <stdarg.h>
+#include <descrip.h>
+
+#include "term_sock.h"
+
+#ifdef __alpha
+static struct _iosb TerminalDeviceIosb;
+#else
+IOSB TerminalDeviceIosb;
+#endif
+
+static char TerminalDeviceBuff[255 + 2];
+static int TerminalSocketPair[2] = {0, 0};
+static unsigned short TerminalDeviceChan = 0;
+
+static int CreateSocketPair (int, int, int, int *);
+static void SocketPairTimeoutAst (int);
+static int TerminalDeviceAst (int);
+static void LogMessage (char *, ...);
+
+/*
+** Socket Pair Timeout Value (must be 0-59 seconds)
+*/
+#define SOCKET_PAIR_TIMEOUT_VALUE 20
+
+/*
+** Socket Pair Timeout Block which is passed to timeout AST
+*/
+typedef struct _SocketPairTimeoutBlock {
+    unsigned short SockChan1;
+    unsigned short SockChan2;
+    } SPTB;
+
+#ifdef TERM_SOCK_TEST
+
+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+int main (int argc, char *argv[], char *envp[])
+{
+char TermBuff[80];
+int TermSock,
+    status,
+    len;
+
+LogMessage ("Enter 'q' or 'Q' to quit ...");
+while (strcasecmp (TermBuff, "Q"))
+    {
+    /*
+    ** Create the terminal socket
+    */
+    status = TerminalSocket (TERM_SOCK_CREATE, &TermSock);
+    if (status != TERM_SOCK_SUCCESS)
+	exit (1);
+
+    /*
+    ** Process the terminal input
+    */
+    LogMessage ("Waiting on terminal I/O ...\n");
+    len = recv (TermSock, TermBuff, sizeof (TermBuff), 0) ;
+    TermBuff[len] = '\0';
+    LogMessage ("Received terminal I/O [%s]", TermBuff);
+
+    /*
+    ** Delete the terminal socket
+    */
+    status = TerminalSocket (TERM_SOCK_DELETE, &TermSock);
+    if (status != TERM_SOCK_SUCCESS)
+	exit (1);
+    }
+
+return 1;
+
+}
+#endif 
+
+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+int TerminalSocket (int FunctionCode, int *ReturnSocket)
+{
+int status;
+$DESCRIPTOR (TerminalDeviceDesc, "SYS$COMMAND");
+
+/*
+** Process the requested function code
+*/
+switch (FunctionCode)
+   {
+   case TERM_SOCK_CREATE:
+	/*
+	** Create a socket pair
+	*/
+	status = CreateSocketPair (AF_INET, SOCK_STREAM, 0, TerminalSocketPair);
+	if (status == -1)
+	    {
+	    LogMessage ("TerminalSocket: CreateSocketPair () - %08X", status);
+	    if (TerminalSocketPair[0])
+		close (TerminalSocketPair[0]);
+	    if (TerminalSocketPair[1])
+		close (TerminalSocketPair[1]);
+	    return (TERM_SOCK_FAILURE);
+	    }
+
+	/*
+	** Assign a channel to the terminal device
+	*/
+	status = sys$assign (&TerminalDeviceDesc,
+			     &TerminalDeviceChan, 
+			     0, 0, 0);
+	if (! (status & 1))
+	    {
+	    LogMessage ("TerminalSocket: SYS$ASSIGN () - %08X", status);
+	    close (TerminalSocketPair[0]);
+	    close (TerminalSocketPair[1]);
+	    return (TERM_SOCK_FAILURE);
+	    }
+
+	/*
+	** Queue an async IO to the terminal device
+	*/
+	status = sys$qio (EFN$C_ENF,
+			  TerminalDeviceChan,
+	                  IO$_READVBLK,
+	                  &TerminalDeviceIosb, 
+			  TerminalDeviceAst, 
+			  0, 
+	                  TerminalDeviceBuff,
+	                  sizeof (TerminalDeviceBuff) - 2,
+	                  0, 0, 0, 0);
+	if (! (status & 1))
+	    {
+	    LogMessage ("TerminalSocket: SYS$QIO () - %08X", status);
+	    close (TerminalSocketPair[0]);
+	    close (TerminalSocketPair[1]);
+	    return (TERM_SOCK_FAILURE);
+	    }
+
+	/*
+	** Return the input side of the socket pair
+	*/
+	*ReturnSocket = TerminalSocketPair[1];
+        break;
+
+   case TERM_SOCK_DELETE:
+	/*
+	** Cancel any pending IO on the terminal channel
+	*/
+	status = sys$cancel (TerminalDeviceChan);
+	if (! (status & 1))
+	    {
+	    LogMessage ("TerminalSocket: SYS$CANCEL () - %08X", status);
+	    close (TerminalSocketPair[0]);
+	    close (TerminalSocketPair[1]);
+	    return (TERM_SOCK_FAILURE);
+	    }
+
+	/*
+	** Deassign the terminal channel
+	*/
+	status = sys$dassgn (TerminalDeviceChan);
+	if (! (status & 1))
+	    {
+	    LogMessage ("TerminalSocket: SYS$DASSGN () - %08X", status);
+	    close (TerminalSocketPair[0]);
+	    close (TerminalSocketPair[1]);
+	    return (TERM_SOCK_FAILURE);
+	    }
+
+	/*
+	** Close the terminal socket pair
+	*/
+	close (TerminalSocketPair[0]);
+	close (TerminalSocketPair[1]);
+
+	/*
+	** Return the initialized socket
+	*/
+	*ReturnSocket = 0;
+	break;
+
+    default:
+	/*
+	** Invalid function code
+	*/
+	LogMessage ("TerminalSocket: Invalid Function Code - %d", FunctionCode);
+	return (TERM_SOCK_FAILURE);
+	break;
+    }	
+
+/*
+** Return success
+*/
+return (TERM_SOCK_SUCCESS);
+
+}
+
+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static int CreateSocketPair (
+    int		SocketFamily,
+    int		SocketType,
+    int		SocketProtocol,
+    int		*SocketPair)
+{
+struct dsc$descriptor AscTimeDesc = {0, DSC$K_DTYPE_T, DSC$K_CLASS_S, NULL};
+static const char* LocalHostAddr = {"127.0.0.1"};
+unsigned short TcpAcceptChan = 0,
+	       TcpDeviceChan = 0;
+unsigned long BinTimeBuff[2];
+struct sockaddr_in sin;
+char AscTimeBuff[32];
+short LocalHostPort;
+unsigned int status,
+	     slen;
+
+#ifdef __alpha
+struct _iosb iosb;
+#else
+IOSB iosb;
+#endif
+
+int SockDesc1 = 0,
+    SockDesc2 = 0;
+SPTB sptb;
+$DESCRIPTOR (TcpDeviceDesc, "TCPIP$DEVICE");
+
+/*
+** Create a socket
+*/
+SockDesc1 = socket (SocketFamily, SocketType, 0);
+if (SockDesc1 < 0)
+    {
+    LogMessage ("CreateSocketPair: socket () - %d", errno);
+    return (-1);
+    }
+
+/*
+** Initialize the socket information
+*/
+slen = sizeof (sin);
+memset ((char *) &sin, 0, slen);
+sin.sin_family = SocketFamily;
+sin.sin_addr.s_addr = inet_addr (LocalHostAddr);
+sin.sin_port = 0;
+
+/*
+** Bind the socket to the local IP
+*/
+status = bind (SockDesc1, (struct sockaddr *) &sin, slen);
+if (status < 0)
+    {
+    LogMessage ("CreateSocketPair: bind () - %d", errno);
+    close (SockDesc1);   
+    return (-1);
+    }
+
+/*
+** Get the socket name so we can save the port number
+*/
+status = getsockname (SockDesc1, (struct sockaddr *) &sin, &slen);
+if (status < 0)
+    {
+    LogMessage ("CreateSocketPair: getsockname () - %d", errno);
+    close (SockDesc1); 
+    return (-1);
+    }
+else
+    LocalHostPort = sin.sin_port;			
+
+/*
+** Setup a listen for the socket
+*/
+listen (SockDesc1, 5);
+
+/*
+** Get the binary (64-bit) time of the specified timeout value
+*/
+sprintf (AscTimeBuff, "0 0:0:%02d.00", SOCKET_PAIR_TIMEOUT_VALUE);
+AscTimeDesc.dsc$w_length = strlen (AscTimeBuff);
+AscTimeDesc.dsc$a_pointer = AscTimeBuff;
+status = sys$bintim (&AscTimeDesc, BinTimeBuff);
+if (! (status & 1))
+    {
+    LogMessage ("CreateSocketPair: SYS$BINTIM () - %08X", status);
+    close (SockDesc1);
+    return (-1);
+    }
+
+/*
+** Assign another channel to the TCP/IP device for the accept.
+** This is the channel that ends up being connected to.
+*/
+status = sys$assign (&TcpDeviceDesc, &TcpDeviceChan, 0, 0, 0);
+if (! (status & 1))
+    {
+    LogMessage ("CreateSocketPair: SYS$ASSIGN () - %08X", status);
+    close (SockDesc1);
+    return (-1);
+    }
+
+/*
+** Get the channel of the first socket for the accept
+*/
+TcpAcceptChan = decc$get_sdc (SockDesc1);		
+
+/*
+** Perform the accept using $QIO so we can do this asynchronously
+*/
+status = sys$qio (EFN$C_ENF, 
+		  TcpAcceptChan,
+                  IO$_ACCESS | IO$M_ACCEPT,
+                  &iosb,
+		  0, 0, 0, 0, 0,
+                  &TcpDeviceChan,
+                  0, 0);
+if (! (status & 1))
+    {
+    LogMessage ("CreateSocketPair: SYS$QIO () - %08X", status);
+    close (SockDesc1);
+    sys$dassgn (TcpDeviceChan);
+    return (-1);
+    }
+
+/*
+** Create the second socket to do the connect
+*/
+SockDesc2 = socket (SocketFamily, SocketType, 0);
+if (SockDesc2 < 0)
+    {
+    LogMessage ("CreateSocketPair: socket () - %d", errno);
+    sys$cancel (TcpAcceptChan);
+    close (SockDesc1);
+    sys$dassgn (TcpDeviceChan);
+    return (-1) ;
+    } 
+
+/*
+** Setup the Socket Pair Timeout Block
+*/
+sptb.SockChan1 = TcpAcceptChan;
+sptb.SockChan2 = decc$get_sdc (SockDesc2);
+
+/*
+** Before we block on the connect, set a timer that can cancel I/O on our two 
+** sockets if it never connects.
+*/
+status = sys$setimr (EFN$C_ENF, 
+		     BinTimeBuff, 
+		     SocketPairTimeoutAst, 
+		     &sptb, 
+		     0);
+if (! (status & 1))
+    {
+    LogMessage ("CreateSocketPair: SYS$SETIMR () - %08X", status);
+    sys$cancel (TcpAcceptChan);
+    close (SockDesc1);
+    close (SockDesc2);
+    sys$dassgn (TcpDeviceChan);
+    return (-1);
+    }
+
+/*
+** Now issue the connect
+*/
+memset ((char *) &sin, 0, sizeof (sin)) ;
+sin.sin_family = SocketFamily;
+sin.sin_addr.s_addr = inet_addr (LocalHostAddr) ;
+sin.sin_port = LocalHostPort ;
+
+status = connect (SockDesc2, (struct sockaddr *) &sin, sizeof (sin));
+if (status < 0 )
+    {
+    LogMessage ("CreateSocketPair: connect () - %d", errno);
+    sys$cantim (&sptb, 0);
+    sys$cancel (TcpAcceptChan);
+    close (SockDesc1);
+    close (SockDesc2);
+    sys$dassgn (TcpDeviceChan);
+    return (-1);
+    }
+
+/*
+** Wait for the asynch $QIO to finish.  Note that if the I/O was aborted 
+** (SS$_ABORT), then we probably canceled it from the AST routine - so log a 
+** timeout.
+*/
+status = sys$synch (EFN$C_ENF, &iosb);
+if (! (iosb.iosb$w_status & 1))
+    {
+    if (iosb.iosb$w_status == SS$_ABORT)
+	LogMessage ("CreateSocketPair: SYS$QIO(iosb) timeout");
+    else 
+	{
+        LogMessage ("CreateSocketPair: SYS$QIO(iosb) - %d", iosb.iosb$w_status);
+        sys$cantim (&sptb, 0);
+        }
+    close (SockDesc1);
+    close (SockDesc2);
+    sys$dassgn (TcpDeviceChan);
+    return (-1);
+    }
+
+/*
+** Here we're successfully connected, so cancel the timer, convert the I/O 
+** channel to a socket fd, close the listener socket and return the connected 
+** pair.
+*/
+sys$cantim (&sptb, 0);
+
+close (SockDesc1) ;
+SocketPair[0] = SockDesc2 ;
+SocketPair[1] = socket_fd (TcpDeviceChan);
+
+return (0) ;
+
+}
+
+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static void SocketPairTimeoutAst (int astparm)
+{
+SPTB *sptb = (SPTB *) astparm;
+
+sys$cancel (sptb->SockChan2);			/* Cancel the connect() */
+sys$cancel (sptb->SockChan1);			/* Cancel the accept() 	*/
+
+return;
+
+}
+
+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static int TerminalDeviceAst (int astparm)
+{
+int status;
+
+/*
+** Terminate the terminal buffer
+*/
+TerminalDeviceBuff[TerminalDeviceIosb.iosb$w_bcnt] = '\0';
+strcat (TerminalDeviceBuff, "\n");
+
+/*
+** Send the data read from the terminal device throught the socket pair
+*/
+send (TerminalSocketPair[0], TerminalDeviceBuff, TerminalDeviceIosb.iosb$w_bcnt + 1, 0);
+
+/*
+** Queue another async IO to the terminal device
+*/
+status = sys$qio (EFN$C_ENF,
+         	  TerminalDeviceChan,
+         	  IO$_READVBLK,
+         	  &TerminalDeviceIosb, 
+	 	  TerminalDeviceAst, 
+	 	  0, 
+         	  TerminalDeviceBuff,
+         	  sizeof (TerminalDeviceBuff) - 1,
+         	  0, 0, 0, 0);
+
+/*
+** Return status
+*/
+return status;
+
+}
+
+/*----------------------------------------------------------------------------*/
+/*                                                                            */
+/*----------------------------------------------------------------------------*/
+static void LogMessage (char *msg, ...)
+{
+char *Month[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 
+                 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
+static unsigned int pid = 0;
+va_list args;
+time_t CurTime;
+struct tm *LocTime;
+char MsgBuff[256];
+
+/*
+** Get the process pid
+*/
+if (pid == 0)
+    pid = getpid ();
+
+/*
+** Convert the current time into local time
+*/
+CurTime = time (NULL);
+LocTime = localtime (&CurTime);
+
+/*
+** Format the message buffer
+*/
+sprintf (MsgBuff, "%02d-%s-%04d %02d:%02d:%02d [%08X] %s\n",
+         LocTime->tm_mday, Month[LocTime->tm_mon], (LocTime->tm_year + 1900),
+         LocTime->tm_hour, LocTime->tm_min, LocTime->tm_sec, pid, msg);
+
+/*
+** Get any variable arguments and add them to the print of the message buffer 
+*/
+va_start (args, msg);
+vfprintf (stderr, MsgBuff, args);
+va_end (args);
+
+/*
+** Flush standard error output
+*/
+fsync (fileno (stderr));
+
+return;
+
+}
+#endif
--- a/apps/term_sock.h
+++ b/apps/term_sock.h
@@ -0,0 +1,21 @@
+#ifndef TERM_SOCK_H
+#define TERM_SOCK_H
+
+/*
+** Terminal Socket Function Codes
+*/
+#define TERM_SOCK_CREATE	1
+#define TERM_SOCK_DELETE	2
+
+/*
+** Terminal Socket Status Codes
+*/
+#define TERM_SOCK_FAILURE	0
+#define TERM_SOCK_SUCCESS	1
+
+/*
+** Terminal Socket Prototype
+*/
+int TerminalSocket (int FunctionCode, int *ReturnSocket);
+
+#endif
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -232,7 +232,7 @@ end:
 	sk_X509_pop_free(untrusted, X509_free);
 	sk_X509_pop_free(trusted, X509_free);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose, ENGINE *e)
@@ -330,8 +330,7 @@ static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx)
 	if (!ok)
 		{
 		X509_NAME_oneline(
-				X509_get_subject_name(ctx->current_cert),buf,
-				sizeof buf);
+				X509_get_subject_name(ctx->current_cert),buf,256);
 		printf("%s\n",buf);
 		printf("error %d at %d depth lookup:%s\n",ctx->error,
 			ctx->error_depth,
--- a/apps/version.c
+++ b/apps/version.c
@@ -200,5 +200,5 @@ int MAIN(int argc, char **argv)
 	if (dir)  printf("%s\n",SSLeay_version(SSLEAY_DIR));
 end:
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}
--- a/apps/winrand.c
+++ b/apps/winrand.c
@@ -118,6 +118,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam)
        HDC hdc;
 	PAINTSTRUCT ps;
        RECT rect;
+        char buffer[200];
        static int seeded = 0;

 	switch (iMsg)
--- a/apps/x509.c
+++ b/apps/x509.c
@@ -122,7 +122,7 @@ static char *x509_usage[]={
 " -CAkey arg      - set the CA key, must be PEM format\n",
 "                   missing, it is assumed to be in the CA file.\n",
 " -CAcreateserial - create serial number file if it does not exist\n",
-" -CAserial arg   - serial file\n",
+" -CAserial       - serial file\n",
 " -set_serial     - serial number to use\n",
 " -text           - print the certificate in text form\n",
 " -C              - print out C code forms\n",
@@ -245,7 +245,7 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(*argv,"-CAkeyform") == 0)
 			{
 			if (--argc < 1) goto bad;
-			CAkeyformat=str2fmt(*(++argv));
+			CAformat=str2fmt(*(++argv));
 			}
 		else if (strcmp(*argv,"-days") == 0)
 			{
@@ -479,7 +479,7 @@ bad:

 	if (extfile)
 		{
-		long errorline = -1;
+		long errorline;
 		X509V3_CTX ctx2;
 		extconf = NCONF_new(NULL);
 		if (!NCONF_load(extconf, extfile,&errorline))
@@ -770,11 +770,10 @@ bad:
 				int y,z;

 				X509_NAME_oneline(X509_get_subject_name(x),
-					buf,sizeof buf);
+					buf,256);
 				BIO_printf(STDout,"/* subject:%s */\n",buf);
 				m=X509_NAME_oneline(
-					X509_get_issuer_name(x),buf,
-					sizeof buf);
+					X509_get_issuer_name(x),buf,256);
 				BIO_printf(STDout,"/* issuer :%s */\n",buf);

 				z=i2d_X509(x,NULL);
@@ -862,14 +861,18 @@ bad:
 				if (Upkey == NULL)
 					{
 					Upkey=load_key(bio_err,
-						keyfile, keyformat, 0,
-						passin, e, "Private key");
+						keyfile,keyformat, passin, e,
+						"Private key");
 					if (Upkey == NULL) goto end;
 					}
 #ifndef OPENSSL_NO_DSA
 		                if (Upkey->type == EVP_PKEY_DSA)
 		                        digest=EVP_dss1();
 #endif
+#ifndef OPENSSL_NO_ECDSA
+				if (Upkey->type == EVP_PKEY_ECDSA)
+					digest=EVP_ecdsa();
+#endif

 				assert(need_rand);
 				if (!sign(x,Upkey,days,clrext,digest,
@@ -881,15 +884,18 @@ bad:
 				if (CAkeyfile != NULL)
 					{
 					CApkey=load_key(bio_err,
-						CAkeyfile, CAkeyformat,
-						0, passin, e,
-						"CA Private Key");
+						CAkeyfile,CAkeyformat, passin,
+						e, "CA Private Key");
 					if (CApkey == NULL) goto end;
 					}
 #ifndef OPENSSL_NO_DSA
 		                if (CApkey->type == EVP_PKEY_DSA)
 		                        digest=EVP_dss1();
 #endif
+#ifndef OPENSSL_NO_ECDSA
+				if (CApkey->type == EVP_PKEY_ECDSA)
+					digest = EVP_ecdsa();
+#endif
 				
 				assert(need_rand);
 				if (!x509_certify(ctx,CAfile,digest,x,xca,
@@ -910,17 +916,17 @@ bad:
 				else
 					{
 					pk=load_key(bio_err,
-						keyfile, FORMAT_PEM, 0,
-						passin, e, "request key");
+						keyfile,FORMAT_PEM, passin, e,
+						"request key");
 					if (pk == NULL) goto end;
 					}

 				BIO_printf(bio_err,"Generating certificate request\n");

-#ifndef OPENSSL_NO_DSA
 		                if (pk->type == EVP_PKEY_DSA)
 		                        digest=EVP_dss1();
-#endif
+				else if (pk->type == EVP_PKEY_ECDSA)
+					digest=EVP_ecdsa();

 				rq=X509_to_X509_REQ(x,pk,digest);
 				EVP_PKEY_free(pk);
@@ -1017,7 +1023,7 @@ end:
 	sk_ASN1_OBJECT_pop_free(reject, ASN1_OBJECT_free);
 	if (passin) OPENSSL_free(passin);
 	apps_shutdown();
-	OPENSSL_EXIT(ret);
+	EXIT(ret);
 	}

 static ASN1_INTEGER *load_serial(char *CAfile, char *serialfile, int create)
@@ -1075,7 +1081,7 @@ static ASN1_INTEGER *load_serial(char *CAfile, char *serialfile, int create)
 		}
 	else 
 		{
-		if (!a2i_ASN1_INTEGER(io,bs,buf2,sizeof buf2))
+		if (!a2i_ASN1_INTEGER(io,bs,buf2,1024))
 			{
 			BIO_printf(bio_err,"unable to load serial number from %s\n",buf);
 			ERR_print_errors(bio_err);
--- a/55
+++ b/55
@@ -351,10 +351,6 @@ case "${SYSTEM}:${RELEASE}:${VERSION}:${MACHINE}" in
    *CRAY*)
       echo "j90-cray-unicos"; exit 0;
       ;;
-
-    NONSTOP_KERNEL*)
-       echo "nsr-tandem-nsk"; exit 0;
-       ;;
 esac

 #
@@ -394,33 +390,18 @@ exit 0

 # figure out if gcc is available and if so we use it otherwise
 # we fallback to whatever cc does on the system
-GCCVER=`(gcc -dumpversion) 2>/dev/null`
+GCCVER=`(gcc --version) 2>/dev/null`
 if [ "$GCCVER" != "" ]; then
  CC=gcc
-  # then strip off whatever prefix egcs prepends the number with...
-  # Hopefully, this will work for any future prefixes as well.
-  GCCVER=`echo $GCCVER | sed 's/^[a-zA-Z]*\-//'`
-  # Since gcc 3.1 gcc --version behaviour has changed.  gcc -dumpversion
-  # does give us what we want though, so we use that.  We just just the
-  # major and minor version numbers.
+  # then strip off whatever prefix Cygnus prepends the number with...
+  GCCVER=`echo $GCCVER | sed 's/^[a-z]*\-//'`
  # peak single digit before and after first dot, e.g. 2.95.1 gives 29
  GCCVER=`echo $GCCVER | sed 's/\([0-9]\)\.\([0-9]\).*/\1\2/'`
 else
  CC=cc
 fi
 GCCVER=${GCCVER:-0}
-if [ "$SYSTEM" = "HP-UX" ];then
-  # By default gcc is a ILP32 compiler (with long long == 64).
-  GCC_BITS="32"
-  if [ $GCCVER -ge 30 ]; then
-    # PA64 support only came in with gcc 3.0.x.
-    # We look for the preprocessor symbol __LP64__ indicating
-    # 64bit bit long and pointer.  sizeof(int) == 32 on HPUX64.
-    if gcc -v -E -x c /dev/null 2>&1 | grep __LP64__ > /dev/null; then
-      GCC_BITS="64"
-    fi
-  fi
-fi
+
 if [ "$SYSTEM" = "SunOS" ]; then
  if [ $GCCVER -ge 30 ]; then
    # 64-bit ABI isn't officially supported in gcc 3.0, but it appears
@@ -547,13 +528,12 @@ EOF
  ppc-apple-darwin*) OUT="darwin-ppc-cc" ;;
  i386-apple-darwin*) OUT="darwin-i386-cc" ;;
  sparc64-*-linux2)
-	echo "WARNING! If *know* that your GNU C supports 64-bit/V9 ABI"
-	echo "         and wish to build 64-bit library, then you have to"
-	echo "         invoke './Configure linux64-sparcv9' *manually*."
-	if [ "$TEST" = "false" ]; then
-	  echo "          You have about 5 seconds to press Ctrl-C to abort."
-	  (stty -icanon min 0 time 50; read waste) < /dev/tty
-	fi
+	#Before we can uncomment following lines we have to wait at least
+	#till 64-bit glibc for SPARC is operational:-(
+	#echo "WARNING! If you wish to build 64-bit library, then you have to"
+	#echo "         invoke './Configure linux64-sparcv9' *manually*."
+	#echo "         Type return if you want to continue, Ctrl-C to abort."
+	#read waste < /dev/tty
 	OUT="linux-sparcv9" ;;
  sparc-*-linux2)
 	KARCH=`awk '/^type/{print$3}' /proc/cpuinfo`
@@ -586,7 +566,6 @@ EOF
  arm*-*-linux2) OUT="linux-elf-arm" ;;
  s390-*-linux2) OUT="linux-s390" ;;
  s390x-*-linux?) OUT="linux-s390x" ;;
-  x86_64-*-linux?) OUT="linux-x86_64" ;;
  *-*-linux2) OUT="linux-elf"
 	if [ "$GCCVER" -gt 28 ]; then
          if grep '^model.*Pentium' /proc/cpuinfo >/dev/null ; then
@@ -680,16 +659,7 @@ EOF
  RM*-siemens-sysv4) OUT="ReliantUNIX" ;;
  *-siemens-sysv4) OUT="SINIX" ;;
  *-hpux1*)
-	if [ $CC = "gcc" ];
-	then
-	  if [ $GCC_BITS = "64" ]; then
-	    OUT="hpux64-parisc-gcc"
-	  else
-	    OUT="hpux-parisc-gcc"
-	  fi
-	else
-	  OUT="hpux-parisc-$CC"
-	fi
+	OUT="hpux-parisc-$CC"
 	KERNEL_BITS=`(getconf KERNEL_BITS) 2>/dev/null`
 	KERNEL_BITS=${KERNEL_BITS:-32}
 	CPU_VERSION=`(getconf CPU_VERSION) 2>/dev/null`
@@ -731,7 +701,6 @@ EOF
  *-*-cygwin) OUT="Cygwin" ;;
  t3e-cray-unicosmk) OUT="cray-t3e" ;;
  j90-cray-unicos) OUT="cray-j90" ;;
-  nsr-tandem-nsk) OUT="tandem-c89" ;;
  *) OUT=`echo $GUESSOS | awk -F- '{print $3}'`;;
 esac

@@ -766,7 +735,7 @@ case "$GUESSOS" in
  i386-*) options="$options 386" ;;
 esac

-for i in bf cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 aes ripemd rsa sha
+for i in bf cast des dh dsa ec hmac idea md2 md5 mdc2 rc2 rc4 rc5 rijndael ripemd rsa sha
 do
  if [ ! -d crypto/$i ]
  then
--- a/cpq-axpvms-ssl-t0100--1.pcsi$desc
+++ b/cpq-axpvms-ssl-t0100--1.pcsi$desc
@@ -0,0 +1,259 @@
+--
+--      CPQ-AXPVMS-SSL-T0100--1.PCSI$DESCRIPTION
+--
+--      KSG00141     Kevin Greaney		21-Jun-2001
+--	Using the ENCRYPT file as a template, create a 
+--	.PCSI$DESCRIPTION file for the OpenSSL port.
+--
+--
+--  First, make sure we are running on correct operating system.
+--
+product CPQ AXPVMS SSL T1.0 full ;
+    if (not <software DEC AXPVMS VMS version minimum V7.2>) ;
+        error NOAXPVMS;
+    end if;
+
+--
+--  Now, perform the installation.
+--
+--
+-- Define the SSL root logical name.  This is done by
+-- SSL$PCSI.COM.  It defines SSL$ROOT to be the 
+-- equivalence name of the PCSI$DESTINATION logical when
+-- installing, and deassigns the logical when removing.
+
+    execute 
+	install "@pcsi$destination:[ssl.com]ssl$pcsi.com install" 
+	remove "@pcsi$destination:[ssl.com]ssl$pcsi.com remove";
+
+--
+-- SSL$STARTUP.COM defines a handfull of logicals and
+-- then executes SSL$SYSTARTUP.COM.
+--
+-- SSL$SHUTDOWN deassigns the logicals defined in the
+-- startup file and then executes SSL$SYSHUTDOWN.COM 
+--
+-- Note : If this kit is installed to a disk other than
+--	  the system disk, these two files will not end
+--	  up on the system disk.  They will have to be
+--	  moved over manually.
+
+    execute 
+	start "@sys$startup:ssl$startup.com" 
+	stop "@sys$startup:ssl$shutdown.com";
+
+--
+--  Now, perform the testing, if it was requested.
+--
+-- Find out if the IVP should be run ...
+-- Note : If the user specified /NOTEST on the command
+--        line, the user will still be asked about running
+--	  the IVP, but no matter what they answer, the IVP
+--	  will NOT be run.  This is because /NOTEST
+--	  overrides the option here.
+
+    option run_ivp default yes;
+       execute test "@pcsi$destination:[systest]ssl$ivp.com/output=pcsi$destination:[systest]ssl$ivp.log";
+    end option;
+--
+    information POST_INSTALL phase after with helptext;
+    information RELEASE_NOTES phase after ;
+    information START_INSTRUCTION phase after ;
+--    information REINSTALL_PROBLEM phase after ;
+
+--
+--  And finally, define where all the files should be placed.
+--
+    directory [ssl] ;
+    file [ssl.com]ssl$pcsi.com protection private;
+--
+    file [syshlp]ssl010.release_notes release notes;
+
+    if (<software DEC AXPVMS VMS>) ;
+       directory [ssl.alpha_exe] ;
+
+       file [ssl.alpha_exe]ca.com ;
+       file [ssl.alpha_exe]openssl.exe ;
+       file [ssl.alpha_exe]ssl_task.exe ;
+--
+    end if;
+
+    if (<software DEC VAXVMS VMS>) ;
+       directory [ssl.vax_exe] ;
+       file [ssl.vax_exe]ca.com;
+--
+       directory [ssl.vax_lib] ;
+
+    end if;
+
+    file [syslib]ssl$libssl_shr.exe ;    
+    file [syslib]ssl$libcrypto_shr.exe ;    
+
+    file [syslib]ssl$libssl_shr32.exe ;    
+    file [syslib]ssl$libcrypto_shr32.exe ;    
+
+    file [ssl.alpha_exe]ssl$hostname.exe;
+    file [ssl.alpha_exe]ssl$hostaddr.exe;
+--
+    directory [ssl.conf] ;
+
+    file [ssl]openssl.cnf ;
+    file [ssl]openssl-vms.cnf ;
+
+--
+    directory [ssl.certs] ;
+--
+    directory [syshlp.examples.ssl] ;
+
+    file [syshlp.examples.ssl]ssl$bio_cli.c ;
+    file [syshlp.examples.ssl]ssl$bio_serv.c ;
+    file [syshlp.examples.ssl]ssl$cli_sess_renego.c ;
+    file [syshlp.examples.ssl]ssl$cli_sess_renego_cli_ver.c ;
+    file [syshlp.examples.ssl]ssl$cli_sess_reuse.c ;
+    file [syshlp.examples.ssl]ssl$cli_sess_reuse_cli_ver.c ;
+    file [syshlp.examples.ssl]ssl$cli_verify_client.c ;
+    file [syshlp.examples.ssl]ssl$serv_sess_renego.c ;
+    file [syshlp.examples.ssl]ssl$serv_sess_renego_cli_ver.c ;
+    file [syshlp.examples.ssl]ssl$serv_sess_reuse.c ;
+    file [syshlp.examples.ssl]ssl$serv_sess_reuse_cli_ver.c ;
+    file [syshlp.examples.ssl]ssl$serv_verify_client.c ;
+    file [syshlp.examples.ssl]ssl$simple_cli.c ;
+    file [syshlp.examples.ssl]ssl$simple_serv.c ;
+    file [syshlp.examples.ssl]ssl$examples_setup.com ;
+
+--
+    directory [ssl.include] ;
+--
+    file [ssl.include]asn1.h ;
+    file [ssl.include]asn1_mac.h;
+    file [ssl.include]bio.h;
+    file [ssl.include]blowfish.h;
+    file [ssl.include]bn.h;
+    file [ssl.include]buffer.h;
+    file [ssl.include]cast.h;
+    file [ssl.include]comp.h;
+    file [ssl.include]conf.h;
+    file [ssl.include]conf_api.h;
+    file [ssl.include]crypto.h;
+    file [ssl.include]des.h;
+    file [ssl.include]dh.h;
+    file [ssl.include]dsa.h;
+    file [ssl.include]dso.h;
+    file [ssl.include]ebcdic.h;
+    file [ssl.include]engine.h;
+    file [ssl.include]err.h;
+    file [ssl.include]evp.h;
+    file [ssl.include]e_os.h;
+    file [ssl.include]e_os2.h;
+    file [ssl.include]hmac.h;
+    file [ssl.include]idea.h;
+    file [ssl.include]lhash.h;
+    file [ssl.include]md2.h;
+    file [ssl.include]md4.h;
+    file [ssl.include]md5.h;
+    file [ssl.include]mdc2.h;
+    file [ssl.include]objects.h;
+    file [ssl.include]obj_mac.h;
+    file [ssl.include]opensslconf.h;
+    file [ssl.include]opensslv.h;
+    file [ssl.include]pem.h;
+    file [ssl.include]pem2.h;
+    file [ssl.include]pkcs12.h;
+    file [ssl.include]pkcs7.h;
+    file [ssl.include]rand.h;
+    file [ssl.include]rc2.h;
+    file [ssl.include]rc4.h;
+    file [ssl.include]rc5.h;
+    file [ssl.include]ripemd.h;
+    file [ssl.include]rsa.h;
+    file [ssl.include]safestack.h;
+    file [ssl.include]sha.h;
+    file [ssl.include]ssl.h;
+    file [ssl.include]ssl2.h;
+    file [ssl.include]ssl23.h;
+    file [ssl.include]ssl3.h;
+    file [ssl.include]stack.h;
+    file [ssl.include]symhacks.h;
+    file [ssl.include]tls1.h;
+    file [ssl.include]tmdiff.h;
+    file [ssl.include]txt_db.h;
+    file [ssl.include]x509.h;
+    file [ssl.include]x509v3.h;
+    file [ssl.include]x509_vfy.h;
+--
+    directory [ssl.lib] ;
+--
+    directory [ssl.private] ;
+
+    file [ssl.private]randfile.;
+--
+    directory [ssl.test] ;
+
+    file [ssl.test]tcrl.com;
+    file [ssl.test]testca.com; 
+    file [ssl.test]testenc.com; 
+    file [ssl.test]testgen.com; 
+    file [ssl.test]testss.com; 
+    file [ssl.test]testssl.com; 
+    file [ssl.test]tests_share.com; 
+    file [ssl.test]tpkcs7.com; 
+    file [ssl.test]tpkcs7d.com; 
+    file [ssl.test]treq.com; 
+    file [ssl.test]trsa.com; 
+    file [ssl.test]tsid.com; 
+    file [ssl.test]tverify.com; 
+    file [ssl.test]tx509.com;
+--
+    file [ssl.test]bftest.exe; 
+    file [ssl.test]bntest.exe; 
+    file [ssl.test]casttest.exe; 
+    file [ssl.test]destest.exe;
+    file [ssl.test]dhtest.exe; 
+    file [ssl.test]dsatest.exe; 
+    file [ssl.test]exptest.exe; 
+    file [ssl.test]hmactest.exe;
+    file [ssl.test]ideatest.exe; 
+    file [ssl.test]md2test.exe; 
+    file [ssl.test]md4test.exe; 
+    file [ssl.test]md5test.exe;
+    file [ssl.test]mdc2test.exe; 
+    file [ssl.test]randtest.exe; 
+    file [ssl.test]rc2test.exe; 
+    file [ssl.test]rc4test.exe;
+    file [ssl.test]rc5test.exe; 
+    file [ssl.test]rmdtest.exe; 
+    file [ssl.test]rsa_test.exe; 
+    file [ssl.test]sha1test.exe;
+    file [ssl.test]shatest.exe; 
+    file [ssl.test]ssltest.exe;
+--
+    file [systest]ssl$ivp.com;
+--
+    directory [ssl.com] ;
+
+    file [sys$startup]ssl$startup.com;
+    file [sys$startup]ssl$shutdown.com;
+
+    file [ssl.com]ssl$systartup.com;
+    file [ssl.com]ssl$syshutdown.com;
+    file [ssl.com]ssl$utils.com;
+--
+    file [ssl.com]ssl$auth_cert.com;
+    file [ssl.com]ssl$auto_cert.com;
+    file [ssl.com]ssl$cert_tool.com;
+    file [ssl.com]ssl$conf_util.com;
+    file [ssl.com]ssl$draw_box.com;
+    file [ssl.com]ssl$exit_cmd.tpu;
+    file [ssl.com]ssl$fill_box.com;
+    file [ssl.com]ssl$hash_cert.com;
+    file [ssl.com]ssl$init_env.com;
+    file [ssl.com]ssl$init_term.com;
+    file [ssl.com]ssl$pick_file.com;
+    file [ssl.com]ssl$rem_env.com;
+    file [ssl.com]ssl$rqst_cert.com;
+    file [ssl.com]ssl$self_cert.com;
+    file [ssl.com]ssl$show_file.com;
+    file [ssl.com]ssl$sign_cert.com;
+    file [ssl.com]ssl$view_cert.com;
+--
+end product ;
--- a/cpq-axpvms-ssl-t0100--1.pcsi$text
+++ b/cpq-axpvms-ssl-t0100--1.pcsi$text
@@ -0,0 +1,82 @@
+=product CPQ AXPVMS SSL T1.0 full
+1 'PRODUCT
+=prompt SSL for OpenVMS Alpha T1.0 (Based on OpenSSL 0.9.6B).
+SSL for OpenVMS provides a toolkit that implements SSL V2/V3, TLS V1,
+and a general purpose cryptography library.
+
+1 'PRODUCER
+
+1 'NOTICE
+=prompt (c) Compaq Computer Corporation 2002. All rights reserved.
+
+COMPAQ Registered in U.S. Patent and Trademark Office.
+
+Confidential computer software. Valid license from Compaq or
+authorized sublicensor required for possession, use or copying.
+Consistent with FAR 12.211 and 12.212, Commercial Computer Software,
+Computer Software Documentation, and Technical Data for Commercial
+Items are licensed to the U.S. Government under vendor's standard
+commercial license.
+
+This software is installable on OpenVMS processors using the POLYCENTER
+Software Installation utility.
+
+IMPORTANT LEGAL NOTICE:
+
+        Exports of this product are subject to U.S. Export Administration
+        Regulations pertaining to encryption items and may require that 
+        individual export authorization be obtained from the U.S. 
+        Department of Commerce.
+
+1 START_INSTRUCTION
+=prompt @SYS$STARTUP:SSL$STARTUP.COM should be run at system startup.
+Once the installation is complete, adding the following line to
+SYS$MANAGER:SYSTARTUP_VMS.COM will define the SSL$ logicals 
+in the SYSTEM logical name table:
+
+        $ @SYS$STARTUP:SSL$STARTUP.COM "/SYSTEM"
+
+It is also possible to have the logicals placed in other logical 
+name tables - EXEC,USER, etc - by replacing the SYSTEM parameter
+above with the alternate table name.
+
+
+1 RELEASE_NOTES
+=prompt Refer to SYS$HELP:SSL010.RELEASE_NOTES for more information.
+The SSL product release notes contain up to date information regarding 
+bug fixes, known problems, and general installation information.
+
+1 RUN_IVP
+=prompt Run the installation verification procedure (IVP)?
+This option determines if the installation verification
+procedure will be run as part of the installation.  The procedure 
+should take few minutes to run, depending on the processor
+speed.  If it is not run during the installation, then it
+should be run as part of the post installation procedure.
+
+1 POST_INSTALL
+=prompt There are post installation activities that need to be performed.
+This includes things like defining logical names and running SSL$UTIL.COM 
+to define some foreign symbols, and running the IVP if it was not done
+as part of the installation.  Refer the to Release Notes for more 
+information about activities that should be performed once the installation 
+has finished.  
+
+SSL has created the following directory structure in
+PCSI$DESTINATION, which defaults to SYS$SYSDEVICE:[VMS$COMMON]:
+
+ [SSL] - 
+ [SSL.ALPHA_EXE] - Contains the images for the Alpha platform. 
+ [SSL.ALPHA_LIB] - Contains the .OLBs for the Alpha platform. 
+ [SSL.CERTS] -     Directory to hold certificates 
+ [SSL.COM] -	   Directory to hold the various command procedures.
+ [SSL.CONF] -	   Contains the configuration files.
+ [SSL.INCLUDE] -   Contains the C Header (.H) files.
+ [SSL.PRIVATE] -   Files specifically for SSL use such as RANDFILE.
+ [SSL.TEST] -	   Contains the files used during the IVP.
+
+ 
+1 NOAXPVMS
+=prompt Minimum OpenVMS Alpha software not found on system, abort installation
+This kit requires a minimum OpenVMS Alpha version of V7.2.
+
--- a/crypto/Makefile.ssl
+++ b/crypto/Makefile.ssl
@@ -28,7 +28,7 @@ LIBS=

 SDIRS=	md2 md5 sha mdc2 hmac ripemd \
 	des rc2 rc4 rc5 idea bf cast \
-	bn ec rsa dsa dh dso engine aes \
+	bn ec rsa dsa ecdsa dh dso engine aes \
 	buffer bio stack lhash rand err objects \
 	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5

@@ -36,8 +36,8 @@ GENERAL=Makefile README crypto-lib.com install.com

 LIB= $(TOP)/libcrypto.a
 SHARED_LIB= libcrypto$(SHLIB_EXT)
-LIBSRC=	cryptlib.c mem.c mem_clr.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c
-LIBOBJ= cryptlib.o mem.o mem_clr.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o o_time.o
+LIBSRC=	cryptlib.c mem.c mem_dbg.c cversion.c ex_data.c tmdiff.c cpt_err.c ebcdic.c uid.c o_time.c
+LIBOBJ= cryptlib.o mem.o mem_dbg.o cversion.o ex_data.o tmdiff.o cpt_err.o ebcdic.o uid.o o_time.o

 SRC= $(LIBSRC)

@@ -54,11 +54,11 @@ all: buildinf.h lib subdirs shared

 buildinf.h: ../Makefile.ssl
 	( echo "#ifndef MK1MF_BUILD"; \
-	echo '  /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */'; \
-	echo '  #define CFLAGS "$(CC) $(CFLAG)"'; \
-	echo '  #define PLATFORM "$(PLATFORM)"'; \
+	echo "  /* auto-generated by crypto/Makefile.ssl for crypto/cversion.c */"; \
+	echo "  #define CFLAGS \"$(CC) $(CFLAG)\""; \
+	echo "  #define PLATFORM \"$(PLATFORM)\""; \
 	echo "  #define DATE \"`LC_ALL=C LC_TIME=C date`\""; \
-	echo '#endif' ) >buildinf.h
+	echo "#endif" ) >buildinf.h

 testapps:
 	if echo ${SDIRS} | fgrep ' des '; \
@@ -98,7 +98,7 @@ lib:	$(LIBOBJ)

 shared:
 	if [ -n "$(SHARED_LIBS)" ]; then \
-		(cd ..; $(MAKE) $(SHARED_LIB)); \
+		(cd ..; make $(SHARED_LIB)); \
 	fi

 libs:
@@ -136,12 +136,12 @@ lint:

 depend:
 	if [ ! -f buildinf.h ]; then touch buildinf.h; fi # fake buildinf.h if it does not exist
-	$(MAKEDEPEND) -- $(CFLAG) $(INCLUDE) $(DEPFLAG) -- $(PROGS) $(LIBSRC)
+	$(MAKEDEPEND) $(INCLUDE) $(DEPFLAG) $(PROGS) $(LIBSRC)
 	if [ ! -s buildinf.h ]; then rm buildinf.h; fi
 	@for i in $(SDIRS) ;\
 	do \
 	(cd $$i && echo "making depend in crypto/$$i..." && \
-	$(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' CFLAG='${CFLAG}' DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' PERL='${PERL}' depend ); \
+	$(MAKE) MAKEFILE='${MAKEFILE}' INCLUDES='${INCLUDES}' DEPFLAG='${DEPFLAG}' depend ); \
 	done;

 clean:
@@ -180,7 +180,7 @@ cversion.o: ../include/openssl/err.h ../include/openssl/lhash.h
 cversion.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 cversion.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 cversion.o: ../include/openssl/symhacks.h buildinf.h cryptlib.h cversion.c
-ebcdic.o: ../include/openssl/e_os2.h ../include/openssl/opensslconf.h ebcdic.c
+ebcdic.o: ../include/openssl/opensslconf.h ebcdic.c
 ex_data.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
 ex_data.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 ex_data.o: ../include/openssl/err.h ../include/openssl/lhash.h
@@ -193,10 +193,6 @@ mem.o: ../include/openssl/err.h ../include/openssl/lhash.h
 mem.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
 mem.o: ../include/openssl/safestack.h ../include/openssl/stack.h
 mem.o: ../include/openssl/symhacks.h cryptlib.h mem.c
-mem_clr.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
-mem_clr.o: ../include/openssl/opensslconf.h ../include/openssl/opensslv.h
-mem_clr.o: ../include/openssl/safestack.h ../include/openssl/stack.h
-mem_clr.o: ../include/openssl/symhacks.h mem_clr.c
 mem_dbg.o: ../e_os.h ../include/openssl/bio.h ../include/openssl/buffer.h
 mem_dbg.o: ../include/openssl/crypto.h ../include/openssl/e_os2.h
 mem_dbg.o: ../include/openssl/err.h ../include/openssl/lhash.h
--- a/Show More
+++ b/Show More