Fix null-pointer assignment in do_change_cipher_spec() revealed

by using the Codenomicon TLS Test Tool (CAN-2004-0079)

Prepare for 0.9.6m tagging and release

Submitted by: Steven Henson
Reviewed by: Joe Orton
Approved by: Mark Cox

FAQ

@@ -9,6 +9,7 @@ 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
 
@@ -29,16 +30,18 @@ OpenSSL  -  Frequently Asked Questions
 * Why can't I use OpenSSL certificates with SSL client authentication?
 * Why does my browser give a warning about a mismatched hostname?
 * How do I install a CA certificate into a browser?
-* Why is OpenSSL x509 DN output not conformant to RFC2253?
 
 [BUILD] Questions about building and testing OpenSSL
 
 * Why does the linker complain about undefined symbols?
 * Why does the OpenSSL test fail with "bc: command not found"?
 * Why does the OpenSSL test fail with "bc: 1 no implemented"?
+* Why does the OpenSSL test fail with "bc: stack empty"?
 * Why does the OpenSSL compilation fail on Alpha Tru64 Unix?
 * Why does the OpenSSL compilation fail with "ar: command not found"?
 * Why does the OpenSSL compilation fail on Win32 with VC++?
+* What is special about OpenSSL on Redhat?
+* Why does the OpenSSL test suite fail on MacOS X?
 
 [PROG] Questions about programming with OpenSSL
 
@@ -60,7 +63,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.6d was released on May 9, 2002.
+OpenSSL 0.9.7d was released on March 17, 2004.
 
 In addition to the current stable release, you can also access daily
 snapshots of the OpenSSL development version at <URL:
@@ -108,11 +111,14 @@ OpenSSL.  Information on the OpenSSL mailing lists is available from
 
 * Where can I get a compiled version of OpenSSL?
 
+You can finder pointers to binary distributions in
+http://www.openssl.org/related/binaries.html .
+
 Some applications that use OpenSSL are distributed in binary form.
 When using such an application, you don't need to install OpenSSL
 yourself; the application will include the required parts (e.g. DLLs).
 
-If you want to install OpenSSL on a Windows system and you don't have
+If you want to build OpenSSL on a Windows system and you don't have
 a C compiler, read the "Mingw32" section of INSTALL.W32 for information
 on how to obtain and install the free GNU C compiler.
 
@@ -131,6 +137,19 @@ 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?
@@ -168,18 +187,30 @@ for permission to use their software with OpenSSL.
 
 Cryptographic software needs a source of unpredictable data to work
 correctly.  Many open source operating systems provide a "randomness
-device" that serves this purpose.  On other systems, applications have
-to call the RAND_add() or RAND_seed() function with appropriate data
-before generating keys or performing public key encryption.
-(These functions initialize the pseudo-random number generator, PRNG.)
+device" (/dev/urandom or /dev/random) that serves this purpose.
+All OpenSSL versions try to use /dev/urandom by default; starting with
+version 0.9.7, OpenSSL also tries /dev/random if /dev/urandom is not
+available.
 
-Some broken applications do not do this.  As of version 0.9.5, the
-OpenSSL functions that need randomness report an error if the random
-number generator has not been seeded with at least 128 bits of
-randomness.  If this error occurs, please contact the author of the
-application you are using.  It is likely that it never worked
-correctly.  OpenSSL 0.9.5 and later make the error visible by refusing
-to perform potentially insecure encryption.
+On other systems, applications have to call the RAND_add() or
+RAND_seed() function with appropriate data before generating keys or
+performing public key encryption. (These functions initialize the
+pseudo-random number generator, PRNG.)  Some broken applications do
+not do this.  As of version 0.9.5, the OpenSSL functions that need
+randomness report an error if the random number generator has not been
+seeded with at least 128 bits of randomness.  If this error occurs and
+is not discussed in the documentation of the application you are
+using, please contact the author of that application; it is likely
+that it never worked correctly.  OpenSSL 0.9.5 and later make the
+error visible by refusing to perform potentially insecure encryption.
+
+If you are using Solaris 8, you can add /dev/urandom and /dev/random
+devices by installing patch 112438 (Sparc) or 112439 (x86), which are
+available via the Patchfinder at <URL: http://sunsolve.sun.com>
+(Solaris 9 includes these devices by default). For /dev/random support
+for earlier Solaris versions, see Sun's statement at
+<URL: http://sunsolve.sun.com/pub-cgi/retrieve.pl?doc=fsrdb/27606&zone_32=SUNWski>
+(the SUNWski package is available in patch 105710).
 
 On systems without /dev/urandom and /dev/random, it is a good idea to
 use the Entropy Gathering Demon (EGD); see the RAND_egd() manpage for
@@ -212,13 +243,6 @@ OpenSSL command line tools. Applications using the OpenSSL library
 provide their own configuration options to specify the entropy source,
 please check out the documentation coming the with application.
 
-For Solaris 2.6, Tim Nibbe <tnibbe@sprint.net> and others have suggested
-installing the SUNski package from Sun patch 105710-01 (Sparc) which
-adds a /dev/random device and make sure it gets used, usually through
-$RANDFILE.  There are probably similar patches for the other Solaris
-versions.  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?
 
@@ -344,13 +368,6 @@ DO NOT DO THIS! This command will give away your CAs private key and
 reduces its security to zero: allowing anyone to forge certificates in
 whatever name they choose.
 
-* Why is OpenSSL x509 DN output not conformant to RFC2253?
-
-The ways to print out the oneline format of the DN (Distinguished Name) have
-been extended in version 0.9.7 of OpenSSL. Using the new X509_NAME_print_ex()
-interface, the "-nameopt" option could be introduded. See the manual
-page of the "openssl x509" commandline tool for details. The old behaviour
-has however been left as default for the sake of compatibility.
 
 [BUILD] =======================================================================
 
@@ -395,6 +412,17 @@ 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
@@ -459,6 +487,52 @@ 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 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.
+
 [PROG] ========================================================================
 
 * Is OpenSSL thread-safe?
@@ -603,6 +677,7 @@ The general answer is to check the config.log file generated when running
 the OpenSSH configure script. It should contain the detailed information
 on why the OpenSSL library was not detected or considered incompatible.
 
+
 * Can I use OpenSSL's SSL library with non-blocking I/O?
 
 Yes; make sure to read the SSL_get_error(3) manual page!

INSTALL

@@ -53,15 +53,6 @@
                 This will usually require additional system-dependent options!
                 See "Note on multi-threading" below.
 
-  no-zlib       Don't try to build with support for zlib compression and
-                decompression.
-
-  zlib          Build with support for zlib compression/decompression.
-
-  zlib-dynamic  Like "zlib", but has OpenSSL load the zlib library dynamically
-                when needed.  This is only supported on systems where loading
-                of shared libraries is supported.  This is the default choice.
-
   no-shared     Don't try to create shared libraries.
 
   shared        In addition to the usual static libraries, create shared
@@ -137,8 +128,11 @@
      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 forwarded to a public mailing list).  Include the
-     output of "make report" in your message.
+     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.
 
      [If you encounter assembler error messages, try the "no-asm"
      configuration option as an immediate fix.]
@@ -156,7 +150,8 @@
      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".
+     "make report" in order to be added to the request tracker at
+     http://www.openssl.org/support/rt2.html.
 
   4. If everything tests ok, install OpenSSL with
 
@@ -290,3 +285,15 @@
  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.

INSTALL.MacOS

@@ -32,17 +32,17 @@ Installation procedure:
         to 42, change appropriately.
 (**)	If you use SUNtar, then it might have already unbinhexed the files
 	in question.
-(***)	The project file was saved with CW Pro 5.3. If you have an earlier
+(***)	The project file was saved with CW Pro 5.3. If you have earlier
 	version and it refuses to open it, then download
 	http://www.openssl.org/~appro/OpenSSL.mcp.xml and import it
 	overwriting the original OpenSSL.mcp.
-(****)	Other targets are works in progress. If you feel like giving 'em a
+(****)	Other targets are work in progress. If you feel like giving 'em a
 	shot, then you should know that OpenSSL* and Lib* targets are
 	supposed to be built with the GUSI, MacOS library which mimics
 	BSD sockets and some other POSIX APIs. The GUSI distribution is
-	expected to be found in the same directory as the openssl source tree,
-	i.e., in the parent directory to the one where this very file,
-	namely INSTALL.MacOS, resides. For more information about GUSI, see
+	expected to be found in the same directory as openssl source tree,
+	i.e. in the parent directory to the one where this very file,
+	namely INSTALL.MacOS. For more information about GUSI, see
 	http://www.iis.ee.ethz.ch/~neeri/macintosh/gusi-qa.html
 
 Finally some essential comments from our generous contributor:-)

INSTALL.OS2

@@ -1,22 +0,0 @@
- 
- Installation on OS/2
- --------------------
-
- You need to have the following tools installed:
-
-  * EMX GCC
-  * PERL
-  * GNU make
-
-
- To build the makefile, run
-
- > os2\os2-emx
-
- This will configure OpenSSL and create OS2-EMX.mak which you then use to 
- build the OpenSSL libraries & programs by running
-
- > make -f os2-emx.mak
-
- If that finishes successfully you will find the libraries and programs in the
- "out" directory.

INSTALL.VMS

@@ -33,11 +33,11 @@ Checking the distribution:
 ==========================
 
 There have been reports of places where the distribution didn't quite get
-through, for example if you've copied the tree from a NFS-mounted Unix
+through, for example if you've copied the tree from a NFS-mounted unix
 mount point.
 
 The easiest way to check if everything got through as it should is to check
-for one of the following files:
+for oen of the following files:
 
 	[.CRYPTO]OPENSSLCONF.H_IN
 	[.CRYPTO]OPENSSLCONF_H.IN
@@ -69,7 +69,7 @@ for a command procedure name xxx-LIB.COM (in the library directories)
 or MAKExxx.COM (in the program directories) and read the comments at
 the top to understand how to use them.  However, if you want to
 compile all you can get, the simplest is to use MAKEVMS.COM in the top
-directory.  The syntax is the following:
+directory.  The syntax is trhe following:
 
   @MAKEVMS <option> <rsaref-p> <debug-p> [<compiler>]
 
@@ -79,7 +79,7 @@ directory.  The syntax is the following:
       CONFIG    Just build the "[.CRYPTO]OPENSSLCONF.H" file.
       BUILDINF  Just build the "[.INCLUDE]BUILDINF.H" file.
       SOFTLINKS Just copies some files, to simulate Unix soft links.
-      BUILDALL  Same as ALL, except CONFIG, BUILDINF and SOFTLINKS aren't done.
+      BUILDALL  Same as ALL, except CONFIG, BUILDINF and SOFTILNKS aren't done.
       RSAREF    Just build the "[.xxx.EXE.RSAREF]LIBRSAGLUE.OLB" library.
       CRYPTO    Just build the "[.xxx.EXE.CRYPTO]LIBCRYPTO.OLB" library.
       SSL       Just build the "[.xxx.EXE.SSL]LIBSSL.OLB" library.
@@ -92,7 +92,7 @@ directory.  The syntax is the following:
       RSAREF    compile using the RSAREF Library
       NORSAREF  compile without using RSAREF
 
-Note 0: The RSAREF library IS NO LONGER NEEDED.  The RSA patent
+Note 0: The RASREF library IS NO LONGER NEEDED.  The RSA patent
         expires September 20, 2000, and RSA Security chose to make
         the algorithm public domain two weeks before that.
 
@@ -264,7 +264,7 @@ following before you start compiling:
 The USER_CCDISABLEWARNINGS is there because otherwise, DEC C will complain
 that those macros have been changed.
 
-Note: Currently, this is only useful for library compilation.  The
+Note: Currently, this is only usefull for library compilation.  The
       programs will still be linked with the current version of the
       C library shareable image, and will thus complain if they are
       faced with an older version of the same C library shareable image.

INSTALL.W32

@@ -82,7 +82,8 @@
  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.
+ 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.
 
  The default Win32 environment is to leave out any Windows NT specific
  features.
@@ -94,6 +95,18 @@
  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
  ---------------------------
 
@@ -112,10 +125,10 @@
  * Compiler installation:
 
    Mingw32 is available from <ftp://ftp.xraylith.wisc.edu/pub/khan/
-   gnu-win32/mingw32/gcc-2.95.2/gcc-2.95.2-msvcrt.exe>. Extract it
-   to a directory such as C:\gcc-2.95.2 and add c:\gcc-2.95.2\bin to
-   the PATH environment variable in "System Properties"; or edit and
-   run C:\gcc-2.95.2\mingw32.bat to set the PATH.
+   gnu-win32/mingw32/gcc-2.95.2/gcc-2.95.2-msvcrt.exe>. GNU make is at
+   <ftp://agnes.dida.physik.uni-essen.de/home/janjaap/mingw32/binaries/
+   make-3.76.1.zip>. Install both of them in C:\egcs-1.1.2 and run
+   C:\egcs-1.1.2\mingw32.bat to set the PATH.
 
  * Compile OpenSSL:
 
@@ -203,7 +216,7 @@
 	$ md c:\openssl\lib
 	$ md c:\openssl\include
 	$ md c:\openssl\include\openssl
-	$ copy /b inc32\*               c:\openssl\include\openssl
+	$ copy /b inc32\openssl\*       c:\openssl\include\openssl
 	$ copy /b out32dll\ssleay32.lib c:\openssl\lib
 	$ copy /b out32dll\libeay32.lib c:\openssl\lib
 	$ copy /b out32dll\ssleay32.dll c:\openssl\bin
@@ -262,5 +275,5 @@
  malloc(), free() and realloc() as the application.  However there are many
  standard library functions used by OpenSSL that call malloc() internally
  (e.g. fopen()), and OpenSSL cannot change these; so in general you cannot
- rely on CRYPTO_malloc_init() solving your problem, and you should
+ rely on CYRPTO_malloc_init() solving your problem, and you should
  consistently use the multithreaded library.

LICENSE

@@ -12,7 +12,7 @@
   ---------------
 
 /* ====================================================================
- * Copyright (c) 1998-2002 The OpenSSL Project.  All rights reserved.
+ * Copyright (c) 1998-2004 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

MacOS/GetHTTPS.src/GetHTTPS.cpp

@@ -167,7 +167,7 @@ void main(void)
 		
 		tempString[bytesRead] = '\0';
 		
-		printf("%s", tempString);
+		printf(tempString);
 	}
 	
 	printf("\n\n\n");
@@ -201,7 +201,7 @@ EXITPOINT:
 	{
 		printf("An error occurred:\n");
 		
-		printf("%s",GetErrorMessage());
+		printf(GetErrorMessage());
 	}
 	
 	

MacOS/GetHTTPS.src/MacSocket.cpp

@@ -1287,7 +1287,7 @@ EXITPOINT:
 
 //	Send some bytes
 
-int MacSocket_send(const int inSocketNum,void *inBuff,int inBuffLength)
+int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength)
 {
 OSErr			errCode = noErr;
 int				bytesSent = 0;

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,void *inBuff,int inBuffLength);
+int MacSocket_send(const int inSocketNum,const void *inBuff,int inBuffLength);
 
 
 //	If zero bytes were read in a call to MacSocket_recv(), it may be that the remote end has done a half-close

Makefile.org

@@ -24,6 +24,7 @@ INSTALLTOP=/usr/local/ssl
 # Do not edit this manually. Use Configure --openssldir=DIR do change this!
 OPENSSLDIR=/usr/local/ssl
 
+# RSAref  - Define if we are to link with RSAref.
 # NO_IDEA - Define to build without the IDEA algorithm
 # NO_RC4  - Define to build without the RC4 algorithm
 # NO_RC2  - Define to build without the RC2 algorithm
@@ -64,7 +65,6 @@ RANLIB= ranlib
 PERL= perl
 TAR= tar
 TARFLAGS= --no-recursion
-MAKEDEPPROG=makedepend
 
 # Set BN_ASM to bn_asm.o if you want to use the C version
 BN_ASM= bn_asm.o
@@ -151,28 +151,20 @@ RMD160_ASM_OBJ= asm/rm86-out.o
 #RMD160_ASM_OBJ= asm/rm86-out.o       # a.out, FreeBSD
 #RMD160_ASM_OBJ= asm/rm86bsdi.o       # bsdi
 
-# 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)'.
 SHLIB_MARK=
 
-DIRS=   crypto ssl $(SHLIB_MARK) apps test tools
+DIRS=   crypto ssl rsaref $(SHLIB_MARK) apps test tools
 SHLIBDIRS= crypto ssl
 
 # dirs in crypto to build
 SDIRS=  \
 	md2 md4 md5 sha mdc2 hmac ripemd \
 	des rc2 rc4 rc5 idea bf cast \
-	bn ec rsa dsa ecdsa dh dso engine aes \
+	bn rsa dsa dh dso \
 	buffer bio stack lhash rand err objects \
-	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui krb5
-
-# tests to perform.  "alltests" is a special word indicating that all tests
-# should be performed.
-TESTS = alltests
+	evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp
 
 MAKEFILE= Makefile.ssl
 MAKE=     make -f Makefile.ssl
@@ -198,24 +190,29 @@ BASENAME=       openssl
 NAME=           $(BASENAME)-$(VERSION)
 TARFILE=        $(NAME).tar
 WTARFILE=       $(NAME)-win.tar
-EXHEADER=       e_os2.h
+EXHEADER=       e_os.h e_os2.h
 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
+all: clean-shared Makefile.ssl sub_all
 
 sub_all:
 	@for i in $(DIRS); \
 	do \
 	if [ -d "$$i" ]; then \
 		(cd $$i && echo "making all in $$i..." && \
-		$(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}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' all ) || exit 1; \
+		$(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}' EXE_EXT='${EXE_EXT}' all ) || exit 1; \
 	else \
 		$(MAKE) $$i; \
 	fi; \
-	done;
+	done; \
+	if echo "$(DIRS)" | \
+	    egrep '(^| )(crypto|ssl)( |$$)' > /dev/null 2>&1 && \
+	   [ -n "$(SHARED_LIBS)" ]; then \
+		$(MAKE) $(SHARED_LIBS); \
+	fi
 
 libcrypto$(SHLIB_EXT): libcrypto.a
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
@@ -223,7 +220,6 @@ libcrypto$(SHLIB_EXT): libcrypto.a
 	else \
 		echo "There's no support for shared libraries on this platform" >&2; \
 	fi
-
 libssl$(SHLIB_EXT): libcrypto$(SHLIB_EXT) libssl.a
 	@if [ "$(SHLIB_TARGET)" != "" ]; then \
 		$(MAKE) SHLIBDIRS=ssl SHLIBDEPS='-lcrypto' build-shared; \
@@ -251,7 +247,8 @@ link-shared:
 		for i in $(SHLIBDIRS); do \
 			prev=lib$$i$(SHLIB_EXT); \
 			for j in $${tmp:-x}; do \
-				( set -x; ln -f -s $$prev lib$$i$$j ); \
+				( set -x; \
+				rm -f lib$$i$$j; ln -s $$prev lib$$i$$j ); \
 				prev=lib$$i$$j; \
 			done; \
 		done; \
@@ -273,9 +270,7 @@ do_gnu-shared:
 	done
 
 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/'` && \
+	my_ld=`${CC} -print-prog-name=ld 2>&1` && \
 	[ -n "$$my_ld" ] && \
 	$$my_ld -v 2>&1 | grep 'GNU ld' >/dev/null 2>&1
 
@@ -373,9 +368,10 @@ do_svr3-shared:
 		  find . -name "*.o" -print > allobjs ; \
 		  OBJS= ; export OBJS ; \
 		  for obj in `ar t lib$$i.a` ; do \
-		    OBJS="$${OBJS} `grep $$obj allobjs`" ; \
+		    OBJS="$${OBJS} `grep /$$obj allobjs`" ; \
 		  done ; \
-		  set -x; ${CC}  -G -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} \
 			$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \
 		libs="$$libs -l$$i"; \
@@ -389,13 +385,15 @@ do_svr5-shared:
 	else \
 		libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
 		( PATH=/usr/ccs/bin:$$PATH ; export PATH; \
+		  SHARE_FLAG='-G'; \
+		  (${CC} -v 2>&1 | grep gcc) > /dev/null && SHARE_FLAG='-shared'; \
 		  find . -name "*.o" -print > allobjs ; \
 		  OBJS= ; export OBJS ; \
 		  for obj in `ar t lib$$i.a` ; do \
-		    OBJS="$${OBJS} `grep $$obj allobjs`" ; \
+		    OBJS="$${OBJS} `grep /$$obj allobjs`" ; \
 		  done ; \
 		  set -x; ${CC} ${SHARED_LDFLAGS} \
-			-G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+			$${SHARE_FLAG} -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 			-h lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 			$${OBJS} $$libs ${EX_LIBS} ) || exit 1; \
 		libs="$$libs -l$$i"; \
@@ -417,42 +415,26 @@ do_irix-shared:
 	fi
 
 # This assumes that GNU utilities are *not* used
-# HP-UX includes the full pathname of libs we depend on, so we would get
-# ./libcrypto (with ./ as path information) compiled into libssl, hence
-# we omit the SHLIBDEPS. Applications must be linked with -lssl -lcrypto
-# anyway.
-# The object modules are loaded from lib$i.a using the undocumented -Fl
-# option.
-#
-# WARNING: Until DSO is fixed to support a search path, we support SHLIB_PATH
-#          by temporarily specifying "+s"!
-#
 do_hpux-shared:
-	for i in ${SHLIBDIRS}; do \
+	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
 	( set -x; /usr/ccs/bin/ld ${SHARED_LDFLAGS} \
 		+vnocompatwarnings \
-		-b -z +s \
-		-o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+		-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 		+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-		-Fl lib$$i.a -ldld -lc ) || exit 1; \
+		-Fl lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
+	chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \
+	libs="$$libs -L. -l$$i"; \
 	done
 
 # This assumes that GNU utilities are *not* used
-# HP-UX includes the full pathname of libs we depend on, so we would get
-# ./libcrypto (with ./ as path information) compiled into libssl, hence
-# we omit the SHLIBDEPS. Applications must be linked with -lssl -lcrypto
-# anyway.
-#
-# HP-UX in 64bit mode has "+s" enabled by default; it will search for
-# shared libraries along LD_LIBRARY_PATH _and_ SHLIB_PATH.
-#
 do_hpux64-shared:
-	for i in ${SHLIBDIRS}; do \
+	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
 	( set -x; /usr/ccs/bin/ld ${SHARED_LDFLAGS} \
- 		-b -z \
-		-o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
+		-b -z -o lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
 		+h lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} \
-		+forceload lib$$i.a -ldl -lc ) || exit 1; \
+		+forceload lib$$i.a $$libs ${EX_LIBS} -lc ) || exit 1; \
+	chmod a=rx lib$$i.sl.${SHLIB_MAJOR}.${SHLIB_MINOR} ; \
+	libs="$$libs -L. -l$$i"; \
 	done
 
 # The following method is said to work on all platforms.  Tests will
@@ -498,20 +480,6 @@ do_aix-shared:
 	libs="$$libs -l$$i"; \
 	done
 
-do_reliantunix-shared:
-	libs='-L. ${SHLIBDEPS}'; for i in ${SHLIBDIRS}; do \
-	tmpdir=/tmp/openssl.$$$$ ; rm -rf $$tmpdir ; \
-	( set -x; \
-	  ( Opwd=`pwd` ; mkdir $$tmpdir || exit 1; \
-	    cd $$tmpdir || exit 1 ; ar x $$Opwd/lib$$i.a ; \
-	    ${CC} -G -o lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} *.o \
-	  ) || exit 1; \
-	  cp $$tmpdir/lib$$i.so.${SHLIB_MAJOR}.${SHLIB_MINOR} . ; \
-	) || exit 1; \
-	rm -rf $$tmpdir ; \
-	libs="$$libs -l$$i"; \
-	done
-
 Makefile.ssl: Makefile.org
 	@echo "Makefile.ssl is older than Makefile.org."
 	@echo "Reconfigure the source tree (via './config' or 'perl Configure'), please."
@@ -558,10 +526,14 @@ links:
 	@for i in $(DIRS); do \
 	if [ -d "$$i" ]; then \
 		(cd $$i && echo "making links in $$i..." && \
-		$(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}' PERL='${PERL}' KRB5_INCLUDES='${KRB5_INCLUDES}' LIBKRB5='${LIBKRB5}' links ) || exit 1; \
+		$(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}' PERL='${PERL}' links ) || exit 1; \
 	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) ;\
@@ -574,21 +546,15 @@ dclean:
 
 rehash: rehash.time
 rehash.time: certs
-	@(OPENSSL="`pwd`/apps/openssl"; OPENSSL_DEBUG_MEMORY=on; \
-		export OPENSSL OPENSSL_DEBUG_MEMORY; \
-		LD_LIBRARY_PATH="`pwd`"; SHLIB_PATH="`pwd`"; LIBPATH="`pwd`"; \
-		export LD_LIBRARY_PATH SHLIB_PATH LIBPATH; \
-		$(PERL) tools/c_rehash certs)
+	@(OPENSSL="`pwd`/apps/openssl"; export OPENSSL; $(PERL) tools/c_rehash certs)
 	touch rehash.time
 
 test:   tests
 
 tests: rehash
 	@(cd test && echo "testing..." && \
-	$(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
+	$(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}' EXE_EXT='${EXE_EXT}' SHARED_LIBS='${SHARED_LIBS}' SHLIB_EXT='${SHLIB_EXT}' SHLIB_TARGET='${SHLIB_TARGET}' OPENSSL_DEBUG_MEMORY=on tests );
+	@apps/openssl version -a
 
 report:
 	@$(PERL) util/selftest.pl
@@ -598,7 +564,7 @@ depend:
 	do \
 	if [ -d "$$i" ]; then \
 		(cd $$i && echo "making dependencies $$i..." && \
-		$(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' MAKEDEPPROG='${MAKEDEPPROG}' KRB5_INCLUDES='${KRB5_INCLUDES}' depend ) || exit 1; \
+		$(MAKE) SDIRS='${SDIRS}' DEPFLAG='${DEPFLAG}' PERL='${PERL}' depend ) || exit 1; \
 	fi; \
 	done;
 
@@ -622,7 +588,6 @@ tags:
 
 errors:
 	$(PERL) util/mkerr.pl -recurse -write
-	(cd crypto/engine; $(MAKE) PERL=$(PERL) errors)
 
 stacks:
 	$(PERL) util/mkstack.pl -write
@@ -633,9 +598,9 @@ util/libeay.num::
 util/ssleay.num::
 	$(PERL) util/mkdef.pl ssl update
 
-crypto/objects/obj_dat.h: crypto/objects/obj_dat.pl crypto/objects/obj_mac.h
+crypto/objects/obj_dat.h: crypto/objects/obj_mac.h crypto/objects/obj_dat.pl
 	$(PERL) crypto/objects/obj_dat.pl crypto/objects/obj_mac.h crypto/objects/obj_dat.h
-crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num
+crypto/objects/obj_mac.h: crypto/objects/objects.pl crypto/objects/objects.txt 
 	$(PERL) crypto/objects/objects.pl crypto/objects/objects.txt crypto/objects/obj_mac.num crypto/objects/obj_mac.h
 
 TABLE: Configure
@@ -644,28 +609,29 @@ 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:
-	@$(TAR) $(TARFLAGS) -cvf - \
-		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE | sort` |\
+	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 - | \
 	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:
-	@$(TAR) $(TARFLAGS) -cvf - \
-		`find * \! -path CVS/\* \! -path \*/CVS/\* \! -name CVS \! -name .cvsignore \! -name STATUS \! -name TABLE \! -name '*.o' \! -name '*.a' \! -name '*.so' \! -name '*.so.*'  \! -name 'openssl' \! -name '*test' \! -name '.#*' \! -name '*~' | sort` |\
-	tardy --user_number=0  --user_name=openssl \
-	      --group_number=0 --group_name=openssl \
-	      --prefix=openssl-$(VERSION) - > ../$(TARFILE);\
-	ls -l ../$(TARFILE)
-
 dist:   
 	$(PERL) Configure dist
 	@$(MAKE) dist_pem_h
 	@$(MAKE) SDIRS='${SDIRS}' clean
-	@$(MAKE) tar
+	@$(MAKE) TAR='${TAR}' TARFLAGS='${TARFLAGS}' tar
 
 dist_pem_h:
 	(cd crypto/pem; $(MAKE) CC='${CC}' SDIRS='${SDIRS}' CFLAG='${CFLAG}' pem.h; $(MAKE) clean)
@@ -694,11 +660,12 @@ install: all install_docs
 	do \
 		if [ -f "$$i" ]; then \
 		(       echo installing $$i; \
-			cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
-			$(RANLIB) $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
-			chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$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 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i ); \
 		fi; \
-	done;
+	done
 	@if [ -n "$(SHARED_LIBS)" ]; then \
 		tmp="$(SHARED_LIBS)"; \
 		for i in $${tmp:-x}; \
@@ -706,20 +673,24 @@ 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; \
-					chmod 644 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
+					cp $$i $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+					chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new; \
+					mv $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i; \
 				else \
 					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; \
+					cp $$c $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+					chmod 755 $(INSTALL_PREFIX)$(INSTALLTOP)/bin/$$c.new; \
+					mv $(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 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/$$i.a; \
 				fi ); \
 			fi; \
 		done; \
 		(	here="`pwd`"; \
 			cd $(INSTALL_PREFIX)$(INSTALLTOP)/lib; \
-			make -f $$here/Makefile link-shared ); \
+			set $(MAKE); \
+			$$1 -f $$here/Makefile link-shared ); \
 	fi
 
 install_docs:
@@ -728,22 +699,25 @@ install_docs:
 		$(INSTALL_PREFIX)$(MANDIR)/man3 \
 		$(INSTALL_PREFIX)$(MANDIR)/man5 \
 		$(INSTALL_PREFIX)$(MANDIR)/man7
-	@for i in doc/apps/*.pod; do \
+	@pod2man="`cd util; ./pod2mantest $(PERL)`"; \
+	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/`basename $$i .pod`.$$sec"; \
-		(cd `dirname $$i`; \
-		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
-			 --release=$(VERSION) `basename $$i`) \
+		(cd `$(PERL) util/dirname.pl $$i`; \
+		sh -c "$$pod2man \
+			--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 \
+	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/`basename $$i .pod`.$$sec"; \
-		(cd `dirname $$i`; \
-		$(PERL) ../../util/pod2man.pl --section=$$sec --center=OpenSSL \
-			--release=$(VERSION) `basename $$i`) \
+		(cd `$(PERL) util/dirname.pl $$i`; \
+		sh -c "$$pod2man \
+			--section=$$sec --center=OpenSSL \
+			--release=$(VERSION) `basename $$i`") \
 			>  $(INSTALL_PREFIX)$(MANDIR)/man$$sec/`basename $$i .pod`.$$sec; \
 	done
 

NEWS

@@ -5,40 +5,56 @@
   This file gives a brief overview of the major changes between each OpenSSL
   release. For more details please read the CHANGES file.
 
-  Major changes between OpenSSL 0.9.6 and OpenSSL 0.9.7:
+  Major changes between OpenSSL 0.9.6l and OpenSSL 0.9.6m:
 
-      o New library section OCSP.
-      o Complete rewrite of ASN1 code.
-      o CRL checking in verify code and openssl utility.
-      o Extension copying in 'ca' utility.
-      o Flexible display options in 'ca' utility.
-      o Provisional support for international characters with UTF8.
-      o Support for external crypto devices ('engine') is no longer
-        a separate distribution.
-      o New elliptic curve library section.
-      o New AES (Rijndael) library section.
-      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 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.
-      o Finally remove references to RSAref.
-      o Reworked parts of the BIGNUM code.
-      o Support for new engines: Broadcom ubsec, Accelerated Encryption
-        Processing, IBM 4758.
-      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).
-      o SSL/TLS: allow more precise control of renegotiations and sessions.
-      o SSL/TLS: add callback to retrieve SSL/TLS messages.
-      o SSL/TLS: add draft AES ciphersuites (disabled unless explicitly requested).
+      o Security: fix null-pointer bug leading to crash
+
+  Major changes between OpenSSL 0.9.6k and OpenSSL 0.9.6l:
+
+      o Security: fix ASN1 bug leading to large recursion
+
+  Major changes between OpenSSL 0.9.6j and OpenSSL 0.9.6k:
+
+      o Security: fix various ASN1 parsing bugs.
+      o SSL/TLS protocol fix for unrequested client certificates.
+
+  Major changes between OpenSSL 0.9.6i and OpenSSL 0.9.6j:
+
+      o Security: counter the Klima-Pokorny-Rosa extension of
+        Bleichbacher's attack 
+      o Security: make RSA blinding default.
+      o Build: shared library support fixes.
+
+  Major changes between OpenSSL 0.9.6h and OpenSSL 0.9.6i:
+
+      o Important security related bugfixes.
+
+  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.
 
   Major changes between OpenSSL 0.9.6c and OpenSSL 0.9.6d:
 
@@ -91,7 +107,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 enviroments.
+      o Bug fixes for RSA operations in threaded environments.
       o Bug fixes in misc. openssl applications.
       o Remove a few potential memory leaks.
       o Add tighter checks of BIGNUM routines.

PROBLEMS

@@ -0,0 +1,58 @@
+* System libcrypto.dylib and libssl.dylib are used by system ld on MacOS X.
+[NOTE: This is currently undergoing tests, and may be removed soon]
+
+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.

README

@@ -1,7 +1,7 @@
 
- OpenSSL 0.9.8-dev XX xxx XXXX
+ OpenSSL 0.9.6m 17 Mar 2004
 
- Copyright (c) 1998-2002 The OpenSSL Project
+ Copyright (c) 1998-2004 The OpenSSL Project
  Copyright (c) 1995-1998 Eric A. Young, Tim J. Hudson
  All rights reserved.
 
@@ -122,6 +122,13 @@
  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 
  -------
 
@@ -146,11 +153,13 @@
     - Problem Description (steps that will reproduce the problem, if known)
     - Stack Traceback (if the application dumps core)
 
- Report the bug to the OpenSSL project at:
+ Report the bug to the OpenSSL project via the Request Tracker
+ (http://www.openssl.org/rt2.html) by mail to:
 
     openssl-bugs@openssl.org
 
- Note that mail to openssl-bugs@openssl.org is forwarded to a public
+ Note that mail to openssl-bugs@openssl.org is recorded in the publicly
+ readable request tracker database and is forwarded to a public
  mailing list. Confidential mail may be sent to openssl-security@openssl.org
  (PGP key available from the key servers).
 
@@ -164,7 +173,9 @@
  textual explanation of what your patch does.
 
  Note: For legal reasons, contributions from the US can be accepted only
- if a copy of the patch is sent to crypt@bxa.doc.gov
+ 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)).
 
  The preferred format for changes is "diff -u" output. You might
  generate it like this:

README.ASN1

@@ -1,187 +0,0 @@
-
-OpenSSL ASN1 Revision
-=====================
-
-This document describes some of the issues relating to the new ASN1 code.
-
-Previous OpenSSL ASN1 problems
-=============================
-
-OK why did the OpenSSL ASN1 code need revising in the first place? Well
-there are lots of reasons some of which are included below...
-
-1. The code is difficult to read and write. For every single ASN1 structure
-(e.g. SEQUENCE) four functions need to be written for new, free, encode and
-decode operations. This is a very painful and error prone operation. Very few
-people have ever written any OpenSSL ASN1 and those that have usually wish
-they hadn't.
-
-2. Partly because of 1. the code is bloated and takes up a disproportionate
-amount of space. The SEQUENCE encoder is particularly bad: it essentially
-contains two copies of the same operation, one to compute the SEQUENCE length
-and the other to encode it.
-
-3. The code is memory based: that is it expects to be able to read the whole
-structure from memory. This is fine for small structures but if you have a
-(say) 1Gb PKCS#7 signedData structure it isn't such a good idea...
-
-4. The code for the ASN1 IMPLICIT tag is evil. It is handled by temporarily
-changing the tag to the expected one, attempting to read it, then changing it
-back again. This means that decode buffers have to be writable even though they
-are ultimately unchanged. This gets in the way of constification.
-
-5. The handling of EXPLICIT isn't much better. It adds a chunk of code into 
-the decoder and encoder for every EXPLICIT tag.
-
-6. APPLICATION and PRIVATE tags aren't even supported at all.
-
-7. Even IMPLICIT isn't complete: there is no support for implicitly tagged
-types that are not OPTIONAL.
-
-8. Much of the code assumes that a tag will fit in a single octet. This is
-only true if the tag is 30 or less (mercifully tags over 30 are rare).
-
-9. The ASN1 CHOICE type has to be largely handled manually, there aren't any
-macros that properly support it.
-
-10. Encoders have no concept of OPTIONAL and have no error checking. If the
-passed structure contains a NULL in a mandatory field it will not be encoded,
-resulting in an invalid structure.
-
-11. It is tricky to add ASN1 encoders and decoders to external applications.
-
-Template model
-==============
-
-One of the major problems with revision is the sheer volume of the ASN1 code.
-Attempts to change (for example) the IMPLICIT behaviour would result in a
-modification of *every* single decode function. 
-
-I decided to adopt a template based approach. I'm using the term 'template'
-in a manner similar to SNACC templates: it has nothing to do with C++
-templates.
-
-A template is a description of an ASN1 module as several constant C structures.
-It describes in a machine readable way exactly how the ASN1 structure should
-behave. If this template contains enough detail then it is possible to write
-versions of new, free, encode, decode (and possibly others operations) that
-operate on templates.
-
-Instead of having to write code to handle each operation only a single
-template needs to be written. If new operations are needed (such as a 'print'
-operation) only a single new template based function needs to be written 
-which will then automatically handle all existing templates.
-
-Plans for revision
-==================
-
-The revision will consist of the following steps. Other than the first two
-these can be handled in any order.
- 
-o Design and write template new, free, encode and decode operations, initially
-memory based. *DONE*
-
-o Convert existing ASN1 code to template form. *IN PROGRESS*
-
-o Convert an existing ASN1 compiler (probably SNACC) to output templates
-in OpenSSL form.
-
-o Add support for BIO based ASN1 encoders and decoders to handle large
-structures, initially blocking I/O.
-
-o Add support for non blocking I/O: this is quite a bit harder than blocking
-I/O.
-
-o Add new ASN1 structures, such as OCSP, CRMF, S/MIME v3 (CMS), attribute
-certificates etc etc.
-
-Description of major changes
-============================
-
-The BOOLEAN type now takes three values. 0xff is TRUE, 0 is FALSE and -1 is
-absent. The meaning of absent depends on the context. If for example the
-boolean type is DEFAULT FALSE (as in the case of the critical flag for
-certificate extensions) then -1 is FALSE, if DEFAULT TRUE then -1 is TRUE.
-Usually the value will only ever be read via an API which will hide this from
-an application.
-
-There is an evil bug in the old ASN1 code that mishandles OPTIONAL with
-SEQUENCE OF or SET OF. These are both implemented as a STACK structure. The
-old code would omit the structure if the STACK was NULL (which is fine) or if
-it had zero elements (which is NOT OK). This causes problems because an empty
-SEQUENCE OF or SET OF will result in an empty STACK when it is decoded but when
-it is encoded it will be omitted resulting in different encodings. The new code
-only omits the encoding if the STACK is NULL, if it contains zero elements it
-is encoded and empty. There is an additional problem though: because an empty
-STACK was omitted, sometimes the corresponding *_new() function would
-initialize the STACK to empty so an application could immediately use it, if
-this is done with the new code (i.e. a NULL) it wont work. Therefore a new
-STACK should be allocated first. One instance of this is the X509_CRL list of
-revoked certificates: a helper function X509_CRL_add0_revoked() has been added
-for this purpose.
-
-The X509_ATTRIBUTE structure used to have an element called 'set' which took
-the value 1 if the attribute value was a SET OF or 0 if it was a single. Due
-to the behaviour of CHOICE in the new code this has been changed to a field
-called 'single' which is 0 for a SET OF and 1 for single. The old field has
-been deleted to deliberately break source compatibility. Since this structure
-is normally accessed via higher level functions this shouldn't break too much.
-
-The X509_REQ_INFO certificate request info structure no longer has a field
-called 'req_kludge'. This used to be set to 1 if the attributes field was
-(incorrectly) omitted. You can check to see if the field is omitted now by
-checking if the attributes field is NULL. Similarly if you need to omit
-the field then free attributes and set it to NULL.
-
-The top level 'detached' field in the PKCS7 structure is no longer set when
-a PKCS#7 structure is read in. PKCS7_is_detached() should be called instead.
-The behaviour of PKCS7_get_detached() is unaffected.
-
-The values of 'type' in the GENERAL_NAME structure have changed. This is
-because the old code use the ASN1 initial octet as the selector. The new
-code uses the index in the ASN1_CHOICE template.
-
-The DIST_POINT_NAME structure has changed to be a true CHOICE type.
-
-typedef struct DIST_POINT_NAME_st {
-int type;
-union {
-	STACK_OF(GENERAL_NAME) *fullname;
-	STACK_OF(X509_NAME_ENTRY) *relativename;
-} name;
-} DIST_POINT_NAME;
-
-This means that name.fullname or name.relativename should be set
-and type reflects the option. That is if name.fullname is set then
-type is 0 and if name.relativename is set type is 1.
-
-With the old code using the i2d functions would typically involve:
-
-unsigned char *buf, *p;
-int len;
-/* Find length of encoding */
-len = i2d_SOMETHING(x, NULL);
-/* Allocate buffer */
-buf = OPENSSL_malloc(len);
-if(buf == NULL) {
-	/* Malloc error */
-}
-/* Use temp variable because &p gets updated to point to end of
- * encoding.
- */
-p = buf;
-i2d_SOMETHING(x, &p);
-
-
-Using the new i2d you can also do:
-
-unsigned char *buf = NULL;
-int len;
-len = i2d_SOMETHING(x, &buf);
-if(len < 0) {
-	/* Malloc error */
-}
-
-and it will automatically allocate and populate a buffer with the
-encoding. After this call 'buf' will point to the start of the
-encoding which is len bytes long.

README.ENGINE

@@ -1,289 +1,63 @@
+
   ENGINE
   ======
 
-  With OpenSSL 0.9.6, a new component was added to support alternative
-  cryptography implementations, most commonly for interfacing with external
-  crypto devices (eg. accelerator cards). This component is called ENGINE,
-  and its presence in OpenSSL 0.9.6 (and subsequent bug-fix releases)
-  caused a little confusion as 0.9.6** releases were rolled in two
-  versions, a "standard" and an "engine" version. In development for 0.9.7,
-  the ENGINE code has been merged into the main branch and will be present
-  in the standard releases from 0.9.7 forwards.
+  With OpenSSL 0.9.6, a new component has been added to support external 
+  crypto devices, for example accelerator cards.  The component is called
+  ENGINE, and has still a pretty experimental status and almost no
+  documentation.  It's designed to be fairly easily extensible by the
+  calling programs.
 
-  There are currently built-in ENGINE implementations for the following
-  crypto devices:
+  There's currently built-in support for the following crypto devices:
 
       o CryptoSwift
       o Compaq Atalla
       o nCipher CHIL
-      o Nuron
-      o Broadcom uBSec
 
-  In addition, dynamic binding to external ENGINE implementations is now
-  provided by a special ENGINE called "dynamic". See the "DYNAMIC ENGINE"
-  section below for details.
+  A number of things are still needed and are being worked on:
 
-  At this stage, a number of things are still needed and are being worked on:
-
-      1 Integration of EVP support.
-      2 Configuration support.
-      3 Documentation!
-
-1 With respect to EVP, this relates to support for ciphers and digests in
-  the ENGINE model so that alternative implementations of existing
-  algorithms/modes (or previously unimplemented ones) can be provided by
-  ENGINE implementations.
-
-2 Configuration support currently exists in the ENGINE API itself, in the
-  form of "control commands". These allow an application to expose to the
-  user/admin the set of commands and parameter types a given ENGINE
-  implementation supports, and for an application to directly feed string
-  based input to those ENGINEs, in the form of name-value pairs. This is an
-  extensible way for ENGINEs to define their own "configuration" mechanisms
-  that are specific to a given ENGINE (eg. for a particular hardware
-  device) but that should be consistent across *all* OpenSSL-based
-  applications when they use that ENGINE. Work is in progress (or at least
-  in planning) for supporting these control commands from the CONF (or
-  NCONF) code so that applications using OpenSSL's existing configuration
-  file format can have ENGINE settings specified in much the same way.
-  Presently however, applications must use the ENGINE API itself to provide
-  such functionality. To see first hand the types of commands available
-  with the various compiled-in ENGINEs (see further down for dynamic
-  ENGINEs), use the "engine" openssl utility with full verbosity, ie;
-       openssl engine -vvvv
-
-3 Documentation? Volunteers welcome! The source code is reasonably well
-  self-documenting, but some summaries and usage instructions are needed -
-  moreover, they are needed in the same POD format the existing OpenSSL
-  documentation is provided in. Any complete or incomplete contributions
-  would help make this happen.
-
-  STABILITY & BUG-REPORTS
-  =======================
+      o An openssl utility command to handle or at least check available
+        engines.
+      o A better way of handling the methods that are handled by the
+        engines.
+      o Documentation!
 
   What already exists is fairly stable as far as it has been tested, but
-  the test base has been a bit small most of the time. For the most part,
-  the vendors of the devices these ENGINEs support have contributed to the
-  development and/or testing of the implementations, and *usually* (with no
-  guarantees) have experience in using the ENGINE support to drive their
-  devices from common OpenSSL-based applications. Bugs and/or inexplicable
-  behaviour in using a specific ENGINE implementation should be sent to the
-  author of that implementation (if it is mentioned in the corresponding C
-  file), and in the case of implementations for commercial hardware
-  devices, also through whatever vendor support channels are available.  If
-  none of this is possible, or the problem seems to be something about the
-  ENGINE API itself (ie. not necessarily specific to a particular ENGINE
-  implementation) then you should mail complete details to the relevant
-  OpenSSL mailing list. For a definition of "complete details", refer to
-  the OpenSSL "README" file. As for which list to send it to;
+  the test base has been a bit small most of the time.
 
-     openssl-users: if you are *using* the ENGINE abstraction, either in an
-          pre-compiled application or in your own application code.
+  Because of this experimental status and what's lacking, the ENGINE
+  component is not yet part of the default OpenSSL distribution.  However,
+  we have made a separate kit for those who want to try this out, to be
+  found in the same places as the default OpenSSL distribution, but with
+  "-engine-" being part of the kit file name.  For example, version 0.9.6
+  is distributed in the following two files:
 
-     openssl-dev: if you are discussing problems with OpenSSL source code.
+      openssl-0.9.6.tar.gz
+      openssl-engine-0.9.6.tar.gz
 
-  USAGE
+  NOTES
   =====
 
-  The default "openssl" ENGINE is always chosen when performing crypto
-  operations unless you specify otherwise. You must actively tell the
-  openssl utility commands to use anything else through a new command line
-  switch called "-engine". Also, if you want to use the ENGINE support in
-  your own code to do something similar, you must likewise explicitly
-  select the ENGINE implementation you want.
+  openssl-engine-0.9.6.tar.gz does not depend on openssl-0.9.6.tar, you do
+  not need to download both.
 
-  Depending on the type of hardware, system, and configuration, "settings"
-  may need to be applied to an ENGINE for it to function as expected/hoped.
-  The recommended way of doing this is for the application to support
-  ENGINE "control commands" so that each ENGINE implementation can provide
-  whatever configuration primitives it might require and the application
-  can allow the user/admin (and thus the hardware vendor's support desk
-  also) to provide any such input directly to the ENGINE implementation.
-  This way, applications do not need to know anything specific to any
-  device, they only need to provide the means to carry such user/admin
-  input through to the ENGINE in question. Ie. this connects *you* (and
-  your helpdesk) to the specific ENGINE implementation (and device), and
-  allows application authors to not get buried in hassle supporting
-  arbitrary devices they know (and care) nothing about.
+  openssl-engine-0.9.6.tar.gz is usable even if you don't have an external
+  crypto device.  The internal OpenSSL functions are contained in the
+  engine "openssl", and will be used by default.
 
-  A new "openssl" utility, "openssl engine", has been added in that allows
-  for testing and examination of ENGINE implementations. Basic usage
-  instructions are available by specifying the "-?" command line switch.
+  No external crypto device is chosen unless you say so.  You have actively
+  tell the openssl utility commands to use it through a new command line
+  switch called "-engine".  And if you want to use the ENGINE library to
+  do something similar, you must also explicitly choose an external crypto
+  device, or the built-in crypto routines will be used, just as in the
+  default OpenSSL distribution.
 
-  DYNAMIC ENGINES
-  ===============
-
-  The new "dynamic" ENGINE provides a low-overhead way to support ENGINE
-  implementations that aren't pre-compiled and linked into OpenSSL-based
-  applications. This could be because existing compiled-in implementations
-  have known problems and you wish to use a newer version with an existing
-  application. It could equally be because the application (or OpenSSL
-  library) you are using simply doesn't have support for the ENGINE you
-  wish to use, and the ENGINE provider (eg. hardware vendor) is providing
-  you with a self-contained implementation in the form of a shared-library.
-  The other use-case for "dynamic" is with applications that wish to
-  maintain the smallest foot-print possible and so do not link in various
-  ENGINE implementations from OpenSSL, but instead leaves you to provide
-  them, if you want them, in the form of "dynamic"-loadable
-  shared-libraries. It should be possible for hardware vendors to provide
-  their own shared-libraries to support arbitrary hardware to work with
-  applications based on OpenSSL 0.9.7 or later. If you're using an
-  application based on 0.9.7 (or later) and the support you desire is only
-  announced for versions later than the one you need, ask the vendor to
-  backport their ENGINE to the version you need.
-
-  How does "dynamic" work?
-  ------------------------
-    The dynamic ENGINE has a special flag in its implementation such that
-    every time application code asks for the 'dynamic' ENGINE, it in fact
-    gets its own copy of it. As such, multi-threaded code (or code that
-    multiplexes multiple uses of 'dynamic' in a single application in any
-    way at all) does not get confused by 'dynamic' being used to do many
-    independent things. Other ENGINEs typically don't do this so there is
-    only ever 1 ENGINE structure of its type (and reference counts are used
-    to keep order). The dynamic ENGINE itself provides absolutely no
-    cryptographic functionality, and any attempt to "initialise" the ENGINE
-    automatically fails. All it does provide are a few "control commands"
-    that can be used to control how it will load an external ENGINE
-    implementation from a shared-library. To see these control commands,
-    use the command-line;
-
-       openssl engine -vvvv dynamic
-
-    The "SO_PATH" control command should be used to identify the
-    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.
-    "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
-    loaded ENGINE to be discoverable by application code later on using the
-    ENGINE's "id". For most applications, this isn't necessary - but some
-    application authors may have nifty reasons for using it. The "LOAD"
-    command is the only one that takes no parameters and is the command
-    that uses the settings from any previous commands to actually *load*
-    the shared-library ENGINE implementation. If this command succeeds, the
-    (copy of the) 'dynamic' ENGINE will magically morph into the ENGINE
-    that has been loaded from the shared-library. As such, any control
-    commands supported by the loaded ENGINE could then be executed as per
-    normal. Eg. if ENGINE "foo" is implemented in the shared-library
-    "libfoo.so" and it supports some special control command "CMD_FOO", the
-    following code would load and use it (NB: obviously this code has no
-    error checking);
-
-       ENGINE *e = ENGINE_by_id("dynamic");
-       ENGINE_ctrl_cmd_string(e, "SO_PATH", "/lib/libfoo.so", 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);
-
-    For testing, the "openssl engine" utility can be useful for this sort
-    of thing. For example the above code excerpt would achieve much the
-    same result as;
-
-       openssl engine dynamic \
-                 -pre SO_PATH:/lib/libfoo.so \
-                 -pre ENGINE_ID:foo \
-                 -pre LOAD \
-                 -pre "CMD_FOO:some input data"
-
-    Or to simply see the list of commands supported by the "foo" ENGINE;
-
-       openssl engine -vvvv dynamic \
-                 -pre SO_PATH:/lib/libfoo.so \
-                 -pre ENGINE_ID:foo \
-                 -pre LOAD
-
-    Applications that support the ENGINE API and more specifically, the
-    "control commands" mechanism, will provide some way for you to pass
-    such commands through to ENGINEs. As such, you would select "dynamic"
-    as the ENGINE to use, and the parameters/commands you pass would
-    control the *actual* ENGINE used. Each command is actually a name-value
-    pair and the value can sometimes be omitted (eg. the "LOAD" command).
-    Whilst the syntax demonstrated in "openssl engine" uses a colon to
-    separate the command name from the value, applications may provide
-    their own syntax for making that separation (eg. a win32 registry
-    key-value pair may be used by some applications). The reason for the
-    "-pre" syntax in the "openssl engine" utility is that some commands
-    might be issued to an ENGINE *after* it has been initialised for use.
-    Eg. if an ENGINE implementation requires a smart-card to be inserted
-    during initialisation (or a PIN to be typed, or whatever), there may be
-    a control command you can issue afterwards to "forget" the smart-card
-    so that additional initialisation is no longer possible. In
-    applications such as web-servers, where potentially volatile code may
-    run on the same host system, this may provide some arguable security
-    value. In such a case, the command would be passed to the ENGINE after
-    it has been initialised for use, and so the "-post" switch would be
-    used instead. Applications may provide a different syntax for
-    supporting this distinction, and some may simply not provide it at all
-    ("-pre" is almost always what you're after, in reality).
-
-  How do I build a "dynamic" ENGINE?
-  ----------------------------------
-    This question is trickier - currently OpenSSL bundles various ENGINE
-    implementations that are statically built in, and any application that
-    calls the "ENGINE_load_builtin_engines()" function will automatically
-    have all such ENGINEs available (and occupying memory). Applications
-    that don't call that function have no ENGINEs available like that and
-    would have to use "dynamic" to load any such ENGINE - but on the other
-    hand such applications would only have the memory footprint of any
-    ENGINEs explicitly loaded using user/admin provided control commands.
-    The main advantage of not statically linking ENGINEs and only using
-    "dynamic" for hardware support is that any installation using no
-    "external" ENGINE suffers no unnecessary memory footprint from unused
-    ENGINEs. Likewise, installations that do require an ENGINE incur the
-    overheads from only *that* ENGINE once it has been loaded.
-
-    Sounds good? Maybe, but currently building an ENGINE implementation as
-    a shared-library that can be loaded by "dynamic" isn't automated in
-    OpenSSL's build process. It can be done manually quite easily however.
-    Such a shared-library can either be built with any OpenSSL code it
-    needs statically linked in, or it can link dynamically against OpenSSL
-    if OpenSSL itself is built as a shared library. The instructions are
-    the same in each case, but in the former (statically linked any
-    dependencies on OpenSSL) you must ensure OpenSSL is built with
-    position-independent code ("PIC"). The default OpenSSL compilation may
-    already specify the relevant flags to do this, but you should consult
-    with your compiler documentation if you are in any doubt.
-
-    This example will show building the "atalla" ENGINE in the
-    crypto/engine/ directory as a shared-library for use via the "dynamic"
-    ENGINE.
-    1) "cd" to the crypto/engine/ directory of a pre-compiled OpenSSL
-       source tree.
-    2) Recompile at least one source file so you can see all the compiler
-       flags (and syntax) being used to build normally. Eg;
-           touch hw_atalla.c ; make
-       will rebuild "hw_atalla.o" using all such flags.
-    3) Manually enter the same compilation line to compile the
-       "hw_atalla.c" file but with the following two changes;
-         (a) add "-DENGINE_DYNAMIC_SUPPORT" to the command line switches,
-	 (b) change the output file from "hw_atalla.o" to something new,
-             eg. "tmp_atalla.o"
-    4) Link "tmp_atalla.o" into a shared-library using the top-level
-       OpenSSL libraries to resolve any dependencies. The syntax for doing
-       this depends heavily on your system/compiler and is a nightmare
-       known well to anyone who has worked with shared-library portability
-       before. 'gcc' on Linux, for example, would use the following syntax;
-          gcc -shared -o dyn_atalla.so tmp_atalla.o -L../.. -lcrypto
-    5) Test your shared library using "openssl engine" as explained in the
-       previous section. Eg. from the top-level directory, you might try;
-          apps/openssl engine -vvvv dynamic \
-              -pre SO_PATH:./crypto/engine/dyn_atalla.so -pre LOAD
-       If the shared-library loads successfully, you will see both "-pre"
-       commands marked as "SUCCESS" and the list of control commands
-       displayed (because of "-vvvv") will be the control commands for the
-       *atalla* ENGINE (ie. *not* the 'dynamic' ENGINE). You can also add
-       the "-t" switch to the utility if you want it to try and initialise
-       the atalla ENGINE for use to test any possible hardware/driver
-       issues.
 
   PROBLEMS
   ========
 
-  It seems like the ENGINE part doesn't work too well with CryptoSwift on Win32.
-  A quick test done right before the release showed that trying "openssl speed
-  -engine cswift" generated errors. If the DSO gets enabled, an attempt is made
-  to write at memory address 0x00000002.
+  It seems like the ENGINE part doesn't work too well with CryptoSwift on
+  Win32.  A quick test done right before the release showed that trying
+  "openssl speed -engine cswift" generated errors.  If the DSO gets enabled,
+  an attempt is made to write at memory address 0x00000002.
 

STATUS

@@ -1,10 +1,24 @@
 
   OpenSSL STATUS                           Last modified at
-  ______________                           $Date: 2002/05/16 10:01:53 $
+  ______________                           $Date: 2004/03/17 11:40:42 $
 
   DEVELOPMENT STATE
 
-    o  OpenSSL 0.9.7:  Under development...
+    o  OpenSSL 0.9.8:  Under development...
+    o  OpenSSL 0.9.7d: Released on March     17th, 2004
+    o  OpenSSL 0.9.7c: Released on September 30th, 2003
+    o  OpenSSL 0.9.7b: Released on April     10th, 2003
+    o  OpenSSL 0.9.7a: Released on February  19th, 2003
+    o  OpenSSL 0.9.7:  Released on December  31st, 2002
+    o  OpenSSL 0.9.6m: Released on March     17th, 2004
+    o  OpenSSL 0.9.6l: Released on November   4th, 2003
+    o  OpenSSL 0.9.6k: Released on September 30th, 2003
+    o  OpenSSL 0.9.6j: Released on April     10th, 2003
+    o  OpenSSL 0.9.6i: Released on February  19th, 2003
+    o  OpenSSL 0.9.6h: Released on December   5th, 2002
+    o  OpenSSL 0.9.6g: Released on August     9th, 2002
+    o  OpenSSL 0.9.6f: Released on August     8th, 2002
+    o  OpenSSL 0.9.6e: Released on July      30th, 2002
     o  OpenSSL 0.9.6d: Released on May        9th, 2002
     o  OpenSSL 0.9.6c: Released on December  21st, 2001
     o  OpenSSL 0.9.6b: Released on July       9th, 2001
@@ -18,12 +32,9 @@
     o  OpenSSL 0.9.2b: Released on March     22th, 1999
     o  OpenSSL 0.9.1c: Released on December  23th, 1998
 
-  [See also http://www.openssl.org/support/rt2.html]
-
   RELEASE SHOWSTOPPERS
 
-    o BN_mod_mul verification fails for mips3-sgi-irix
-      unless configured with no-asm
+    o none
 
   AVAILABLE PATCHES
 
@@ -54,13 +65,13 @@
 
     o  apps/ca.c: "Sign the certificate?" - "n" creates empty certificate file
 
+    o  Whenever strncpy is used, make sure the resulting string is NULL-terminated
+       or an error is reported
+
     o  "OpenSSL STATUS" is never up-to-date.
 
   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
@@ -85,11 +96,23 @@
                     which apparently is not flexible enough to generate
                     libcrypto)
 
-  WISHES
 
-    o  Add variants of DH_generate_parameters() and BN_generate_prime() [etc?]
-       where the callback function can request that the function be aborted.
-       [Gregory Stark <ghstark@pobox.com>, <rayyang2000@yahoo.com>]
+    o  The perl/ stuff needs a major overhaul. Currently it's
+       totally obsolete. Either we clean it up and enhance it to be up-to-date
+       with the C code or we also could replace it with the really nice
+       Net::SSLeay package we can find under
+       http://www.neuronio.pt/SSLeay.pm.html.  Ralf uses this package for a
+       longer time and it works fine and is a nice Perl module. Best would be
+       to convince the author to work for the OpenSSL project and create a
+       Net::OpenSSL or Crypt::OpenSSL package out of it and maintains it for
+       us.
+
+       Status: Ralf thinks we should both contact the author of Net::SSLeay
+               and look how much effort it is to bring Eric's perl/ stuff up
+               to date.
+               Paul +1
+
+  WISHES
 
     o  SRP in TLS.
        [wished by:

VMS/cert_tool/hostaddr.c

@@ -1,477 +0,0 @@
-
-#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 */

VMS/cert_tool/hostname.c

@@ -1,513 +0,0 @@
-
-#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 */

VMS/cert_tool/ssl$auth_cert.com

@@ -1,639 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$auto_cert.com

@@ -1,101 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$cert_tool.com

@@ -1,231 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$conf_util.com

@@ -1,220 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$draw_box.com

@@ -1,109 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$exit_cmd.tpu

@@ -1 +0,0 @@
-EXIT

VMS/cert_tool/ssl$fill_box.com

@@ -1,65 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$hash_cert.com

@@ -1,235 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$init_env.com

@@ -1,61 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$init_term.com

@@ -1,55 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$pick_file.com

@@ -1,230 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$rem_env.com

@@ -1,62 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$rqst_cert.com

@@ -1,769 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$self_cert.com

@@ -1,725 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$show_file.com

@@ -1,205 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$sign_cert.com

@@ -1,759 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/cert_tool/ssl$view_cert.com

@@ -1,245 +0,0 @@
-$!
-$!------------------------------------------------------------------------------
-$! 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

VMS/install.com

@@ -26,129 +26,47 @@ $	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_SSLCOM:") .EQS. "" THEN -
-	   CREATE/DIR/LOG WRK_SSLROOT:[COM]
+$	IF F$PARSE("WRK_SSLROOT:[VMS]") .EQS. "" THEN -
+	   CREATE/DIR/LOG WRK_SSLROOT:[VMS]
 $
 $	IF F$SEARCH("WRK_SSLINCLUDE:vms_idhacks.h") .NES. "" THEN -
 	   DELETE WRK_SSLINCLUDE:vms_idhacks.h;*
 $
-$	OPEN/WRITE SF WRK_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"
+$	OPEN/WRITE SF WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM
+$	WRITE SYS$OUTPUT "%OPEN-I-CREATED,  ",F$SEARCH("WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM")," created."
+$	WRITE SF "$! Startup file for Openssl 0.9.2-RL 15-Mar-1999"
 $	WRITE SF "$!"
 $	WRITE SF "$! Do not edit this file, as it will be regenerated during next installation."
-$	WRITE SF "$! Instead, add or change SSL$COM:SSL$SYSTARTUP.COM"
+$	WRITE SF "$! Instead, add or change SSLROOT:[VMS]OPENSSL_SYSTARTUP.COM"
 $	WRITE SF "$!"
+$	WRITE SF "$! P1	a qualifier to DEFINE.  For example ""/SYSTEM"" to get the logical names"
+$	WRITE SF "$!	defined in the system logical name table."
 $	WRITE SF "$!"
 $	WRITE SF "$	ARCH = ""VAX"""
 $	WRITE SF "$	IF F$GETSYI(""CPU"") .GE. 128 THEN ARCH = ""ALPHA"""
-$	WRITE SF "$!"
-$	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 "$	DEFINE/NOLOG'P1	SSLROOT		",ROOT,".] /TRANS=CONC"
+$	WRITE SF "$	DEFINE/NOLOG'P1	SSLLIB		SSLROOT:['ARCH'_LIB]"
+$	WRITE SF "$	DEFINE/NOLOG'P1	SSLINCLUDE	SSLROOT:[INCLUDE]"
+$	WRITE SF "$	DEFINE/NOLOG'P1	SSLEXE		SSLROOT:['ARCH'_EXE]"
+$	WRITE SF "$	DEFINE/NOLOG'P1	SSLCERTS	SSLROOT:[CERTS]"
+$	WRITE SF "$	DEFINE/NOLOG'P1	SSLPRIVATE	SSLROOT:[PRIVATE]"
 $	WRITE SF "$"
 $	WRITE SF "$!	This is program can include <openssl/{foo}.h>"
-$	WRITE SF "$	DEFINE/NOLOG/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 "$	DEFINE/NOLOG'P1	OPENSSL		SSLINCLUDE:"
+$	WRITE SF "$"
+$	WRITE SF "$	IF F$SEARCH(""SSLROOT:[VMS]OPENSSL_SYSTARTUP.COM"") .NES."""" THEN -"
+$	WRITE SF "	   @SSLROOT:[VMS]OPENSSL_SYSTARTUP.COM"
 $	WRITE SF "$"
 $	WRITE SF "$	EXIT"
 $	CLOSE SF
-$	SET FILE/PROT=WORLD:RE WRK_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
-$!
+$	SET FILE/PROT=WORLD:RE WRK_SSLROOT:[VMS]OPENSSL_STARTUP.COM
+$
+$	COPY OPENSSL_UTILS.COM WRK_SSLROOT:[VMS]/LOG
+$	SET FILE/PROT=WORLD:RE WRK_SSLROOT:[VMS]OPENSSL_UTILS.COM
+$
 $	EXIT

VMS/mkshared.com

@@ -1,490 +0,0 @@
-$! MKSHARED.COM -- script to created shareable images on VMS
-$!
-$! 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
-$!
-$! 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..."
-$   exit
-$ endif
-$
-$ if f$getsyi("CPU") .ge. 128
-$ then
-$   libid  = "Crypto"
-$   libnum = "[.UTIL]LIBEAY.NUM"
-$   libdir = "[.AXP.EXE.CRYPTO]"
-$   libolb = "''libdir'LIBCRYPTO''build_bits'.OLB"
-$   libopt = "''libdir'LIBCRYPTO.OPT"
-$   libmap = "''libdir'LIBCRYPTO.MAP"
-$   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''build_bits'.OLB"
-$   libopt = "''libdir'LIBSSL.OPT"
-$   libmap = "''libdir'LIBSSL.MAP"
-$   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"
-$   libid  = "Crypto"
-$   libnum = "[.UTIL]LIBEAY.NUM"
-$   libdir = "[.VAX.EXE.CRYPTO]"
-$   libmar = "''libdir'LIBCRYPTO.MAR"
-$   libolb = "''libdir'LIBCRYPTO''build_bits.OLB"
-$   libopt = "''libdir'LIBCRYPTO.OPT"
-$   libobj = "''libdir'LIBCRYPTO.OBJ"
-$   libmap = "''libdir'LIBCRYPTO.MAP"
-$   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
-$   libtit = "SSL_TRANSFER_VECTOR"
-$   libid  = "SSL"
-$   libnum = "[.UTIL]SSLEAY.NUM"
-$   libdir = "[.VAX.EXE.SSL]"
-$   libmar = "''libdir'LIBSSL.MAR"
-$   libolb = "''libdir'LIBSSL''build_bits'.OLB"
-$   libopt = "''libdir'LIBSSL.OPT"
-$   libobj = "''libdir'LIBSSL.OBJ"
-$   libmap = "''libdir'LIBSSL.MAP"
-$   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
-$ exit
-$
-$! ----- Soubroutines to actually build the shareable libraries
-$! The way things work, there's a main shareable library creator for each
-$! supported architecture, which is called from the main code above.
-$! The creator will define a number of variables to tell the next levels of
-$! subroutines what routines to use to write to the option files, call the
-$! main processor, read_func_num, and when that is done, it will write version
-$! data at the end of the .opt file, close it, and link the library.
-$!
-$! read_func_num reads through a .num file and calls the writer routine for
-$! each line.  It's also responsible for checking that order is properly kept
-$! 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
-$!
-$! read_func_num depends on the following variables from the creator:
-$! libwriter    The name of the writer routine to call for each .num file line
-$! -----
-$
-$! ----- Subroutines for AXP
-$! -----
-$! 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=(-"
-$   libfirstentry := true
-$   libwrch   := opt
-$   libwriter := write_axp_transfer_entry
-$   textcount = 0
-$   gosub read_func_num
-$   write opt ")"
-$   write opt "GSMATCH=",libvmatch,",",libver
-$   close opt
-$   link/map='libmap'/full/share='libgoal' 'libopt'/option
-$   return
-$
-$! The record writer routine
-$ write_axp_transfer_entry:
-$   if libentry .eqs. ".dummy" then return
-$   if info_kind .eqs. "VARIABLE"
-$   then
-$     pr:=DATA
-$   else
-$     pr:=PROCEDURE
-$   endif
-$   textcount_this = f$length(pr) + f$length(libentry) + 5
-$   if textcount + textcount_this .gt. 1024
-$   then
-$     write opt ")"
-$     write opt "SYMBOL_VECTOR=(-"
-$     textcount = 16
-$     libfirstentry := true
-$   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 VAX
-$! -----
-$! The creator routine
-$ create_vax_shr:
-$   open/write mar 'libmar'
-$   type sys$input:/out=mar:
-;
-; Transfer vector for VAX shareable image
-;
-$   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 TRANSFER_ENTRY
-;
-; Place entries in own program section.
-;
-$   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
-$   gosub read_func_num
-$   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"
-$   close mar
-$   open/write opt 'libopt'
-$   write opt "identification=""",libid," ",libverstr,""""
-$   write opt libobj
-$   write opt libolb,"/lib"
-$   if libref .nes. "" then write opt libref,"/SHARE"
-$   type sys$input:/out=opt:
-!
-! Ensure transfer vector is at beginning of image
-!
-CLUSTER=FIRST
-$   write opt "COLLECT=FIRST,$$",libvec
-$   write opt "GSMATCH=",libvmatch,",",libver
-$   type sys$input:/out=opt:
-!
-! make psects nonshareable so image can be installed.
-!
-PSECT_ATTR=$CHAR_STRING_CONSTANTS,NOWRT
-$   libwrch   := opt
-$   libwriter := write_vax_psect_attr
-$   gosub read_var_num
-$   close opt
-$   macro/obj='libobj' 'libmar'
-$   link/map='libmap'/full/share='libgoal' 'libopt'/option
-$   return
-$
-$! The record writer routine for VAX functions
-$ write_vax_ftransfer_entry:
-$   if info_kind .nes. "FUNCTION" then return
-$   if libentry .eqs ".dummy"
-$   then
-$     write 'libwrch' " .BLKB 8" ! Dummy is zeroes...
-$   else
-$     write 'libwrch' " FTRANSFER_ENTRY ",libentry
-$   endif
-$   return
-$! The record writer routine for VAX variables (should never happen!)
-$ write_vax_psect_attr:
-$   if info_kind .nes. "VARIABLE" then return
-$   if libentry .eqs ".dummy" then return
-$   write 'libwrch' "PSECT_ATTR=",libentry,",NOSHR"
-$   return
-$
-$! ----- Common subroutines
-$! -----
-$! The .num file reader.  This one has great responsability.
-$ read_func_num:
-$   open libnum 'libnum'
-$   goto read_nums
-$
-$ read_nums:
-$   libentrynum=0
-$   liblastentry:=false
-$   entrycount=0
-$   loop:
-$     read/end=loop_end/err=loop_end libnum line
-$     entrynum=f$int(f$element(1," ",f$edit(line,"COMPRESS,TRIM")))
-$     entryinfo=f$element(2," ",f$edit(line,"COMPRESS,TRIM"))
-$     curentry=f$element(0," ",f$edit(line,"COMPRESS,TRIM"))
-$     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
-$     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 .eqs. ","
-$       then
-$	  goto endloop1
-$       else
-$         if f$extract(0,1,plat_entry) .nes. "!" then negatives = 0
-$         if f$getsyi("CPU") .lt. 128
-$         then
-$           if plat_entry .eqs. "EXPORT_VAR_AS_FUNCTION" then -
-$             truesum = truesum + 1
-$           if plat_entry .eqs. "!EXPORT_VAR_AS_FUNCTION" then -
-$             falsesum = falsesum + 1
-$         endif
-$         if plat_entry .eqs. "VMS" 
-$	  then 
-$		truesum = truesum + 1
-$!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!$     endif
-$     if falsesum .ne. 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)
-$!DEBUG!$ write sys$output "alg entry = ",alg_entry
-$       alg_i = alg_i + 1
-$       if alg_entry .eqs. "" then goto loop2
-$       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
-$       endif
-$	goto loop2
-$!
-$     endloop2:
-$     if info_platforms - "EXPORT_VAR_AS_FUNCTION" .nes. info_platforms
-$     then
-$!DEBUG!$     write sys$output curentry," ; ",entrynum," ; ",entryinfo
-$     endif
-$   redo:
-$     next:=loop
-$     tolibentry=curentry
-$     if libentrynum .ne. entrynum
-$     then
-$       entrycount=entrycount+1
-$       if entrycount .lt. entrynum
-$       then
-$!DEBUG!$         write sys$output "Info: entrycount: ''entrycount', entrynum: ''entrynum' => 0"
-$         tolibentry=".dummy"
-$         next:=redo
-$       endif
-$       if entrycount .gt. entrynum
-$       then
-$         write sys$error "Decreasing library entry numbers!  Can't continue"
-$         write sys$error """",line,""""
-$         close libnum
-$         return
-$       endif
-$       libentry=tolibentry
-$!DEBUG!$       write sys$output entrycount," ",libentry," ",entryinfo
-$       if libentry .nes. "" .and. libwriter .nes. "" then gosub 'libwriter'
-$     else
-$       write sys$error "Info: ""''curentry'"" is an alias for ""''libentry'"".  Overriding..."
-$     endif
-$     libentrynum=entrycount
-$     goto 'next'
-$   loop_end:
-$   close libnum
-$   return
-$!
-$! The version number reader
-$!
-$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
-$     libverstr = f$element(1,"""",rvi_line)
-$     libvmajor = f$element(0,".",libverstr)
-$     libvminor = f$element(1,".",libverstr)
-$     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))
-$     if libvmajor .eqs. "0"
-$     then
-$       libvmatch = "EQUAL"
-$     else
-$       ! Starting with the 1.0 release, backward compatibility should be
-$       ! kept, so switch over to the following
-$       libvmatch = "LEQUAL"
-$     endif
-$   endloop_rvi:
-$   close vf
-$   return

VMS/ssl$syshutdown.com

@@ -1,8 +0,0 @@
-$!
-$! 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
-$!

VMS/ssl$systartup.com

@@ -1,7 +0,0 @@
-$!
-$!
-$!  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.;
-$!

VMS/ssl$utils.com

@@ -1,76 +0,0 @@
-$!
-$!  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

VMS/ssl010.release_notes

@@ -1,25 +0,0 @@
-
-      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.
-

VMS/tcpip_shr_decc.opt

@@ -1 +0,0 @@
-sys$share:tcpip$ipc_shr.exe/share

apps/CA.pl.in

@@ -5,7 +5,7 @@
 #      things easier between now and when Eric is convinced to fix it :-)
 #
 # CA -newca ... will setup the right stuff
-# CA -newreq[-nodes] ... will generate a certificate request 
+# CA -newreq ... will generate a certificate request 
 # CA -sign ... will sign the generated request and output 
 #
 # At the end of that grab newreq.pem and newcert.pem (one has the key 
@@ -54,7 +54,7 @@ $RET = 0;
 
 foreach (@ARGV) {
 	if ( /^(-\?|-h|-help)$/ ) {
-	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
+	    print STDERR "usage: CA -newcert|-newreq|-newca|-sign|-verify\n";
 	    exit 0;
 	} elsif (/^-newcert$/) {
 	    # create a certificate
@@ -66,11 +66,6 @@ foreach (@ARGV) {
 	    system ("$REQ -new -keyout newreq.pem -out newreq.pem $DAYS");
 	    $RET=$?;
 	    print "Request (and private key) is in newreq.pem\n";
-	} elsif (/^-newreq-nodes$/) {
-	    # create a certificate request
-	    system ("$REQ -new -nodes -keyout newreq.pem -out newreq.pem $DAYS");
-	    $RET=$?;
-	    print "Request (and private key) is in newreq.pem\n";
 	} elsif (/^-newca$/) {
 		# if explicitly asked for or it doesn't exist then setup the
 		# directory structure that Eric likes to manage things 
@@ -148,7 +143,7 @@ foreach (@ARGV) {
 	    }
 	} else {
 	    print STDERR "Unknown arg $_\n";
-	    print STDERR "usage: CA -newcert|-newreq|-newreq-nodes|-newca|-sign|-verify\n";
+	    print STDERR "usage: CA -newcert|-newreq|-newca|-sign|-verify\n";
 	    exit 1;
 	}
 }

apps/app_rand.c

@@ -124,7 +124,7 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
 	int consider_randfile = (file == NULL);
 	char buffer[200];
 	
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 	BIO_printf(bio_e,"Loading 'screen' into random state -");
 	BIO_flush(bio_e);
 	RAND_screen();
@@ -142,9 +142,7 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
 		}
 	if (file == NULL || !RAND_load_file(file, -1))
 		{
-		if (RAND_status() == 0)
-			{
-			if (!dont_warn)
+		if (RAND_status() == 0 && !dont_warn)
 			{
 			BIO_printf(bio_e,"unable to load 'random state'\n");
 			BIO_printf(bio_e,"This means that the random number generator has not been seeded\n");
@@ -157,7 +155,6 @@ int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn)
 			}
 		return 0;
 		}
-		}
 	seeded = 1;
 	return 1;
 	}

apps/apps.c

@@ -55,59 +55,6 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -119,41 +66,14 @@
 #undef NON_MAIN
 #include <openssl/err.h>
 #include <openssl/x509.h>
-#include <openssl/x509v3.h>
 #include <openssl/pem.h>
 #include <openssl/pkcs12.h>
-#include <openssl/ui.h>
 #include <openssl/safestack.h>
-#include <openssl/engine.h>
 
-#ifdef OPENSSL_SYS_WINDOWS
-#define strcasecmp _stricmp
-#else
-#include <strings.h>
-#endif
-
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 #  include "bss_file.c"
 #endif
 
-typedef struct {
-	char *name;
-	unsigned long flag;
-	unsigned long mask;
-} NAME_EX_TBL;
-
-static UI_METHOD *ui_method = NULL;
-
-static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl);
-static int set_multi_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl);
-
-#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
-/* Looks like this stuff is worth moving into separate function */
-static EVP_PKEY *
-load_netscape_key(BIO *err, BIO *key, const char *file,
-		const char *key_descrip, int format);
-#endif
-
 int app_init(long mesgwin);
 #ifdef undef /* never finished - probably never will be :-) */
 int args_from_file(char *file, int *argc, char **argv[])
@@ -250,13 +170,11 @@ int str2fmt(char *s)
 		|| (strcmp(s,"PKCS12") == 0) || (strcmp(s,"pkcs12") == 0)
 		|| (strcmp(s,"P12") == 0) || (strcmp(s,"p12") == 0))
 		return(FORMAT_PKCS12);
-	else if ((*s == 'E') || (*s == 'e'))
-		return(FORMAT_ENGINE);
 	else
 		return(FORMAT_UNDEF);
 	}
 
-#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16)
+#if defined(MSDOS) || defined(WIN32) || defined(WIN16)
 void program_name(char *in, char *out, int size)
 	{
 	int i,n;
@@ -294,7 +212,7 @@ void program_name(char *in, char *out, int size)
 	out[n]='\0';
 	}
 #else
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 void program_name(char *in, char *out, int size)
 	{
 	char *p=in, *q;
@@ -310,10 +228,17 @@ void program_name(char *in, char *out, int size)
 
 	q=strrchr(p,'.');
 	if (q == NULL)
-		q = in+size;
-	strncpy(out,p,q-p);
+		q = p + strlen(p);
+	strncpy(out,p,size-1);
+	if (q-p >= size)
+		{
+		out[size-1]='\0';
+		}
+	else
+		{
 		out[q-p]='\0';
 		}
+	}
 #else
 void program_name(char *in, char *out, int size)
 	{
@@ -330,16 +255,19 @@ void program_name(char *in, char *out, int size)
 #endif
 #endif
 
-#ifdef OPENSSL_SYS_WIN32
+#ifdef WIN32
 int WIN32_rename(char *from, char *to)
 	{
-	/* Windows rename gives an error if 'to' exists, so delete it
-	 * first and ignore file not found errror
-	 */
-	if((remove(to) != 0) && (errno != ENOENT))
-		return -1;
-#undef rename
-	return rename(from, to);
+#ifdef WINNT
+	int ret;
+/* Note: MoveFileEx() doesn't work under Win95, Win98 */
+
+	ret=MoveFileEx(from,to,MOVEFILE_REPLACE_EXISTING|MOVEFILE_COPY_ALLOWED);
+	return(ret?0:-1);
+#else
+	unlink(to);
+	return MoveFile(from, to);
+#endif
 	}
 #endif
 
@@ -430,159 +358,6 @@ int dump_cert_text (BIO *out, X509 *x)
         return 0;
 }
 
-static int ui_open(UI *ui)
-	{
-	return UI_method_get_opener(UI_OpenSSL())(ui);
-	}
-static int ui_read(UI *ui, UI_STRING *uis)
-	{
-	if (UI_get_input_flags(uis) & UI_INPUT_FLAG_DEFAULT_PWD
-		&& UI_get0_user_data(ui))
-		{
-		switch(UI_get_string_type(uis))
-			{
-		case UIT_PROMPT:
-		case UIT_VERIFY:
-			{
-			const char *password =
-				((PW_CB_DATA *)UI_get0_user_data(ui))->password;
-			if (password[0] != '\0')
-				{
-				UI_set_result(ui, uis, password);
-				return 1;
-				}
-			}
-		default:
-			break;
-			}
-		}
-	return UI_method_get_reader(UI_OpenSSL())(ui, uis);
-	}
-static int ui_write(UI *ui, UI_STRING *uis)
-	{
-	if (UI_get_input_flags(uis) & UI_INPUT_FLAG_DEFAULT_PWD
-		&& UI_get0_user_data(ui))
-		{
-		switch(UI_get_string_type(uis))
-			{
-		case UIT_PROMPT:
-		case UIT_VERIFY:
-			{
-			const char *password =
-				((PW_CB_DATA *)UI_get0_user_data(ui))->password;
-			if (password[0] != '\0')
-				return 1;
-			}
-		default:
-			break;
-			}
-		}
-	return UI_method_get_writer(UI_OpenSSL())(ui, uis);
-	}
-static int ui_close(UI *ui)
-	{
-	return UI_method_get_closer(UI_OpenSSL())(ui);
-	}
-int setup_ui_method()
-	{
-	ui_method = UI_create_method("OpenSSL application user interface");
-	UI_method_set_opener(ui_method, ui_open);
-	UI_method_set_reader(ui_method, ui_read);
-	UI_method_set_writer(ui_method, ui_write);
-	UI_method_set_closer(ui_method, ui_close);
-	return 0;
-	}
-void destroy_ui_method()
-	{
-	if(ui_method)
-		{
-		UI_destroy_method(ui_method);
-		ui_method = NULL;
-		}
-	}
-int password_callback(char *buf, int bufsiz, int verify,
-	PW_CB_DATA *cb_tmp)
-	{
-	UI *ui = NULL;
-	int res = 0;
-	const char *prompt_info = NULL;
-	const char *password = NULL;
-	PW_CB_DATA *cb_data = (PW_CB_DATA *)cb_tmp;
-
-	if (cb_data)
-		{
-		if (cb_data->password)
-			password = cb_data->password;
-		if (cb_data->prompt_info)
-			prompt_info = cb_data->prompt_info;
-		}
-
-	if (password)
-		{
-		res = strlen(password);
-		if (res > bufsiz)
-			res = bufsiz;
-		memcpy(buf, password, res);
-		return res;
-		}
-
-	ui = UI_new_method(ui_method);
-	if (ui)
-		{
-		int ok = 0;
-		char *buff = NULL;
-		int ui_flags = 0;
-		char *prompt = NULL;
-
-		prompt = UI_construct_prompt(ui, "pass phrase",
-			cb_data->prompt_info);
-
-		ui_flags |= UI_INPUT_FLAG_DEFAULT_PWD;
-		UI_ctrl(ui, UI_CTRL_PRINT_ERRORS, 1, 0, 0);
-
-		if (ok >= 0)
-			ok = UI_add_input_string(ui,prompt,ui_flags,buf,
-				PW_MIN_LENGTH,BUFSIZ-1);
-		if (ok >= 0 && verify)
-			{
-			buff = (char *)OPENSSL_malloc(bufsiz);
-			ok = UI_add_verify_string(ui,prompt,ui_flags,buff,
-				PW_MIN_LENGTH,BUFSIZ-1, buf);
-			}
-		if (ok >= 0)
-			do
-				{
-				ok = UI_process(ui);
-				}
-			while (ok < 0 && UI_ctrl(ui, UI_CTRL_IS_REDOABLE, 0, 0, 0));
-
-		if (buff)
-			{
-			memset(buff,0,(unsigned int)bufsiz);
-			OPENSSL_free(buff);
-			}
-
-		if (ok >= 0)
-			res = strlen(buf);
-		if (ok == -1)
-			{
-			BIO_printf(bio_err, "User interface error\n");
-			ERR_print_errors(bio_err);
-			memset(buf,0,(unsigned int)bufsiz);
-			res = 0;
-			}
-		if (ok == -2)
-			{
-			BIO_printf(bio_err,"aborted!\n");
-			memset(buf,0,(unsigned int)bufsiz);
-			res = 0;
-			}
-		UI_free(ui);
-		OPENSSL_free(prompt);
-		}
-	return res;
-	}
-
 static char *app_get_pass(BIO *err, char *arg, int keepbio);
 
 int app_passwd(BIO *err, char *arg1, char *arg2, char **pass1, char **pass2)
@@ -658,18 +433,14 @@ static char *app_get_pass(BIO *err, char *arg, int keepbio)
 	return BUF_strdup(tpass);
 }
 
-int add_oid_section(BIO *err, CONF *conf)
+int add_oid_section(BIO *err, LHASH *conf)
 {	
 	char *p;
 	STACK_OF(CONF_VALUE) *sktmp;
 	CONF_VALUE *cnf;
 	int i;
-	if(!(p=NCONF_get_string(conf,NULL,"oid_section")))
-		{
-		ERR_clear_error();
-		return 1;
-		}
-	if(!(sktmp = NCONF_get_section(conf, p))) {
+	if(!(p=CONF_get_string(conf,NULL,"oid_section"))) return 1;
+	if(!(sktmp = CONF_get_section(conf, p))) {
 		BIO_printf(err, "problem loading oid section %s\n", p);
 		return 0;
 	}
@@ -684,8 +455,7 @@ int add_oid_section(BIO *err, CONF *conf)
 	return 1;
 }
 
-X509 *load_cert(BIO *err, const char *file, int format,
-	const char *pass, ENGINE *e, const char *cert_descrip)
+X509 *load_cert(BIO *err, char *file, int format)
 	{
 	ASN1_HEADER *ah=NULL;
 	BUF_MEM *buf=NULL;
@@ -699,17 +469,12 @@ X509 *load_cert(BIO *err, const char *file, int format,
 		}
 
 	if (file == NULL)
-		{
-		setvbuf(stdin, NULL, _IONBF, 0);
 		BIO_set_fp(cert,stdin,BIO_NOCLOSE);
-		}
 	else
 		{
 		if (BIO_read_filename(cert,file) <= 0)
 			{
-			BIO_printf(err, "Error opening %s %s\n",
-				cert_descrip, file);
-			ERR_print_errors(err);
+			perror(file);
 			goto end;
 			}
 		}
@@ -760,8 +525,7 @@ X509 *load_cert(BIO *err, const char *file, int format,
 		ah->data=NULL;
 		}
 	else if (format == FORMAT_PEM)
-		x=PEM_read_bio_X509_AUX(cert,NULL,
-			(pem_password_cb *)password_callback, NULL);
+		x=PEM_read_bio_X509_AUX(cert,NULL,NULL,NULL);
 	else if (format == FORMAT_PKCS12)
 		{
 		PKCS12 *p12 = d2i_PKCS12_bio(cert, NULL);
@@ -771,8 +535,7 @@ X509 *load_cert(BIO *err, const char *file, int format,
 		p12 = NULL;
 		}
 	else	{
-		BIO_printf(err,"bad input format specified for %s\n",
-			cert_descrip);
+		BIO_printf(err,"bad input format specified for input cert\n");
 		goto end;
 		}
 end:
@@ -787,30 +550,16 @@ end:
 	return(x);
 	}
 
-EVP_PKEY *load_key(BIO *err, const char *file, int format,
-	const char *pass, ENGINE *e, const char *key_descrip)
+EVP_PKEY *load_key(BIO *err, char *file, int format, char *pass)
 	{
 	BIO *key=NULL;
 	EVP_PKEY *pkey=NULL;
-	PW_CB_DATA cb_data;
-
-	cb_data.password = pass;
-	cb_data.prompt_info = file;
 
 	if (file == NULL)
 		{
 		BIO_printf(err,"no keyfile specified\n");
 		goto end;
 		}
-	if (format == FORMAT_ENGINE)
-		{
-		if (!e)
-			BIO_printf(bio_err,"no engine specified\n");
-		else
-			pkey = ENGINE_load_private_key(e, file,
-				ui_method, &cb_data);
-		goto end;
-		}
 	key=BIO_new(BIO_s_file());
 	if (key == NULL)
 		{
@@ -819,8 +568,7 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format,
 		}
 	if (BIO_read_filename(key,file) <= 0)
 		{
-		BIO_printf(err, "Error opening %s %s\n", key_descrip, file);
-		ERR_print_errors(err);
+		perror(file);
 		goto end;
 		}
 	if (format == FORMAT_ASN1)
@@ -829,13 +577,8 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format,
 		}
 	else if (format == FORMAT_PEM)
 		{
-		pkey=PEM_read_bio_PrivateKey(key,NULL,
-			(pem_password_cb *)password_callback, &cb_data);
+		pkey=PEM_read_bio_PrivateKey(key,NULL,NULL,pass);
 		}
-#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
-	else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC)
-		pkey = load_netscape_key(err, key, file, key_descrip, format);
-#endif
 	else if (format == FORMAT_PKCS12)
 		{
 		PKCS12 *p12 = d2i_PKCS12_bio(key, NULL);
@@ -846,40 +589,26 @@ EVP_PKEY *load_key(BIO *err, const char *file, int format,
 		}
 	else
 		{
-		BIO_printf(err,"bad input format specified for key file\n");
+		BIO_printf(err,"bad input format specified for key\n");
 		goto end;
 		}
  end:
 	if (key != NULL) BIO_free(key);
 	if (pkey == NULL)
-		BIO_printf(err,"unable to load %s\n", key_descrip);
+		BIO_printf(err,"unable to load Private Key\n");
 	return(pkey);
 	}
 
-EVP_PKEY *load_pubkey(BIO *err, const char *file, int format,
-	const char *pass, ENGINE *e, const char *key_descrip)
+EVP_PKEY *load_pubkey(BIO *err, char *file, int format)
 	{
 	BIO *key=NULL;
 	EVP_PKEY *pkey=NULL;
-	PW_CB_DATA cb_data;
-
-	cb_data.password = pass;
-	cb_data.prompt_info = file;
 
 	if (file == NULL)
 		{
 		BIO_printf(err,"no keyfile specified\n");
 		goto end;
 		}
-	if (format == FORMAT_ENGINE)
-		{
-		if (!e)
-			BIO_printf(bio_err,"no engine specified\n");
-		else
-			pkey = ENGINE_load_public_key(e, file,
-				ui_method, &cb_data);
-		goto end;
-		}
 	key=BIO_new(BIO_s_file());
 	if (key == NULL)
 		{
@@ -888,8 +617,7 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format,
 		}
 	if (BIO_read_filename(key,file) <= 0)
 		{
-		BIO_printf(err, "Error opening %s %s\n", key_descrip, file);
-		ERR_print_errors(err);
+		perror(file);
 		goto end;
 		}
 	if (format == FORMAT_ASN1)
@@ -898,83 +626,27 @@ EVP_PKEY *load_pubkey(BIO *err, const char *file, int format,
 		}
 	else if (format == FORMAT_PEM)
 		{
-		pkey=PEM_read_bio_PUBKEY(key,NULL,
-			(pem_password_cb *)password_callback, &cb_data);
+		pkey=PEM_read_bio_PUBKEY(key,NULL,NULL,NULL);
 		}
-#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
-	else if (format == FORMAT_NETSCAPE || format == FORMAT_IISSGC)
-		pkey = load_netscape_key(err, key, file, key_descrip, format);
-#endif
 	else
 		{
-		BIO_printf(err,"bad input format specified for key file\n");
+		BIO_printf(err,"bad input format specified for key\n");
 		goto end;
 		}
  end:
 	if (key != NULL) BIO_free(key);
 	if (pkey == NULL)
-		BIO_printf(err,"unable to load %s\n", key_descrip);
+		BIO_printf(err,"unable to load Public Key\n");
 	return(pkey);
 	}
 
-#if !defined(OPENSSL_NO_RC4) && !defined(OPENSSL_NO_RSA)
-EVP_PKEY *
-load_netscape_key(BIO *err, BIO *key, const char *file,
-		const char *key_descrip, int format)
-	{
-	EVP_PKEY *pkey;
-	BUF_MEM *buf;
-	RSA	*rsa;
-	const unsigned char *p;
-	int size, i;
-
-	buf=BUF_MEM_new();
-	pkey = EVP_PKEY_new();
-	size = 0;
-	if (buf == NULL || pkey == NULL)
-		goto error;
-	for (;;)
-		{
-		if (!BUF_MEM_grow(buf,size+1024*10))
-			goto error;
-		i = BIO_read(key, &(buf->data[size]), 1024*10);
-		size += i;
-		if (i == 0)
-			break;
-		if (i < 0)
-			{
-				BIO_printf(err, "Error reading %s %s",
-					key_descrip, file);
-				goto error;
-			}
-		}
-	p=(unsigned char *)buf->data;
-	rsa = d2i_RSA_NET(NULL,&p,(long)size,NULL,
-		(format == FORMAT_IISSGC ? 1 : 0));
-	if (rsa == NULL)
-		goto error;
-	BUF_MEM_free(buf);
-	EVP_PKEY_set1_RSA(pkey, rsa);
-	return pkey;
-error:
-	BUF_MEM_free(buf);
-	EVP_PKEY_free(pkey);
-	return NULL;
-	}
-#endif /* ndef OPENSSL_NO_RC4 */
-
-STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
-	const char *pass, ENGINE *e, const char *cert_descrip)
+STACK_OF(X509) *load_certs(BIO *err, char *file, int format)
 	{
 	BIO *certs;
 	int i;
 	STACK_OF(X509) *othercerts = NULL;
 	STACK_OF(X509_INFO) *allcerts = NULL;
 	X509_INFO *xi;
-	PW_CB_DATA cb_data;
-
-	cb_data.password = pass;
-	cb_data.prompt_info = file;
 
 	if((certs = BIO_new(BIO_s_file())) == NULL)
 		{
@@ -988,9 +660,7 @@ STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
 		{
 		if (BIO_read_filename(certs,file) <= 0)
 			{
-			BIO_printf(err, "Error opening %s %s\n",
-				cert_descrip, file);
-			ERR_print_errors(err);
+			perror(file);
 			goto end;
 			}
 		}
@@ -1004,8 +674,7 @@ STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
 			othercerts = NULL;
 			goto end;
 			}
-		allcerts = PEM_X509_INFO_read_bio(certs, NULL,
-				(pem_password_cb *)password_callback, &cb_data);
+		allcerts = PEM_X509_INFO_read_bio(certs, NULL, NULL, NULL);
 		for(i = 0; i < sk_X509_INFO_num(allcerts); i++)
 			{
 			xi = sk_X509_INFO_value (allcerts, i);
@@ -1018,8 +687,7 @@ STACK_OF(X509) *load_certs(BIO *err, const char *file, int format,
 		goto end;
 		}
 	else	{
-		BIO_printf(err,"bad input format specified for %s\n",
-			cert_descrip);
+		BIO_printf(err,"bad input format specified for input cert\n");
 		goto end;
 		}
 end:
@@ -1033,48 +701,16 @@ end:
 	return(othercerts);
 	}
 
-
-#define X509V3_EXT_UNKNOWN_MASK		(0xfL << 16)
-/* Return error for unknown extensions */
-#define X509V3_EXT_DEFAULT		0
-/* Print error for unknown extensions */
-#define X509V3_EXT_ERROR_UNKNOWN	(1L << 16)
-/* ASN1 parse unknown extensions */
-#define X509V3_EXT_PARSE_UNKNOWN	(2L << 16)
-/* BIO_dump unknown extensions */
-#define X509V3_EXT_DUMP_UNKNOWN		(3L << 16)
-
-#define X509_FLAG_CA (X509_FLAG_NO_ISSUER | X509_FLAG_NO_PUBKEY | \
-			 X509_FLAG_NO_HEADER | X509_FLAG_NO_VERSION)
-
-int set_cert_ex(unsigned long *flags, const char *arg)
-{
-	static const NAME_EX_TBL cert_tbl[] = {
-		{ "compatible", X509_FLAG_COMPAT, 0xffffffffl},
-		{ "ca_default", X509_FLAG_CA, 0xffffffffl},
-		{ "no_header", X509_FLAG_NO_HEADER, 0},
-		{ "no_version", X509_FLAG_NO_VERSION, 0},
-		{ "no_serial", X509_FLAG_NO_SERIAL, 0},
-		{ "no_signame", X509_FLAG_NO_SIGNAME, 0},
-		{ "no_validity", X509_FLAG_NO_VALIDITY, 0},
-		{ "no_subject", X509_FLAG_NO_SUBJECT, 0},
-		{ "no_issuer", X509_FLAG_NO_ISSUER, 0},
-		{ "no_pubkey", X509_FLAG_NO_PUBKEY, 0},
-		{ "no_extensions", X509_FLAG_NO_EXTENSIONS, 0},
-		{ "no_sigdump", X509_FLAG_NO_SIGDUMP, 0},
-		{ "no_aux", X509_FLAG_NO_AUX, 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},
-		{ "ext_dump", X509V3_EXT_DUMP_UNKNOWN, X509V3_EXT_UNKNOWN_MASK},
-		{ NULL, 0, 0}
-	};
-	return set_multi_opts(flags, arg, cert_tbl);
-}
+typedef struct {
+	char *name;
+	unsigned long flag;
+	unsigned long mask;
+} NAME_EX_TBL;
 
 int set_name_ex(unsigned long *flags, const char *arg)
 {
-	static const NAME_EX_TBL ex_tbl[] = {
+	char c;
+	const NAME_EX_TBL *ptbl, ex_tbl[] = {
 		{ "esc_2253", ASN1_STRFLGS_ESC_2253, 0},
 		{ "esc_ctrl", ASN1_STRFLGS_ESC_CTRL, 0},
 		{ "esc_msb", ASN1_STRFLGS_ESC_MSB, 0},
@@ -1094,95 +730,15 @@ int set_name_ex(unsigned long *flags, const char *arg)
 		{ "nofname", XN_FLAG_FN_NONE, XN_FLAG_FN_MASK},
 		{ "sname", XN_FLAG_FN_SN, XN_FLAG_FN_MASK},
 		{ "lname", XN_FLAG_FN_LN, XN_FLAG_FN_MASK},
-		{ "align", XN_FLAG_FN_ALIGN, 0},
 		{ "oid", XN_FLAG_FN_OID, XN_FLAG_FN_MASK},
 		{ "space_eq", XN_FLAG_SPC_EQ, 0},
 		{ "dump_unknown", XN_FLAG_DUMP_UNKNOWN_FIELDS, 0},
 		{ "RFC2253", XN_FLAG_RFC2253, 0xffffffffL},
 		{ "oneline", XN_FLAG_ONELINE, 0xffffffffL},
 		{ "multiline", XN_FLAG_MULTILINE, 0xffffffffL},
-		{ "ca_default", XN_FLAG_MULTILINE, 0xffffffffL},
 		{ NULL, 0, 0}
 	};
-	return set_multi_opts(flags, arg, ex_tbl);
-}
 
-int set_ext_copy(int *copy_type, const char *arg)
-{
-	if (!strcasecmp(arg, "none"))
-		*copy_type = EXT_COPY_NONE;
-	else if (!strcasecmp(arg, "copy"))
-		*copy_type = EXT_COPY_ADD;
-	else if (!strcasecmp(arg, "copyall"))
-		*copy_type = EXT_COPY_ALL;
-	else
-		return 0;
-	return 1;
-}
-
-int copy_extensions(X509 *x, X509_REQ *req, int copy_type)
-{
-	STACK_OF(X509_EXTENSION) *exts = NULL;
-	X509_EXTENSION *ext, *tmpext;
-	ASN1_OBJECT *obj;
-	int i, idx, ret = 0;
-	if (!x || !req || (copy_type == EXT_COPY_NONE))
-		return 1;
-	exts = X509_REQ_get_extensions(req);
-
-	for(i = 0; i < sk_X509_EXTENSION_num(exts); i++) {
-		ext = sk_X509_EXTENSION_value(exts, i);
-		obj = X509_EXTENSION_get_object(ext);
-		idx = X509_get_ext_by_OBJ(x, obj, -1);
-		/* Does extension exist? */
-		if (idx != -1) {
-			/* If normal copy don't override existing extension */
-			if (copy_type == EXT_COPY_ADD)
-				continue;
-			/* Delete all extensions of same type */
-			do {
-				tmpext = X509_get_ext(x, idx);
-				X509_delete_ext(x, idx);
-				X509_EXTENSION_free(tmpext);
-				idx = X509_get_ext_by_OBJ(x, obj, -1);
-			} while (idx != -1);
-		}
-		if (!X509_add_ext(x, ext, -1))
-			goto end;
-	}
-
-	ret = 1;
-
-	end:
-
-	sk_X509_EXTENSION_pop_free(exts, X509_EXTENSION_free);
-
-	return ret;
-}
-		
-		
-			
-
-static int set_multi_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl)
-{
-	STACK_OF(CONF_VALUE) *vals;
-	CONF_VALUE *val;
-	int i, ret = 1;
-	if(!arg) return 0;
-	vals = X509V3_parse_list(arg);
-	for (i = 0; i < sk_CONF_VALUE_num(vals); i++) {
-		val = sk_CONF_VALUE_value(vals, i);
-		if (!set_table_opts(flags, val->name, in_tbl))
-			ret = 0;
-	}
-	sk_CONF_VALUE_pop_free(vals, X509V3_conf_free);
-	return ret;
-}
-
-static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_TBL *in_tbl)
-{
-	char c;
-	const NAME_EX_TBL *ptbl;
 	c = arg[0];
 
 	if(c == '-') {
@@ -1193,8 +749,8 @@ static int set_table_opts(unsigned long *flags, const char *arg, const NAME_EX_T
 		arg++;
 	} else c = 1;
 
-	for(ptbl = in_tbl; ptbl->name; ptbl++) {
-		if(!strcasecmp(arg, ptbl->name)) {
+	for(ptbl = ex_tbl; ptbl->name; ptbl++) {
+		if(!strcmp(arg, ptbl->name)) {
 			*flags &= ~ptbl->mask;
 			if(c) *flags |= ptbl->flag;
 			else *flags &= ~ptbl->flag;
@@ -1206,7 +762,7 @@ 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[256];
+	char *buf;
 	char mline = 0;
 	int indent = 0;
 	if(title) BIO_puts(out, title);
@@ -1215,9 +771,10 @@ void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags)
 		indent = 4;
 	}
 	if(lflags == XN_FLAG_COMPAT) {
-		X509_NAME_oneline(nm,buf,256);
-		BIO_puts(out,buf);
+		buf = X509_NAME_oneline(nm, 0, 0);
+		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);
@@ -1225,107 +782,3 @@ void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags)
 	}
 }
 
-X509_STORE *setup_verify(BIO *bp, char *CAfile, char *CApath)
-{
-	X509_STORE *store;
-	X509_LOOKUP *lookup;
-	if(!(store = X509_STORE_new())) goto end;
-	lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file());
-	if (lookup == NULL) goto end;
-	if (CAfile) {
-		if(!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM)) {
-			BIO_printf(bp, "Error loading file %s\n", CAfile);
-			goto end;
-		}
-	} else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
-		
-	lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir());
-	if (lookup == NULL) goto end;
-	if (CApath) {
-		if(!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM)) {
-			BIO_printf(bp, "Error loading directory %s\n", CApath);
-			goto end;
-		}
-	} else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
-
-	ERR_clear_error();
-	return store;
-	end:
-	X509_STORE_free(store);
-	return NULL;
-}
-
-/* Try to load an engine in a shareable library */
-ENGINE *try_load_engine(BIO *err, const char *engine, int debug)
-	{
-	ENGINE *e = ENGINE_by_id("dynamic");
-	if (e)
-		{
-		if (!ENGINE_ctrl_cmd_string(e, "SO_PATH", engine, 0)
-			|| !ENGINE_ctrl_cmd_string(e, "LOAD", NULL, 0))
-			{
-			ENGINE_free(e);
-			e = NULL;
-			}
-		}
-	return e;
-	}
-
-ENGINE *setup_engine(BIO *err, const char *engine, int debug)
-        {
-        ENGINE *e = NULL;
-
-        if (engine)
-                {
-		if(strcmp(engine, "auto") == 0)
-			{
-			BIO_printf(err,"enabling auto ENGINE support\n");
-			ENGINE_register_all_complete();
-			return NULL;
-			}
-		if((e = ENGINE_by_id(engine)) == NULL
-			&& (e = try_load_engine(err, engine, debug)) == NULL)
-			{
-			BIO_printf(err,"invalid engine \"%s\"\n", engine);
-			ERR_print_errors(err);
-			return NULL;
-			}
-		if (debug)
-			{
-			ENGINE_ctrl(e, ENGINE_CTRL_SET_LOGSTREAM,
-				0, err, 0);
-			}
-                ENGINE_ctrl_cmd(e, "SET_USER_INTERFACE", 0, ui_method, 0, 1);
-		if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
-			{
-			BIO_printf(err,"can't use that engine\n");
-			ERR_print_errors(err);
-			ENGINE_free(e);
-			return NULL;
-			}
-
-		BIO_printf(err,"engine \"%s\" set.\n", ENGINE_get_id(e));
-
-		/* Free our "structural" reference. */
-		ENGINE_free(e);
-		}
-        return e;
-        }
-
-int load_config(BIO *err, CONF *cnf)
-	{
-	if (!cnf)
-		cnf = config;
-	if (!cnf)
-		return 1;
-
-	OPENSSL_load_builtin_modules();
-
-	if (CONF_modules_load(cnf, NULL, 0) <= 0)
-		{
-		BIO_printf(err, "Error configuring OpenSSL\n");
-		ERR_print_errors(err);
-		return 0;
-		}
-	return 1;
-	}

apps/apps.h

@@ -55,64 +55,15 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * 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).
- *
- */
 
 #ifndef HEADER_APPS_H
 #define HEADER_APPS_H
 
+#ifdef FLAT_INC
 #include "e_os.h"
+#else
+#include "../e_os.h"
+#endif
 
 #include <openssl/buffer.h>
 #include <openssl/bio.h>
@@ -120,9 +71,6 @@
 #include <openssl/x509.h>
 #include <openssl/lhash.h>
 #include <openssl/conf.h>
-#include <openssl/txt_db.h>
-#include <openssl/engine.h>
-#include <openssl/ossl_typ.h>
 
 int app_RAND_load_file(const char *file, BIO *bio_e, int dont_warn);
 int app_RAND_write_file(const char *file, BIO *bio_e);
@@ -134,11 +82,11 @@ 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
+#ifdef NO_STDIO
 BIO_METHOD *BIO_s_file();
 #endif
 
-#ifdef OPENSSL_SYS_WIN32
+#ifdef WIN32
 #define rename(from,to) WIN32_rename((from),(to))
 int WIN32_rename(char *oldname,char *newname);
 #endif
@@ -148,15 +96,17 @@ int WIN32_rename(char *oldname,char *newname);
 #define MAIN(a,v)	main(a,v)
 
 #ifndef NON_MAIN
+LHASH *config=NULL;
 BIO *bio_err=NULL;
 #else
+extern LHASH *config;
 extern BIO *bio_err;
 #endif
 
 #else
 
 #define MAIN(a,v)	PROG(a,v)
-extern CONF *config;
+extern LHASH *config;
 extern char *default_config_file;
 extern BIO *bio_err;
 
@@ -171,34 +121,21 @@ extern BIO *bio_err;
 #endif
 
 #if defined(MONOLITH) && !defined(OPENSSL_C)
-#  define apps_startup() \
-		do_pipe_sig()
-#  define apps_shutdown()
+#  define apps_startup()	do_pipe_sig()
 #else
-#  if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WIN16) || \
-   defined(OPENSSL_SYS_WIN32)
+#  if defined(MSDOS) || defined(WIN16) || defined(WIN32)
 #    ifdef _O_BINARY
 #      define apps_startup() \
-		do { _fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-		ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
-		ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
+		_fmode=_O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
+		SSLeay_add_all_algorithms()
 #    else
 #      define apps_startup() \
-		do { _fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
-		ERR_load_crypto_strings(); OpenSSL_add_all_algorithms(); \
-		ENGINE_load_builtin_engines(); setup_ui_method(); } while(0)
+		_fmode=O_BINARY; do_pipe_sig(); CRYPTO_malloc_init(); \
+		SSLeay_add_all_algorithms()
 #    endif
 #  else
-#    define apps_startup() \
-		do { do_pipe_sig(); OpenSSL_add_all_algorithms(); \
-		ERR_load_crypto_strings(); ENGINE_load_builtin_engines(); \
-		setup_ui_method(); } while(0)
+#    define apps_startup()	do_pipe_sig(); SSLeay_add_all_algorithms();
 #  endif
-#  define apps_shutdown() \
-		do { CONF_modules_unload(1); destroy_ui_method(); \
-		EVP_cleanup(); ENGINE_cleanup(); \
-		CRYPTO_cleanup_all_ex_data(); ERR_remove_state(0); \
-		ERR_free_strings(); } while(0)
 #endif
 
 typedef struct args_st
@@ -207,19 +144,6 @@ typedef struct args_st
 	int count;
 	} ARGS;
 
-#define PW_MIN_LENGTH 4
-typedef struct pw_cb_data
-	{
-	const void *password;
-	const char *prompt_info;
-	} PW_CB_DATA;
-
-int password_callback(char *buf, int bufsiz, int verify,
-	PW_CB_DATA *cb_data);
-
-int setup_ui_method();
-void destroy_ui_method();
-
 int should_retry(int i);
 int args_from_file(char *file, int *argc, char **argv[]);
 int str2fmt(char *s);
@@ -229,31 +153,13 @@ int chopup_args(ARGS *arg,char *buf, int *argc, char **argv[]);
 int dump_cert_text(BIO *out, X509 *x);
 void print_name(BIO *out, char *title, X509_NAME *nm, unsigned long lflags);
 #endif
-int set_cert_ex(unsigned long *flags, const char *arg);
 int set_name_ex(unsigned long *flags, const char *arg);
-int set_ext_copy(int *copy_type, const char *arg);
-int copy_extensions(X509 *x, X509_REQ *req, int copy_type);
 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,
-	const char *pass, ENGINE *e, const char *key_descrip);
-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);
-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);
-
-/* Functions defined in ca.c and also used in ocsp.c */
-int unpack_revinfo(ASN1_TIME **prevtm, int *preason, ASN1_OBJECT **phold,
-			ASN1_GENERALIZEDTIME **pinvtm, char *str);
-int make_serial_index(TXT_DB *db);
-
-X509_NAME *do_subject(char *str, long chtype);
+int add_oid_section(BIO *err, LHASH *conf);
+X509 *load_cert(BIO *err, char *file, int format);
+EVP_PKEY *load_key(BIO *err, char *file, int format, char *pass);
+EVP_PKEY *load_pubkey(BIO *err, char *file, int format);
+STACK_OF(X509) *load_certs(BIO *err, char *file, int format);
 
 #define FORMAT_UNDEF    0
 #define FORMAT_ASN1     1
@@ -262,13 +168,6 @@ X509_NAME *do_subject(char *str, long chtype);
 #define FORMAT_NETSCAPE 4
 #define FORMAT_PKCS12   5
 #define FORMAT_SMIME    6
-#define FORMAT_ENGINE   7
-#define FORMAT_IISSGC	8	/* XXX this stupid macro helps us to avoid
-				 * adding yet another param to load_*key() */
-
-#define EXT_COPY_NONE	0
-#define EXT_COPY_ADD	1
-#define EXT_COPY_ALL	2
 
 #define NETSCAPE_CERT_HDR	"certificate"
 

apps/asn1pars.c

@@ -103,9 +103,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	prog=argv[0];
 	argc--;
 	argv++;
@@ -184,7 +181,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\n");
+		BIO_printf(bio_err," -out arg      output file (output format is always DER\n");
 		BIO_printf(bio_err," -noout arg    don't produce any output\n");
 		BIO_printf(bio_err," -offset arg   offset into file\n");
 		BIO_printf(bio_err," -length arg   length of section in file\n");
@@ -195,7 +192,6 @@ bad:
 		BIO_printf(bio_err," -strparse offset\n");
 		BIO_printf(bio_err,"               a series of these can be used to 'dig' into multiple\n");
 		BIO_printf(bio_err,"               ASN1 blob wrappings\n");
-		BIO_printf(bio_err," -out filename output DER encoding to file\n");
 		goto end;
 		}
 
@@ -209,7 +205,7 @@ bad:
 		goto end;
 		}
 	BIO_set_fp(out,stdout,BIO_NOCLOSE|BIO_FP_TEXT);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 	{
 	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 	out = BIO_push(tmpbio, out);
@@ -305,7 +301,15 @@ bad:
 		num=tmplen;
 		}
 
-	if (length == 0) length=(unsigned int)num;
+	if (offset >= num)
+		{
+		BIO_printf(bio_err, "Error: offset too large\n");
+		goto end;
+		}
+
+	num -= offset;
+
+	if ((length == 0) || ((long)length > num)) length=(unsigned int)num;
 	if(derout) {
 		if(BIO_write(derout, str + offset, length) != (int)length) {
 			BIO_printf(bio_err, "Error writing output\n");
@@ -332,7 +336,6 @@ end:
 	if (at != NULL) ASN1_TYPE_free(at);
 	if (osk != NULL) sk_free(osk);
 	OBJ_cleanup();
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 

apps/ciphers.c

@@ -59,7 +59,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef OPENSSL_NO_STDIO
+#ifdef NO_STDIO
 #define APPS_WIN16
 #endif
 #include "apps.h"
@@ -95,11 +95,11 @@ int MAIN(int argc, char **argv)
 	char buf[512];
 	BIO *STDout=NULL;
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
+#if !defined(NO_SSL2) && !defined(NO_SSL3)
 	meth=SSLv23_server_method();
-#elif !defined(OPENSSL_NO_SSL3)
+#elif !defined(NO_SSL3)
 	meth=SSLv3_server_method();
-#elif !defined(OPENSSL_NO_SSL2)
+#elif !defined(NO_SSL2)
 	meth=SSLv2_server_method();
 #endif
 
@@ -108,7 +108,7 @@ int MAIN(int argc, char **argv)
 	if (bio_err == NULL)
 		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 	STDout=BIO_new_fp(stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 	{
 	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 	STDout = BIO_push(tmpbio, STDout);
@@ -121,15 +121,15 @@ int MAIN(int argc, char **argv)
 		{
 		if (strcmp(*argv,"-v") == 0)
 			verbose=1;
-#ifndef OPENSSL_NO_SSL2
+#ifndef NO_SSL2
 		else if (strcmp(*argv,"-ssl2") == 0)
 			meth=SSLv2_client_method();
 #endif
-#ifndef OPENSSL_NO_SSL3
+#ifndef NO_SSL3
 		else if (strcmp(*argv,"-ssl3") == 0)
 			meth=SSLv3_client_method();
 #endif
-#ifndef OPENSSL_NO_TLS1
+#ifndef NO_TLS1
 		else if (strcmp(*argv,"-tls1") == 0)
 			meth=TLSv1_client_method();
 #endif
@@ -150,7 +150,7 @@ int MAIN(int argc, char **argv)
 	if (badops)
 		{
 		for (pp=ciphers_usage; (*pp != NULL); pp++)
-			BIO_printf(bio_err,"%s",*pp);
+			BIO_printf(bio_err,*pp);
 		goto end;
 		}
 
@@ -202,7 +202,6 @@ end:
 	if (ctx != NULL) SSL_CTX_free(ctx);
 	if (ssl != NULL) SSL_free(ssl);
 	if (STDout != NULL) BIO_free_all(STDout);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 

apps/crl.c

@@ -87,7 +87,6 @@ static char *crl_usage[]={
 " -noout          - no CRL output\n",
 " -CAfile  name   - verify CRL using certificates in file \"name\"\n",
 " -CApath  dir    - verify CRL using certificates in \"dir\"\n",
-" -nameopt arg    - various certificate name options\n",
 NULL
 };
 
@@ -98,7 +97,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	unsigned long nmflag = 0;
 	X509_CRL *x=NULL;
 	char *CAfile = NULL, *CApath = NULL;
 	int ret=1,i,num,badops=0;
@@ -107,7 +105,7 @@ int MAIN(int argc, char **argv)
 	char *infile=NULL,*outfile=NULL;
 	int hash=0,issuer=0,lastupdate=0,nextupdate=0,noout=0,text=0;
 	int fingerprint = 0;
-	char **pp;
+	char **pp,buf[256];
 	X509_STORE *store = NULL;
 	X509_STORE_CTX ctx;
 	X509_LOOKUP *lookup = NULL;
@@ -122,14 +120,11 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	if (bio_out == NULL)
 		if ((bio_out=BIO_new(BIO_s_file())) != NULL)
 			{
 			BIO_set_fp(bio_out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 			{
 			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 			bio_out = BIO_push(tmpbio, bio_out);
@@ -190,11 +185,6 @@ int MAIN(int argc, char **argv)
 			text = 1;
 		else if (strcmp(*argv,"-hash") == 0)
 			hash= ++num;
-		else if (strcmp(*argv,"-nameopt") == 0)
-			{
-			if (--argc < 1) goto bad;
-			if (!set_name_ex(&nmflag, *(++argv))) goto bad;
-			}
 		else if (strcmp(*argv,"-issuer") == 0)
 			issuer= ++num;
 		else if (strcmp(*argv,"-lastupdate") == 0)
@@ -224,7 +214,7 @@ int MAIN(int argc, char **argv)
 		{
 bad:
 		for (pp=crl_usage; (*pp != NULL); pp++)
-			BIO_printf(bio_err,"%s",*pp);
+			BIO_printf(bio_err,*pp);
 		goto end;
 		}
 
@@ -245,11 +235,7 @@ bad:
 			X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
 		ERR_clear_error();
 
-		if(!X509_STORE_CTX_init(&ctx, store, NULL, NULL)) {
-			BIO_printf(bio_err,
-				"Error initialising X509 store\n");
-			goto end;
-		}
+		X509_STORE_CTX_init(&ctx, store, NULL, NULL);
 
 		i = X509_STORE_get_by_subject(&ctx, X509_LU_X509, 
 					X509_CRL_get_issuer(x), &xobj);
@@ -278,7 +264,9 @@ bad:
 			{
 			if (issuer == i)
 				{
-				print_name(bio_out, "issuer=", X509_CRL_get_issuer(x), nmflag);
+				X509_NAME_oneline(X509_CRL_get_issuer(x),
+								buf,256);
+				BIO_printf(bio_out,"issuer= %s\n",buf);
 				}
 
 			if (hash == i)
@@ -336,7 +324,7 @@ bad:
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -376,8 +364,7 @@ end:
 		X509_STORE_CTX_cleanup(&ctx);
 		X509_STORE_free(store);
 	}
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 static X509_CRL *load_crl(char *infile, int format)

apps/crl2p7.c

@@ -166,8 +166,7 @@ bad:
 		BIO_printf(bio_err," -certfile arg  certificates file of chain to a trusted CA\n");
 		BIO_printf(bio_err,"                (can be used more than once)\n");
 		BIO_printf(bio_err," -nocrl         no crl to load, just certs from '-certfile'\n");
-		ret = 1;
-		goto end;
+		OPENSSL_EXIT(1);
 		}
 
 	ERR_load_crypto_strings();
@@ -242,7 +241,7 @@ bad:
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -279,8 +278,7 @@ end:
 	if (p7 != NULL) PKCS7_free(p7);
 	if (crl != NULL) X509_CRL_free(crl);
 
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 /*

apps/dgst.c

@@ -80,7 +80,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	unsigned char *buf=NULL;
 	int i,err=0;
 	const EVP_MD *md=NULL,*m;
@@ -92,14 +91,12 @@ int MAIN(int argc, char **argv)
 	char pname[PROG_NAME_SIZE+1];
 	int separator=0;
 	int debug=0;
-	int keyform=FORMAT_PEM;
 	const char *outfile = NULL, *keyfile = NULL;
 	const char *sigfile = NULL, *randfile = NULL;
 	int out_bin = -1, want_pub = 0, do_verify = 0;
 	EVP_PKEY *sigkey = NULL;
 	unsigned char *sigbuf = NULL;
 	int siglen = 0;
-	char *engine=NULL;
 
 	apps_startup();
 
@@ -112,9 +109,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	/* first check the program name */
 	program_name(argv[0],pname,PROG_NAME_SIZE);
 
@@ -160,16 +154,6 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) break;
 			sigfile=*(++argv);
 			}
-		else if (strcmp(*argv,"-keyform") == 0)
-			{
-			if (--argc < 1) break;
-			keyform=str2fmt(*(++argv));
-			}
-		else if (strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) break;
-			engine= *(++argv);
-			}
 		else if (strcmp(*argv,"-hex") == 0)
 			out_bin = 0;
 		else if (strcmp(*argv,"-binary") == 0)
@@ -204,10 +188,8 @@ int MAIN(int argc, char **argv)
 		BIO_printf(bio_err,"-sign   file    sign digest using private key in file\n");
 		BIO_printf(bio_err,"-verify file    verify a signature using public key in file\n");
 		BIO_printf(bio_err,"-prverify file  verify a signature using private key in file\n");
-		BIO_printf(bio_err,"-keyform arg    key file format (PEM or ENGINE)\n");
 		BIO_printf(bio_err,"-signature file signature to verify\n");
 		BIO_printf(bio_err,"-binary         output in binary form\n");
-		BIO_printf(bio_err,"-engine e       use engine e, possibly a hardware device.\n");
 
 		BIO_printf(bio_err,"-%3s to use the %s message digest algorithm (default)\n",
 			LN_md5,LN_md5);
@@ -227,8 +209,6 @@ int MAIN(int argc, char **argv)
 		goto end;
 		}
 
-        e = setup_engine(bio_err, engine, 0);
-
 	in=BIO_new(BIO_s_file());
 	bmd=BIO_new(BIO_f_md());
 	if (debug)
@@ -258,7 +238,7 @@ int MAIN(int argc, char **argv)
 		else    out = BIO_new_file(outfile, "w");
 	} else {
 		out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -273,18 +253,24 @@ int MAIN(int argc, char **argv)
 		goto end;
 	}
 
-	if(keyfile)
-		{
-		if (want_pub)
-			sigkey = load_pubkey(bio_err, keyfile, keyform, NULL,
-				e, "key file");
-		else
-			sigkey = load_key(bio_err, keyfile, keyform, NULL,
-				e, "key file");
-		if (!sigkey)
-			{
-			/* load_[pub]key() has already printed an appropriate
-			   message */
+	if(keyfile) {
+		BIO *keybio;
+		keybio = BIO_new_file(keyfile, "r");
+		if(!keybio) {
+			BIO_printf(bio_err, "Error opening key file %s\n",
+								keyfile);
+			ERR_print_errors(bio_err);
+			goto end;
+		}
+		
+		if(want_pub) 
+			sigkey = PEM_read_bio_PUBKEY(keybio, NULL, NULL, NULL);
+		else sigkey = PEM_read_bio_PrivateKey(keybio, NULL, NULL, NULL);
+		BIO_free(keybio);
+		if(!sigkey) {
+			BIO_printf(bio_err, "Error reading key file %s\n",
+								keyfile);
+			ERR_print_errors(bio_err);
 			goto end;
 		}
 	}
@@ -341,7 +327,7 @@ int MAIN(int argc, char **argv)
 end:
 	if (buf != NULL)
 		{
-		memset(buf,0,BUFSIZE);
+		OPENSSL_cleanse(buf,BUFSIZE);
 		OPENSSL_free(buf);
 		}
 	if (in != NULL) BIO_free(in);
@@ -349,8 +335,7 @@ end:
 	EVP_PKEY_free(sigkey);
 	if(sigbuf) OPENSSL_free(sigbuf);
 	if (bmd != NULL) BIO_free(bmd);
-	apps_shutdown();
-	EXIT(err);
+	OPENSSL_EXIT(err);
 	}
 
 void do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,

apps/dh.c

@@ -57,7 +57,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -87,12 +87,11 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	DH *dh=NULL;
 	int i,badops=0,text=0;
 	BIO *in=NULL,*out=NULL;
 	int informat,outformat,check=0,noout=0,C=0,ret=1;
-	char *infile,*outfile,*prog,*engine;
+	char *infile,*outfile,*prog;
 
 	apps_startup();
 
@@ -100,10 +99,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
-	engine=NULL;
 	infile=NULL;
 	outfile=NULL;
 	informat=FORMAT_PEM;
@@ -134,11 +129,6 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
 			}
-		else if (strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) goto bad;
-			engine= *(++argv);
-			}
 		else if (strcmp(*argv,"-check") == 0)
 			check=1;
 		else if (strcmp(*argv,"-text") == 0)
@@ -170,14 +160,11 @@ bad:
 		BIO_printf(bio_err," -text         print a text form of the DH parameters\n");
 		BIO_printf(bio_err," -C            Output C code\n");
 		BIO_printf(bio_err," -noout        no output\n");
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 		goto end;
 		}
 
 	ERR_load_crypto_strings();
 
-        e = setup_engine(bio_err, engine, 0);
-
 	in=BIO_new(BIO_s_file());
 	out=BIO_new(BIO_s_file());
 	if ((in == NULL) || (out == NULL))
@@ -199,7 +186,7 @@ bad:
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -332,7 +319,6 @@ end:
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 #endif

apps/dhparam.c

@@ -109,7 +109,7 @@
  *
  */
 
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
@@ -122,7 +122,7 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 #include <openssl/dsa.h>
 #endif
 
@@ -148,16 +148,15 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	DH *dh=NULL;
 	int i,badops=0,text=0;
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 	int dsaparam=0;
 #endif
 	BIO *in=NULL,*out=NULL;
 	int informat,outformat,check=0,noout=0,C=0,ret=1;
 	char *infile,*outfile,*prog;
-	char *inrand=NULL,*engine=NULL;
+	char *inrand=NULL;
 	int num = 0, g = 0;
 
 	apps_startup();
@@ -166,9 +165,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	infile=NULL;
 	outfile=NULL;
 	informat=FORMAT_PEM;
@@ -199,16 +195,11 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			outfile= *(++argv);
 			}
-		else if (strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) goto bad;
-			engine= *(++argv);
-			}
 		else if (strcmp(*argv,"-check") == 0)
 			check=1;
 		else if (strcmp(*argv,"-text") == 0)
 			text=1;
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 		else if (strcmp(*argv,"-dsaparam") == 0)
 			dsaparam=1;
 #endif
@@ -240,7 +231,7 @@ bad:
 		BIO_printf(bio_err," -outform arg  output format - one of DER PEM\n");
 		BIO_printf(bio_err," -in arg       input file\n");
 		BIO_printf(bio_err," -out arg      output file\n");
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 		BIO_printf(bio_err," -dsaparam     read or generate DSA parameters, convert to DH\n");
 #endif
 		BIO_printf(bio_err," -check        check the DH parameters\n");
@@ -249,7 +240,6 @@ bad:
 		BIO_printf(bio_err," -2            generate parameters using  2 as the generator value\n");
 		BIO_printf(bio_err," -5            generate parameters using  5 as the generator value\n");
 		BIO_printf(bio_err," numbits       number of bits in to generate (default 512)\n");
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 		BIO_printf(bio_err,"               - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"               the random number generator\n");
@@ -259,12 +249,10 @@ bad:
 
 	ERR_load_crypto_strings();
 
-        e = setup_engine(bio_err, engine, 0);
-
 	if (g && !num)
 		num = DEFBITS;
 
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 	if (dsaparam)
 		{
 		if (g)
@@ -291,7 +279,7 @@ bad:
 			BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 				app_RAND_load_files(inrand));
 
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 		if (dsaparam)
 			{
 			DSA *dsa;
@@ -352,7 +340,7 @@ bad:
 			goto end;
 			}
 
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 		if (dsaparam)
 			{
 			DSA *dsa;
@@ -405,7 +393,7 @@ bad:
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -490,7 +478,7 @@ bad:
 		printf("\tif ((dh->p == NULL) || (dh->g == NULL))\n");
 		printf("\t\t{ DH_free(dh); return(NULL); }\n");
 		if (dh->length)
-			printf("\tdh->length = %ld;\n", dh->length);
+			printf("\tdh->length = %d;\n", dh->length);
 		printf("\treturn(dh);\n\t}\n");
 		OPENSSL_free(data);
 		}
@@ -518,8 +506,7 @@ end:
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 /* dh_cb is identical to dsa_cb in apps/dsaparam.c */

apps/dsa.c

@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -79,9 +79,6 @@
  * -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
  * -modulus	- print the DSA public key
  */
@@ -90,7 +87,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	int ret=1;
 	DSA *dsa=NULL;
 	int i,badops=0;
@@ -98,7 +94,7 @@ int MAIN(int argc, char **argv)
 	BIO *in=NULL,*out=NULL;
 	int informat,outformat,text=0,noout=0;
 	int pubin = 0, pubout = 0;
-	char *infile,*outfile,*prog,*engine;
+	char *infile,*outfile,*prog;
 	char *passargin = NULL, *passargout = NULL;
 	char *passin = NULL, *passout = NULL;
 	int modulus=0;
@@ -109,10 +105,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
-	engine=NULL;
 	infile=NULL;
 	outfile=NULL;
 	informat=FORMAT_PEM;
@@ -153,11 +145,6 @@ int MAIN(int argc, char **argv)
 			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)
@@ -189,15 +176,10 @@ bad:
 		BIO_printf(bio_err," -passin arg     input file pass phrase source\n");
 		BIO_printf(bio_err," -out arg        output file\n");
 		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
-		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
+#ifndef 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");
@@ -207,8 +189,6 @@ bad:
 
 	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;
@@ -255,7 +235,7 @@ bad:
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -313,7 +293,6 @@ end:
 	if(dsa != NULL) DSA_free(dsa);
 	if(passin) OPENSSL_free(passin);
 	if(passout) OPENSSL_free(passout);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 #endif

apps/dsaparam.c

@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -90,7 +90,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	DSA *dsa=NULL;
 	int i,badops=0,text=0;
 	BIO *in=NULL,*out=NULL;
@@ -98,7 +97,6 @@ int MAIN(int argc, char **argv)
 	char *infile,*outfile,*prog,*inrand=NULL;
 	int numbits= -1,num,genkey=0;
 	int need_rand=0;
-	char *engine=NULL;
 
 	apps_startup();
 
@@ -106,9 +104,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	infile=NULL;
 	outfile=NULL;
 	informat=FORMAT_PEM;
@@ -139,11 +134,6 @@ int MAIN(int argc, char **argv)
 			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)
@@ -189,9 +179,7 @@ bad:
 		BIO_printf(bio_err," -text         print as text\n");
 		BIO_printf(bio_err," -C            Output C code\n");
 		BIO_printf(bio_err," -noout        no output\n");
-		BIO_printf(bio_err," -genkey       generate a DSA key\n");
 		BIO_printf(bio_err," -rand         files to use for random number input\n");
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
 		BIO_printf(bio_err," number        number of bits to use for generating private key\n");
 		goto end;
 		}
@@ -219,7 +207,7 @@ bad:
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -235,8 +223,6 @@ bad:
 			}
 		}
 
-        e = setup_engine(bio_err, engine, 0);
-
 	if (need_rand)
 		{
 		app_RAND_load_file(NULL, bio_err, (inrand != NULL));
@@ -371,8 +357,7 @@ end:
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
 	if (dsa != NULL) DSA_free(dsa);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 static void MS_CALLBACK dsa_cb(int p, int n, void *arg)

apps/ecdsa.c

@@ -1,445 +0,0 @@
-/* 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

apps/ecdsaparam.c

@@ -1,660 +0,0 @@
-/* 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

apps/enc.c

@@ -66,8 +66,10 @@
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 #include <openssl/rand.h>
+#ifndef NO_MD5
+#include <openssl/md5.h>
+#endif
 #include <openssl/pem.h>
-#include <ctype.h>
 
 int set_hex(char *in,unsigned char *out,int size);
 #undef SIZE
@@ -78,37 +80,17 @@ int set_hex(char *in,unsigned char *out,int size);
 #define BSIZE	(8*1024)
 #define	PROG	enc_main
 
-void show_ciphers(const OBJ_NAME *name,void *bio_)
-	{
-	BIO *bio=bio_;
-	static int n;
-
-	if(!islower((unsigned char)*name->name))
-		return;
-
-	BIO_printf(bio,"-%-25s",name->name);
-	if(++n == 3)
-		{
-		BIO_printf(bio,"\n");
-		n=0;
-		}
-	else
-		BIO_printf(bio," ");
-	}
-
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	static const char magic[]="Salted__";
 	char mbuf[8];	/* should be 1 smaller than magic */
 	char *strbuf=NULL;
 	unsigned char *buff=NULL,*bufsize=NULL;
 	int bsize=BSIZE,verbose=0;
 	int ret=1,inl;
-	int nopad = 0;
-	unsigned char key[EVP_MAX_KEY_LENGTH],iv[EVP_MAX_IV_LENGTH];
+	unsigned char key[24],iv[MD5_DIGEST_LENGTH];
 	unsigned char salt[PKCS5_SALT_LEN];
 	char *str=NULL, *passarg = NULL, *pass = NULL;
 	char *hkey=NULL,*hiv=NULL,*hsalt = NULL;
@@ -119,7 +101,6 @@ int MAIN(int argc, char **argv)
 	BIO *in=NULL,*out=NULL,*b64=NULL,*benc=NULL,*rbio=NULL,*wbio=NULL;
 #define PROG_NAME_SIZE  39
 	char pname[PROG_NAME_SIZE+1];
-	char *engine = NULL;
 
 	apps_startup();
 
@@ -127,9 +108,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	/* first check the program name */
 	program_name(argv[0],pname,PROG_NAME_SIZE);
 	if (strcmp(pname,"base64") == 0)
@@ -163,19 +141,12 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			passarg= *(++argv);
 			}
-		else if (strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) goto bad;
-			engine= *(++argv);
-			}
 		else if	(strcmp(*argv,"-d") == 0)
 			enc=0;
 		else if	(strcmp(*argv,"-p") == 0)
 			printkey=1;
 		else if	(strcmp(*argv,"-v") == 0)
 			verbose=1;
-		else if	(strcmp(*argv,"-nopad") == 0)
-			nopad=1;
 		else if	(strcmp(*argv,"-salt") == 0)
 			nosalt=0;
 		else if	(strcmp(*argv,"-nosalt") == 0)
@@ -270,22 +241,79 @@ bad:
 			BIO_printf(bio_err,"%-14s key/iv in hex is the next argument\n","-K/-iv");
 			BIO_printf(bio_err,"%-14s print the iv/key (then exit if -P)\n","-[pP]");
 			BIO_printf(bio_err,"%-14s buffer size\n","-bufsize <n>");
-			BIO_printf(bio_err,"%-14s use engine e, possibly a hardware device.\n","-engine e");
 
 			BIO_printf(bio_err,"Cipher Types\n");
-			OBJ_NAME_do_all_sorted(OBJ_NAME_TYPE_CIPHER_METH,
-					       show_ciphers,
-					       bio_err);
-			BIO_printf(bio_err,"\n");
+			BIO_printf(bio_err,"des     : 56 bit key DES encryption\n");
+			BIO_printf(bio_err,"des_ede :112 bit key ede DES encryption\n");
+			BIO_printf(bio_err,"des_ede3:168 bit key ede DES encryption\n");
+#ifndef NO_IDEA
+			BIO_printf(bio_err,"idea    :128 bit key IDEA encryption\n");
+#endif
+#ifndef NO_RC4
+			BIO_printf(bio_err,"rc2     :128 bit key RC2 encryption\n");
+#endif
+#ifndef NO_BF
+			BIO_printf(bio_err,"bf      :128 bit key Blowfish encryption\n");
+#endif
+#ifndef NO_RC4
+			BIO_printf(bio_err," -%-5s :128 bit key RC4 encryption\n",
+				LN_rc4);
+#endif
 
+			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
+				LN_des_ecb,LN_des_cbc,
+				LN_des_cfb64,LN_des_ofb64);
+			BIO_printf(bio_err," -%-4s (%s)\n",
+				"des", LN_des_cbc);
+
+			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
+				LN_des_ede,LN_des_ede_cbc,
+				LN_des_ede_cfb64,LN_des_ede_ofb64);
+			BIO_printf(bio_err," -desx -none\n");
+
+
+			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
+				LN_des_ede3,LN_des_ede3_cbc,
+				LN_des_ede3_cfb64,LN_des_ede3_ofb64);
+			BIO_printf(bio_err," -%-4s (%s)\n",
+				"des3", LN_des_ede3_cbc);
+
+#ifndef NO_IDEA
+			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
+				LN_idea_ecb, LN_idea_cbc,
+				LN_idea_cfb64, LN_idea_ofb64);
+			BIO_printf(bio_err," -%-4s (%s)\n","idea",LN_idea_cbc);
+#endif
+#ifndef NO_RC2
+			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
+				LN_rc2_ecb, LN_rc2_cbc,
+				LN_rc2_cfb64, LN_rc2_ofb64);
+			BIO_printf(bio_err," -%-4s (%s)\n","rc2", LN_rc2_cbc);
+#endif
+#ifndef NO_BF
+			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
+				LN_bf_ecb, LN_bf_cbc,
+				LN_bf_cfb64, LN_bf_ofb64);
+			BIO_printf(bio_err," -%-4s (%s)\n","bf", LN_bf_cbc);
+#endif
+#ifndef NO_CAST
+			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
+				LN_cast5_ecb, LN_cast5_cbc,
+				LN_cast5_cfb64, LN_cast5_ofb64);
+			BIO_printf(bio_err," -%-4s (%s)\n","cast", LN_cast5_cbc);
+#endif
+#ifndef NO_RC5
+			BIO_printf(bio_err," -%-12s -%-12s -%-12s -%-12s",
+				LN_rc5_ecb, LN_rc5_cbc,
+				LN_rc5_cfb64, LN_rc5_ofb64);
+			BIO_printf(bio_err," -%-4s (%s)\n","rc5", LN_rc5_cbc);
+#endif
 			goto end;
 			}
 		argc--;
 		argv++;
 		}
 
-        e = setup_engine(bio_err, engine, 0);
-
 	if (bufsize != NULL)
 		{
 		unsigned long n;
@@ -390,7 +418,7 @@ bad:
 	if (outf == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -428,9 +456,6 @@ bad:
 
 	if (cipher != NULL)
 		{
-		/* Note that str is NULL if a key was passed on the command
-		 * line, so we get no salt in that case. Is this a bug?
-		 */
 		if (str != NULL)
 			{
 			/* Salt handling: if encrypting generate a salt and
@@ -481,9 +506,14 @@ bad:
 			 * bug picked up by
 			 * Larry J. Hughes Jr. <hughes@indiana.edu> */
 			if (str == strbuf)
-				memset(str,0,SIZE);
+				OPENSSL_cleanse(str,SIZE);
 			else
-				memset(str,0,strlen(str));
+				OPENSSL_cleanse(str,strlen(str));
+			}
+		if ((hiv != NULL) && !set_hex(hiv,iv,8))
+			{
+			BIO_printf(bio_err,"invalid hex iv value\n");
+			goto end;
 			}
 		if ((hiv == NULL) && (str == NULL))
 			{
@@ -493,12 +523,7 @@ 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))
+		if ((hkey != NULL) && !set_hex(hkey,key,24))
 			{
 			BIO_printf(bio_err,"invalid hex key value\n");
 			goto end;
@@ -507,12 +532,6 @@ bad:
 		if ((benc=BIO_new(BIO_f_cipher())) == NULL)
 			goto end;
 		BIO_set_cipher(benc,cipher,key,iv,enc);
-		if (nopad)
-			{
-			EVP_CIPHER_CTX *ctx;
-			BIO_get_cipher_ctx(benc, &ctx);
-			EVP_CIPHER_CTX_set_padding(ctx, 0);
-			}
 		if (debug)
 			{
 			BIO_set_callback(benc,BIO_debug_callback);
@@ -585,8 +604,7 @@ end:
 	if (benc != NULL) BIO_free(benc);
 	if (b64 != NULL) BIO_free(b64);
 	if(pass) OPENSSL_free(pass);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 int set_hex(char *in, unsigned char *out, int size)

apps/engine.c

@@ -1,520 +0,0 @@
-/* apps/engine.c -*- mode: C; c-file-style: "eay" -*- */
-/* Written by Richard Levitte <richard@levitte.org> for the OpenSSL
- * project 2000.
- */
-/* ====================================================================
- * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.OpenSSL.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    licensing@OpenSSL.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.OpenSSL.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#ifdef OPENSSL_NO_STDIO
-#define APPS_WIN16
-#endif
-#include "apps.h"
-#include <openssl/err.h>
-#include <openssl/engine.h>
-#include <openssl/ssl.h>
-
-#undef PROG
-#define PROG	engine_main
-
-static char *engine_usage[]={
-"usage: engine opts [engine ...]\n",
-" -v[v[v[v]]] - verbose mode, for each engine, list its 'control commands'\n",
-"               -vv will additionally display each command's description\n",
-"               -vvv will also add the input flags for each command\n",
-"               -vvvv will also show internal input flags\n",
-" -c          - for each engine, also list the capabilities\n",
-" -t          - for each engine, check that they are really available\n",
-" -pre <cmd>  - runs command 'cmd' against the ENGINE before any attempts\n",
-"               to load it (if -t is used)\n",
-" -post <cmd> - runs command 'cmd' against the ENGINE after loading it\n",
-"               (only used if -t is also provided)\n",
-" NB: -pre and -post will be applied to all ENGINEs supplied on the command\n",
-" line, or all supported ENGINEs if none are specified.\n",
-" Eg. '-pre \"SO_PATH:/lib/libdriver.so\"' calls command \"SO_PATH\" with\n",
-" argument \"/lib/libdriver.so\".\n",
-NULL
-};
-
-static void identity(void *ptr)
-	{
-	return;
-	}
-
-static int append_buf(char **buf, const char *s, int *size, int step)
-	{
-	int l = strlen(s);
-
-	if (*buf == NULL)
-		{
-		*size = step;
-		*buf = OPENSSL_malloc(*size);
-		if (*buf == NULL)
-			return 0;
-		**buf = '\0';
-		}
-
-	if (**buf != '\0')
-		l += 2;		/* ", " */
-
-	if (strlen(*buf) + strlen(s) >= (unsigned int)*size)
-		{
-		*size += step;
-		*buf = OPENSSL_realloc(*buf, *size);
-		}
-
-	if (*buf == NULL)
-		return 0;
-
-	if (**buf != '\0')
-		strcat(*buf, ", ");
-	strcat(*buf, s);
-
-	return 1;
-	}
-
-static int util_flags(BIO *bio_out, unsigned int flags, const char *indent)
-	{
-	int started = 0, err = 0;
-	/* Indent before displaying input flags */
-	BIO_printf(bio_out, "%s%s(input flags): ", indent, indent);
-	if(flags == 0)
-		{
-		BIO_printf(bio_out, "<no flags>\n");
-		return 1;
-		}
-        /* If the object is internal, mark it in a way that shows instead of
-         * having it part of all the other flags, even if it really is. */
-	if(flags & ENGINE_CMD_FLAG_INTERNAL)
-		{
-		BIO_printf(bio_out, "[Internal] ");
-		}
-
-	if(flags & ENGINE_CMD_FLAG_NUMERIC)
-		{
-		if(started)
-			{
-			BIO_printf(bio_out, "|");
-			err = 1;
-			}
-		BIO_printf(bio_out, "NUMERIC");
-		started = 1;
-		}
-	/* Now we check that no combinations of the mutually exclusive NUMERIC,
-	 * STRING, and NO_INPUT flags have been used. Future flags that can be
-	 * OR'd together with these would need to added after these to preserve
-	 * the testing logic. */
-	if(flags & ENGINE_CMD_FLAG_STRING)
-		{
-		if(started)
-			{
-			BIO_printf(bio_out, "|");
-			err = 1;
-			}
-		BIO_printf(bio_out, "STRING");
-		started = 1;
-		}
-	if(flags & ENGINE_CMD_FLAG_NO_INPUT)
-		{
-		if(started)
-			{
-			BIO_printf(bio_out, "|");
-			err = 1;
-			}
-		BIO_printf(bio_out, "NO_INPUT");
-		started = 1;
-		}
-	/* Check for unknown flags */
-	flags = flags & ~ENGINE_CMD_FLAG_NUMERIC &
-			~ENGINE_CMD_FLAG_STRING &
-			~ENGINE_CMD_FLAG_NO_INPUT &
-			~ENGINE_CMD_FLAG_INTERNAL;
-	if(flags)
-		{
-		if(started) BIO_printf(bio_out, "|");
-		BIO_printf(bio_out, "<0x%04X>", flags);
-		}
-	if(err)
-		BIO_printf(bio_out, "  <illegal flags!>");
-	BIO_printf(bio_out, "\n");
-	return 1;
-	}
-
-static int util_verbose(ENGINE *e, int verbose, BIO *bio_out, const char *indent)
-	{
-	static const int line_wrap = 78;
-	int num;
-	int ret = 0;
-	char *name = NULL;
-	char *desc = NULL;
-	int flags;
-	int xpos = 0;
-	STACK *cmds = NULL;
-	if(!ENGINE_ctrl(e, ENGINE_CTRL_HAS_CTRL_FUNCTION, 0, NULL, NULL) ||
-			((num = ENGINE_ctrl(e, ENGINE_CTRL_GET_FIRST_CMD_TYPE,
-					0, NULL, NULL)) <= 0))
-		{
-#if 0
-		BIO_printf(bio_out, "%s<no control commands>\n", indent);
-#endif
-		return 1;
-		}
-
-	cmds = sk_new_null();
-
-	if(!cmds)
-		goto err;
-	do {
-		int len;
-		/* Get the command input flags */
-		if((flags = ENGINE_ctrl(e, ENGINE_CTRL_GET_CMD_FLAGS, num,
-					NULL, NULL)) < 0)
-			goto err;
-                if (!(flags & ENGINE_CMD_FLAG_INTERNAL) || verbose >= 4)
-                        {
-                        /* Get the command name */
-                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_LEN_FROM_CMD, num,
-                                NULL, NULL)) <= 0)
-                                goto err;
-                        if((name = OPENSSL_malloc(len + 1)) == NULL)
-                                goto err;
-                        if(ENGINE_ctrl(e, ENGINE_CTRL_GET_NAME_FROM_CMD, num, name,
-                                NULL) <= 0)
-                                goto err;
-                        /* Get the command description */
-                        if((len = ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_LEN_FROM_CMD, num,
-                                NULL, NULL)) < 0)
-                                goto err;
-                        if(len > 0)
-                                {
-                                if((desc = OPENSSL_malloc(len + 1)) == NULL)
-                                        goto err;
-                                if(ENGINE_ctrl(e, ENGINE_CTRL_GET_DESC_FROM_CMD, num, desc,
-                                        NULL) <= 0)
-                                        goto err;
-                                }
-                        /* Now decide on the output */
-                        if(xpos == 0)
-                                /* Do an indent */
-                                xpos = BIO_printf(bio_out, indent);
-                        else
-                                /* Otherwise prepend a ", " */
-                                xpos += BIO_printf(bio_out, ", ");
-                        if(verbose == 1)
-                                {
-                                /* We're just listing names, comma-delimited */
-                                if((xpos > (int)strlen(indent)) &&
-					(xpos + (int)strlen(name) > line_wrap))
-                                        {
-                                        BIO_printf(bio_out, "\n");
-                                        xpos = BIO_printf(bio_out, indent);
-                                        }
-                                xpos += BIO_printf(bio_out, "%s", name);
-                                }
-                        else
-                                {
-                                /* We're listing names plus descriptions */
-                                BIO_printf(bio_out, "%s: %s\n", name,
-                                        (desc == NULL) ? "<no description>" : desc);
-                                /* ... and sometimes input flags */
-                                if((verbose >= 3) && !util_flags(bio_out, flags,
-                                        indent))
-                                        goto err;
-                                xpos = 0;
-                                }
-                        }
-		OPENSSL_free(name); name = NULL;
-		if(desc) { OPENSSL_free(desc); desc = NULL; }
-		/* Move to the next command */
-		num = ENGINE_ctrl(e, ENGINE_CTRL_GET_NEXT_CMD_TYPE,
-					num, NULL, NULL);
-		} while(num > 0);
-	if(xpos > 0)
-		BIO_printf(bio_out, "\n");
-	ret = 1;
-err:
-	if(cmds) sk_pop_free(cmds, identity);
-	if(name) OPENSSL_free(name);
-	if(desc) OPENSSL_free(desc);
-	return ret;
-	}
-
-static void util_do_cmds(ENGINE *e, STACK *cmds, BIO *bio_out, const char *indent)
-	{
-	int loop, res, num = sk_num(cmds);
-	if(num < 0)
-		{
-		BIO_printf(bio_out, "[Error]: internal stack error\n");
-		return;
-		}
-	for(loop = 0; loop < num; loop++)
-		{
-		char buf[256];
-		const char *cmd, *arg;
-		cmd = sk_value(cmds, loop);
-		res = 1; /* assume success */
-		/* Check if this command has no ":arg" */
-		if((arg = strstr(cmd, ":")) == NULL)
-			{
-			if(!ENGINE_ctrl_cmd_string(e, cmd, NULL, 0))
-				res = 0;
-			}
-		else
-			{
-			if((int)(arg - cmd) > 254)
-				{
-				BIO_printf(bio_out,"[Error]: command name too long\n");
-				return;
-				}
-			memcpy(buf, cmd, (int)(arg - cmd));
-			buf[arg-cmd] = '\0';
-			arg++; /* Move past the ":" */
-			/* Call the command with the argument */
-			if(!ENGINE_ctrl_cmd_string(e, buf, arg, 0))
-				res = 0;
-			}
-		if(res)
-			BIO_printf(bio_out, "[Success]: %s\n", cmd);
-		else
-			{
-			BIO_printf(bio_out, "[Failure]: %s\n", cmd);
-			ERR_print_errors(bio_out);
-			}
-		}
-	}
-
-int MAIN(int, char **);
-
-int MAIN(int argc, char **argv)
-	{
-	int ret=1,i;
-	char **pp;
-	int verbose=0, list_cap=0, test_avail=0;
-	ENGINE *e;
-	STACK *engines = sk_new_null();
-	STACK *pre_cmds = sk_new_null();
-	STACK *post_cmds = sk_new_null();
-	int badops=1;
-	BIO *bio_out=NULL;
-	const char *indent = "     ";
-
-	apps_startup();
-	SSL_load_error_strings();
-
-	if (bio_err == NULL)
-		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
-
-	if (!load_config(bio_err, NULL))
-		goto end;
-	bio_out=BIO_new_fp(stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
-	{
-	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
-	bio_out = BIO_push(tmpbio, bio_out);
-	}
-#endif
-
-	argc--;
-	argv++;
-	while (argc >= 1)
-		{
-		if (strncmp(*argv,"-v",2) == 0)
-			{
-			if(strspn(*argv + 1, "v") < strlen(*argv + 1))
-				goto skip_arg_loop;
-			if((verbose=strlen(*argv + 1)) > 4)
-				goto skip_arg_loop;
-			}
-		else if (strcmp(*argv,"-c") == 0)
-			list_cap=1;
-		else if (strcmp(*argv,"-t") == 0)
-			test_avail=1;
-		else if (strcmp(*argv,"-pre") == 0)
-			{
-			argc--; argv++;
-			sk_push(pre_cmds,*argv);
-			}
-		else if (strcmp(*argv,"-post") == 0)
-			{
-			argc--; argv++;
-			sk_push(post_cmds,*argv);
-			}
-		else if ((strncmp(*argv,"-h",2) == 0) ||
-				(strcmp(*argv,"-?") == 0))
-			goto skip_arg_loop;
-		else
-			sk_push(engines,*argv);
-		argc--;
-		argv++;
-		}
-	/* Looks like everything went OK */
-	badops = 0;
-skip_arg_loop:
-
-	if (badops)
-		{
-		for (pp=engine_usage; (*pp != NULL); pp++)
-			BIO_printf(bio_err,"%s",*pp);
-		goto end;
-		}
-
-	if (sk_num(engines) == 0)
-		{
-		for(e = ENGINE_get_first(); e != NULL; e = ENGINE_get_next(e))
-			{
-			sk_push(engines,(char *)ENGINE_get_id(e));
-			}
-		}
-
-	for (i=0; i<sk_num(engines); i++)
-		{
-		const char *id = sk_value(engines,i);
-		if ((e = ENGINE_by_id(id)) != NULL)
-			{
-			const char *name = ENGINE_get_name(e);
-			/* Do "id" first, then "name". Easier to auto-parse. */
-			BIO_printf(bio_out, "(%s) %s\n", id, name);
-			util_do_cmds(e, pre_cmds, bio_out, indent);
-			if (strcmp(ENGINE_get_id(e), id) != 0)
-				{
-				BIO_printf(bio_out, "Loaded: (%s) %s\n",
-					ENGINE_get_id(e), ENGINE_get_name(e));
-				}
-			if (list_cap)
-				{
-				int cap_size = 256;
-				char *cap_buf = NULL;
-				int k,n;
-				const int *nids;
-				ENGINE_CIPHERS_PTR fn_c;
-				ENGINE_DIGESTS_PTR fn_d;
-
-				if (ENGINE_get_RSA(e) != NULL
-					&& !append_buf(&cap_buf, "RSA",
-						&cap_size, 256))
-					goto end;
-				if (ENGINE_get_DSA(e) != NULL
-					&& !append_buf(&cap_buf, "DSA",
-						&cap_size, 256))
-					goto end;
-				if (ENGINE_get_DH(e) != NULL
-					&& !append_buf(&cap_buf, "DH",
-						&cap_size, 256))
-					goto end;
-				if (ENGINE_get_RAND(e) != NULL
-					&& !append_buf(&cap_buf, "RAND",
-						&cap_size, 256))
-					goto end;
-
-				fn_c = ENGINE_get_ciphers(e);
-				if(!fn_c) goto skip_ciphers;
-				n = fn_c(e, NULL, &nids, 0);
-				for(k=0 ; k < n ; ++k)
-					if(!append_buf(&cap_buf,
-						       OBJ_nid2sn(nids[k]),
-						       &cap_size, 256))
-						goto end;
-
-skip_ciphers:
-				fn_d = ENGINE_get_digests(e);
-				if(!fn_d) goto skip_digests;
-				n = fn_d(e, NULL, &nids, 0);
-				for(k=0 ; k < n ; ++k)
-					if(!append_buf(&cap_buf,
-						       OBJ_nid2sn(nids[k]),
-						       &cap_size, 256))
-						goto end;
-
-skip_digests:
-				if (cap_buf && (*cap_buf != '\0'))
-					BIO_printf(bio_out, " [%s]\n", cap_buf);
-
-				OPENSSL_free(cap_buf);
-				}
-			if(test_avail)
-				{
-				BIO_printf(bio_out, "%s", indent);
-				if (ENGINE_init(e))
-					{
-					BIO_printf(bio_out, "[ available ]\n");
-					util_do_cmds(e, post_cmds, bio_out, indent);
-					ENGINE_finish(e);
-					}
-				else
-					{
-					BIO_printf(bio_out, "[ unavailable ]\n");
-					ERR_print_errors_fp(stdout);
-					ERR_clear_error();
-					}
-				}
-			if((verbose > 0) && !util_verbose(e, verbose, bio_out, indent))
-				goto end;
-			ENGINE_free(e);
-			}
-		else
-			ERR_print_errors(bio_err);
-		}
-
-	ret=0;
-end:
-	ERR_print_errors(bio_err);
-	sk_pop_free(engines, identity);
-	sk_pop_free(pre_cmds, identity);
-	sk_pop_free(post_cmds, identity);
-	if (bio_out != NULL) BIO_free_all(bio_out);
-	apps_shutdown();
-	EXIT(ret);
-	}

apps/errstr.c

@@ -91,7 +91,7 @@ int MAIN(int argc, char **argv)
 		out=BIO_new(BIO_s_file());
 		if ((out != NULL) && BIO_set_fp(out,stdout,BIO_NOCLOSE))
 			{
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 			{
 			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 			out = BIO_push(tmpbio, out);
@@ -121,6 +121,5 @@ int MAIN(int argc, char **argv)
 			ret++;
 			}
 		}
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}

apps/gendh.c

@@ -57,7 +57,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -81,13 +81,11 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	DH *dh=NULL;
 	int ret=1,num=DEFBITS;
 	int g=2;
 	char *outfile=NULL;
 	char *inrand=NULL;
-	char *engine=NULL;
 	BIO *out=NULL;
 
 	apps_startup();
@@ -96,9 +94,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	argv++;
 	argc--;
 	for (;;)
@@ -115,11 +110,6 @@ int MAIN(int argc, char **argv)
 			g=3; */
 		else if (strcmp(*argv,"-5") == 0)
 			g=5;
-		else if (strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) goto bad;
-			engine= *(++argv);
-			}
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -135,18 +125,15 @@ int MAIN(int argc, char **argv)
 bad:
 		BIO_printf(bio_err,"usage: gendh [args] [numbits]\n");
 		BIO_printf(bio_err," -out file - output the key to 'file\n");
-		BIO_printf(bio_err," -2        - use 2 as the generator value\n");
-	/*	BIO_printf(bio_err," -3        - use 3 as the generator value\n"); */
-		BIO_printf(bio_err," -5        - use 5 as the generator value\n");
-		BIO_printf(bio_err," -engine e - use engine e, possibly a hardware device.\n");
+		BIO_printf(bio_err," -2    use 2 as the generator value\n");
+	/*	BIO_printf(bio_err," -3    use 3 as the generator value\n"); */
+		BIO_printf(bio_err," -5    use 5 as the generator value\n");
 		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"             the random number generator\n");
 		goto end;
 		}
 		
-        e = setup_engine(bio_err, engine, 0);
-
 	out=BIO_new(BIO_s_file());
 	if (out == NULL)
 		{
@@ -157,7 +144,7 @@ bad:
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -197,8 +184,7 @@ end:
 		ERR_print_errors(bio_err);
 	if (out != NULL) BIO_free_all(out);
 	if (dh != NULL) DH_free(dh);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 static void MS_CALLBACK dh_cb(int p, int n, void *arg)

apps/gendsa.c

@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -77,15 +77,13 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	DSA *dsa=NULL;
 	int ret=1;
 	char *outfile=NULL;
 	char *inrand=NULL,*dsaparams=NULL;
 	char *passargout = NULL, *passout = NULL;
 	BIO *out=NULL,*in=NULL;
-	const EVP_CIPHER *enc=NULL;
-	char *engine=NULL;
+	EVP_CIPHER *enc=NULL;
 
 	apps_startup();
 
@@ -93,9 +91,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	argv++;
 	argc--;
 	for (;;)
@@ -111,11 +106,6 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			passargout= *(++argv);
 			}
-		else if (strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) goto bad;
-			engine= *(++argv);
-			}
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -123,23 +113,15 @@ int MAIN(int argc, char **argv)
 			}
 		else if (strcmp(*argv,"-") == 0)
 			goto bad;
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 		else if (strcmp(*argv,"-des") == 0)
 			enc=EVP_des_cbc();
 		else if (strcmp(*argv,"-des3") == 0)
 			enc=EVP_des_ede3_cbc();
 #endif
-#ifndef OPENSSL_NO_IDEA
+#ifndef NO_IDEA
 		else if (strcmp(*argv,"-idea") == 0)
 			enc=EVP_idea_cbc();
-#endif
-#ifndef OPENSSL_NO_AES
-		else if (strcmp(*argv,"-aes128") == 0)
-			enc=EVP_aes_128_cbc();
-		else if (strcmp(*argv,"-aes192") == 0)
-			enc=EVP_aes_192_cbc();
-		else if (strcmp(*argv,"-aes256") == 0)
-			enc=EVP_aes_256_cbc();
 #endif
 		else if (**argv != '-' && dsaparams == NULL)
 			{
@@ -156,18 +138,13 @@ int MAIN(int argc, char **argv)
 bad:
 		BIO_printf(bio_err,"usage: gendsa [args] dsaparam-file\n");
 		BIO_printf(bio_err," -out file - output the key to 'file'\n");
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 		BIO_printf(bio_err," -des      - encrypt the generated key with DES in cbc mode\n");
 		BIO_printf(bio_err," -des3     - encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
 #endif
-#ifndef OPENSSL_NO_IDEA
+#ifndef NO_IDEA
 		BIO_printf(bio_err," -idea     - encrypt the generated key with IDEA in cbc mode\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," -engine e - use engine e, possibly a hardware device.\n");
 		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 		BIO_printf(bio_err,"           - load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"             the random number generator\n");
@@ -176,8 +153,6 @@ bad:
 		goto end;
 		}
 
-        e = setup_engine(bio_err, engine, 0);
-
 	if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) {
 		BIO_printf(bio_err, "Error getting password\n");
 		goto end;
@@ -205,7 +180,7 @@ bad:
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -245,7 +220,6 @@ end:
 	if (out != NULL) BIO_free_all(out);
 	if (dsa != NULL) DSA_free(dsa);
 	if(passout) OPENSSL_free(passout);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 #endif

apps/genrsa.c

@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_RSA
+#ifndef NO_RSA
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>
@@ -69,7 +69,6 @@
 #include <openssl/evp.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
-#include <openssl/rand.h>
 
 #define DEFBITS	512
 #undef PROG
@@ -81,16 +80,14 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	int ret=1;
 	RSA *rsa=NULL;
 	int i,num=DEFBITS;
 	long l;
-	const EVP_CIPHER *enc=NULL;
+	EVP_CIPHER *enc=NULL;
 	unsigned long f4=RSA_F4;
 	char *outfile=NULL;
 	char *passargout = NULL, *passout = NULL;
-	char *engine=NULL;
 	char *inrand=NULL;
 	BIO *out=NULL;
 
@@ -99,9 +96,6 @@ int MAIN(int argc, char **argv)
 	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 err;
 	if ((out=BIO_new(BIO_s_file())) == NULL)
 		{
 		BIO_printf(bio_err,"unable to create BIO for output\n");
@@ -122,33 +116,20 @@ int MAIN(int argc, char **argv)
 			f4=3;
 		else if (strcmp(*argv,"-F4") == 0 || strcmp(*argv,"-f4") == 0)
 			f4=RSA_F4;
-		else if (strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) goto bad;
-			engine= *(++argv);
-			}
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) goto bad;
 			inrand= *(++argv);
 			}
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 		else if (strcmp(*argv,"-des") == 0)
 			enc=EVP_des_cbc();
 		else if (strcmp(*argv,"-des3") == 0)
 			enc=EVP_des_ede3_cbc();
 #endif
-#ifndef OPENSSL_NO_IDEA
+#ifndef NO_IDEA
 		else if (strcmp(*argv,"-idea") == 0)
 			enc=EVP_idea_cbc();
-#endif
-#ifndef OPENSSL_NO_AES
-		else if (strcmp(*argv,"-aes128") == 0)
-			enc=EVP_aes_128_cbc();
-		else if (strcmp(*argv,"-aes192") == 0)
-			enc=EVP_aes_192_cbc();
-		else if (strcmp(*argv,"-aes256") == 0)
-			enc=EVP_aes_256_cbc();
 #endif
 		else if (strcmp(*argv,"-passout") == 0)
 			{
@@ -166,18 +147,13 @@ bad:
 		BIO_printf(bio_err,"usage: genrsa [args] [numbits]\n");
 		BIO_printf(bio_err," -des            encrypt the generated key with DES in cbc mode\n");
 		BIO_printf(bio_err," -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");
-#ifndef OPENSSL_NO_IDEA
+#ifndef NO_IDEA
 		BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\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," -out file       output the key to 'file\n");
 		BIO_printf(bio_err," -passout arg    output file pass phrase source\n");
 		BIO_printf(bio_err," -f4             use F4 (0x10001) for the E value\n");
 		BIO_printf(bio_err," -3              use 3 for the E value\n");
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
 		BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 		BIO_printf(bio_err,"                 load the file (or the files in the directory) into\n");
 		BIO_printf(bio_err,"                 the random number generator\n");
@@ -191,12 +167,10 @@ bad:
 		goto err;
 	}
 
-        e = setup_engine(bio_err, engine, 0);
-
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -212,8 +186,7 @@ bad:
 			}
 		}
 
-	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL
-		&& !RAND_status())
+	if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL)
 		{
 		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 		}
@@ -241,14 +214,8 @@ bad:
 		l+=rsa->e->d[i];
 		}
 	BIO_printf(bio_err,"e is %ld (0x%lX)\n",l,l);
-	{
-	PW_CB_DATA cb_data;
-	cb_data.password = passout;
-	cb_data.prompt_info = outfile;
-	if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,
-		(pem_password_cb *)password_callback,&cb_data))
+	if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,NULL, passout))
 		goto err;
-	}
 
 	ret=0;
 err:
@@ -257,8 +224,7 @@ err:
 	if(passout) OPENSSL_free(passout);
 	if (ret != 0)
 		ERR_print_errors(bio_err);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
@@ -275,7 +241,7 @@ static void MS_CALLBACK genrsa_cb(int p, int n, void *arg)
 	p=n;
 #endif
 	}
-#else /* !OPENSSL_NO_RSA */
+#else /* !NO_RSA */
 
 # if PEDANTIC
 static void *dummy=&dummy;

apps/install.com

@@ -62,9 +62,7 @@ $	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-VMS.CNF/LOG
-$	SET FILE/PROT=W:R WRK_SSLROOT:[000000]OPENSSL-VMS.CNF
-$	COPY OPENSSL.CNF WRK_SSLROOT:[000000]OPENSSL.CNF/LOG
+$	COPY OPENSSL-VMS.CNF WRK_SSLROOT:[000000]OPENSSL.CNF/LOG
 $	SET FILE/PROT=W:R WRK_SSLROOT:[000000]OPENSSL.CNF
 $	SET ON
 $

apps/makeapps.com

@@ -44,19 +44,12 @@ $!  keywords:
 $!
 $!	UCX		for UCX
 $!	SOCKETSHR	for SOCKETSHR+NETLIB
-$!	TCPIP		for TCPIP (post UCX)
 $!
 $!  P5, if defined, sets a compiler thread NOT needed on OpenVMS 7.1 (and up)
 $!
 $!  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.)
 $!
@@ -105,15 +98,15 @@ $ WRITE SYS$OUTPUT "Compiling On A ",ARCH," Machine."
 $!
 $! Define The CRYPTO Library.
 $!
-$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO'build_bits'.OLB
+$ CRYPTO_LIB := SYS$DISK:[-.'ARCH'.EXE.CRYPTO]LIBCRYPTO.OLB
 $!
 $! Define The RSAREF Library.
 $!
-$ RSAREF_LIB := SYS$DISK:[-.'ARCH'.EXE.RSAREF]LIBRSAGLUE'build_bits'.OLB
+$ RSAREF_LIB := SYS$DISK:[-.'ARCH'.EXE.RSAREF]LIBRSAGLUE.OLB
 $!
 $! Define The SSL Library.
 $!
-$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL'build_bits'.OLB
+$ SSL_LIB := SYS$DISK:[-.'ARCH'.EXE.SSL]LIBSSL.OLB
 $!
 $! Define The OBJ Directory.
 $!
@@ -132,23 +125,6 @@ $! 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]
@@ -179,15 +155,15 @@ $!
 $ LIB_FILES = "VERIFY;ASN1PARS;REQ;DGST;DH;DHPARAM;ENC;PASSWD;GENDH;ERRSTR;"+-
 	      "CA;PKCS7;CRL2P7;CRL;"+-
 	      "RSA;RSAUTL;DSA;DSAPARAM;"+-
-	      "X509;GENRSA;GENDSA;TERM_SOCK;S_SERVER;S_CLIENT;SPEED;"+-
+	      "X509;GENRSA;GENDSA;S_SERVER;S_CLIENT;SPEED;"+-
 	      "S_TIME;APPS;S_CB;S_SOCKET;APP_RAND;VERSION;SESS_ID;"+-
-	      "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND;ENGINE;OCSP"
+	      "CIPHERS;NSEQ;PKCS12;PKCS8;SPKAC;SMIME;RAND"
 $ 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,TERM_SOCK.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,-
+	       X509.OBJ,GENRSA.OBJ,GENDSA.OBJ,S_SERVER.OBJ,S_CLIENT.OBJ,SPEED.OBJ,-
 	       S_TIME.OBJ,APPS.OBJ,S_CB.OBJ,S_SOCKET.OBJ,APP_RAND.OBJ,VERSION.OBJ,SESS_ID.OBJ,-
-	       CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ,RAND.OBJ,ENGINE.OBJ,OCSP.OBJ
+	       CIPHERS.OBJ,NSEQ.OBJ,PKCS12.OBJ,PKCS8.OBJ,SPKAC.OBJ,SMIME.OBJ,RAND.OBJ
 $ TCPIP_PROGRAMS = ",,"
 $ IF COMPILER .EQS. "VAXC" THEN -
      TCPIP_PROGRAMS = ",OPENSSL,"
@@ -258,10 +234,6 @@ $! 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"
@@ -275,7 +247,7 @@ $!
 $!  Tell The User That The File Dosen't Exist.
 $!
 $   WRITE SYS$OUTPUT ""
-$   WRITE SYS$OUTPUT F$MESSAGE("%X10018290") + ".  The File ",SOURCE_FILE," Dosen't Exist."
+$   WRITE SYS$OUTPUT "The File ",SOURCE_FILE," Dosen't Exist."
 $   WRITE SYS$OUTPUT ""
 $!
 $!  Exit The Build.
@@ -300,9 +272,9 @@ $!
 $ ON ERROR THEN GOTO NEXT_FILE
 $ IF COMPILEWITH_CC2 - FILE_NAME .NES. COMPILEWITH_CC2
 $ THEN
-$   CC2/OBJECT='OBJECT_FILE'/LIST='LIST_FILE'/MACHINE_CODE 'SOURCE_FILE'
+$   CC2/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
 $ ELSE
-$   CC/OBJECT='OBJECT_FILE'/LIST='LIST_FILE'/MACHINE_CODE 'SOURCE_FILE'
+$   CC/OBJECT='OBJECT_FILE' 'SOURCE_FILE'
 $ ENDIF
 $!
 $ ON WARNING THEN GOTO NEXT_FILE
@@ -332,14 +304,10 @@ $   THEN
 $!
 $!    Link With The RSAREF Library And A Specific TCP/IP Library.
 $!
-$     LINK /'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' /MAP='MAP_FILE' /FULL/CROSS -
+$     LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
 	  'OBJECT_FILE''EXTRA_OBJ', -
-          'SSL_LIB'/LIBRARY,-
-	  'CRYPTO_LIB'/LIBRARY, -
-	  'RSAREF_LIB'/LIBRARY, -
-          'TCPIP_LIB', -
-	  'OPT_FILE'/OPTION, -
-	  SYS$DISK:[-]SSL_IDENT.OPT/OPTION
+          'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
+          'TCPIP_LIB','OPT_FILE'/OPTION
 $!
 $!  Else...
 $!
@@ -347,13 +315,10 @@ $   ELSE
 $!
 $!    Link With The RSAREF Library And NO TCP/IP Library.
 $!
-$     LINK /'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' /MAP='MAP_FILE' /FULL/CROSS -
+$     LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
 	  'OBJECT_FILE''EXTRA_OBJ', -
-          'SSL_LIB'/LIBRARY, -
-	  'CRYPTO_LIB'/LIBRARY, -
-	  'RSAREF_LIB'/LIBRARY, -
-          'OPT_FILE'/OPTION, -
-	  SYS$DISK:[-]SSL_IDENT.OPT/OPTION
+          'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY,'RSAREF_LIB'/LIBRARY, -
+          'OPT_FILE'/OPTION
 $!
 $!  End The TCP/IP Library Check.
 $!
@@ -373,14 +338,10 @@ $   THEN
 $!
 $!    Don't Link With The RSAREF Routines And TCP/IP Library.
 $!
-$       LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' /MAP='MAP_FILE' /FULL/CROSS -
+$       LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
 	    'OBJECT_FILE''EXTRA_OBJ', -
-            'SSL_LIB'/LIBRARY, -
-	    'CRYPTO_LIB'/LIBRARY, -
-            'TCPIP_LIB', -
-	    'OPT_FILE'/OPTION, -
-	  SYS$DISK:[-]SSL_IDENT.OPT/OPTION
-
+            'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
+            'TCPIP_LIB','OPT_FILE'/OPTION
 $!
 $!  Else...
 $!
@@ -388,13 +349,10 @@ $   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 -
+$       LINK/'DEBUGGER'/'TRACEBACK' /EXE='EXE_FILE' -
 	    'OBJECT_FILE''EXTRA_OBJ', -
-            'SSL_LIB'/LIBRARY, -
-	    'CRYPTO_LIB'/LIBRARY, -
-            'OPT_FILE'/OPTION, -
-	  SYS$DISK:[-]SSL_IDENT.OPT/OPTION
-$!
+            'SSL_LIB'/LIBRARY,'CRYPTO_LIB'/LIBRARY, -
+            'OPT_FILE'/OPTION
 $!
 $!  End The TCP/IP Library Check.
 $!
@@ -531,7 +489,6 @@ $!  End The Option File Search.
 $!
 $   ENDIF
 $!
-$!
 $! End The DEC C Check.
 $!
 $ ENDIF
@@ -624,7 +581,6 @@ $ CHECK_OPTIONS:
 $!
 $! Check To See If P1 Is Blank.
 $!
-$ P1 = "NORSAREF"
 $ IF (P1.EQS."NORSAREF")
 $ THEN
 $!
@@ -849,7 +805,31 @@ $ ENDIF
 $!
 $! Set Up Initial CC Definitions, Possibly With User Ones
 $!
-$ CCDEFS = "MONOLITH"
+$ CCDEFS = "VMS=1,MONOLITH,THREADS"
+$ IF F$TRNLNM("OPENSSL_NO_ASM") THEN CCDEFS = CCDEFS + ",NO_ASM"
+$ IF F$TRNLNM("OPENSSL_NO_RSA") THEN CCDEFS = CCDEFS + ",NO_RSA"
+$ IF F$TRNLNM("OPENSSL_NO_DSA") THEN CCDEFS = CCDEFS + ",NO_DSA"
+$ IF F$TRNLNM("OPENSSL_NO_DH") THEN CCDEFS = CCDEFS + ",NO_DH"
+$ IF F$TRNLNM("OPENSSL_NO_MD2") THEN CCDEFS = CCDEFS + ",NO_MD2"
+$ IF F$TRNLNM("OPENSSL_NO_MD5") THEN CCDEFS = CCDEFS + ",NO_MD5"
+$ IF F$TRNLNM("OPENSSL_NO_RIPEMD") THEN CCDEFS = CCDEFS + ",NO_RIPEMD"
+$ IF F$TRNLNM("OPENSSL_NO_SHA") THEN CCDEFS = CCDEFS + ",NO_SHA"
+$ IF F$TRNLNM("OPENSSL_NO_SHA0") THEN CCDEFS = CCDEFS + ",NO_SHA0"
+$ IF F$TRNLNM("OPENSSL_NO_SHA1") THEN CCDEFS = CCDEFS + ",NO_SHA1"
+$ IF F$TRNLNM("OPENSSL_NO_DES")
+$ THEN
+$   CCDEFS = CCDEFS + ",NO_DES,NO_MDC2"
+$ ELSE
+$   IF F$TRNLNM("OPENSSL_NO_MDC2") THEN CCDEFS = CCDEFS + ",NO_MDC2"
+$ ENDIF
+$ IF F$TRNLNM("OPENSSL_NO_RC2") THEN CCDEFS = CCDEFS + ",NO_RC2"
+$ IF F$TRNLNM("OPENSSL_NO_RC4") THEN CCDEFS = CCDEFS + ",NO_RC4"
+$ IF F$TRNLNM("OPENSSL_NO_RC5") THEN CCDEFS = CCDEFS + ",NO_RC5"
+$ IF F$TRNLNM("OPENSSL_NO_IDEA") THEN CCDEFS = CCDEFS + ",NO_IDEA"
+$ IF F$TRNLNM("OPENSSL_NO_BF") THEN CCDEFS = CCDEFS + ",NO_BF"
+$ IF F$TRNLNM("OPENSSL_NO_CAST") THEN CCDEFS = CCDEFS + ",NO_CAST"
+$ IF F$TRNLNM("OPENSSL_NO_HMAC") THEN CCDEFS = CCDEFS + ",NO_HMAC"
+$ IF F$TRNLNM("OPENSSL_NO_SSL2") THEN CCDEFS = CCDEFS + ",NO_SSL2"
 $ IF F$TYPE(USER_CCDEFS) .NES. "" THEN CCDEFS = CCDEFS + "," + USER_CCDEFS
 $ CCEXTRAFLAGS = ""
 $ IF F$TYPE(USER_CCFLAGS) .NES. "" THEN CCEXTRAFLAGS = USER_CCFLAGS
@@ -881,12 +861,11 @@ $     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" + -
-           "/PREFIX=ALL" + -
-	   "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS
+           "/NOLIST/PREFIX=ALL" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]''arch'_DECC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]VAX_DECC_OPTIONS.OPT"
 $!
 $!  End DECC Check.
 $!
@@ -913,8 +892,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'" + -
-	   "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS
+$     CC = CC + "/''CC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS
 $     CCDEFS = CCDEFS + ",""VAXC"""
 $!
 $!    Define <sys> As SYS$COMMON:[SYSLIB]
@@ -923,7 +901,7 @@ $     DEFINE/NOLOG SYS SYS$COMMON:[SYSLIB]
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]''arch'_VAXC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]VAX_VAXC_OPTIONS.OPT"
 $!
 $!  End VAXC Check
 $!
@@ -945,12 +923,11 @@ $!
 $!    Use GNU C...
 $!
 $     IF F$TYPE(GCC) .EQS. "" THEN GCC := GCC
-$     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'" + -
-	   "/INCLUDE=(SYS$DISK:[-])" + CCEXTRAFLAGS
+$     CC = GCC+"/NOCASE_HACK/''GCC_OPTIMIZE'/''DEBUGGER'/NOLIST" + CCEXTRAFLAGS
 $!
 $!    Define The Linker Options File Name.
 $!
-$     OPT_FILE = "SYS$DISK:[]''arch'_GNUC_OPTIONS.OPT"
+$     OPT_FILE = "SYS$DISK:[]VAX_GNUC_OPTIONS.OPT"
 $!
 $!  End The GNU C Check.
 $!
@@ -1006,7 +983,7 @@ $ ENDIF
 $!
 $! Time to check the contents, and to make sure we get the correct library.
 $!
-$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX" .OR. P4.EQS."TCPIP" .OR. P4.EQS."NONE"
+$ IF P4.EQS."SOCKETSHR" .OR. P4.EQS."MULTINET" .OR. P4.EQS."UCX"
 $ THEN
 $!
 $!  Check to see if SOCKETSHR was chosen
@@ -1016,7 +993,7 @@ $   THEN
 $!
 $!    Set the library to use SOCKETSHR
 $!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]SOCKETSHR_SHR.OPT/OPT"
+$     TCPIP_LIB = "[-.VMS]SOCKETSHR_SHR.OPT/OPT"
 $!
 $!    Done with SOCKETSHR
 $!
@@ -1042,45 +1019,19 @@ $   THEN
 $!
 $!    Set the library to use UCX.
 $!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC.OPT/OPT"
+$     TCPIP_LIB = "[-.VMS]UCX_SHR_DECC.OPT/OPT"
 $     IF F$TRNLNM("UCX$IPC_SHR") .NES. ""
 $     THEN
-$       TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
+$       TCPIP_LIB = "[-.VMS]UCX_SHR_DECC_LOG.OPT/OPT"
 $     ELSE
 $       IF COMPILER .NES. "DECC" .AND. ARCH .EQS. "VAX" THEN -
-	  TCPIP_LIB = "SYS$DISK:[-.VMS]UCX_SHR_VAXC.OPT/OPT"
+	  TCPIP_LIB = "[-.VMS]UCX_SHR_VAXC.OPT/OPT"
 $     ENDIF
 $!
 $!    Done with UCX
 $!
 $   ENDIF
 $!
-$!  Check to see if TCPIP (post UCX) was chosen
-$!
-$   IF P4.EQS."TCPIP"
-$   THEN
-$!
-$!    Set the library to use TCPIP.
-$!
-$     TCPIP_LIB = "SYS$DISK:[-.VMS]TCPIP_SHR_DECC.OPT/OPT"
-$!
-$!    Done with TCPIP
-$!
-$   ENDIF
-$!
-$!  Check to see if NONE was chosen
-$!
-$   IF P4.EQS."NONE"
-$   THEN
-$!
-$!    Do not use TCPIP.
-$!
-$     TCPIP_LIB = ""
-$!
-$!    Done with TCPIP
-$!
-$   ENDIF
-$!
 $!  Add TCP/IP type to CC definitions.
 $!
 $   CCDEFS = CCDEFS + ",TCPIP_TYPE_''P4'"
@@ -1100,7 +1051,6 @@ $   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."
-$   WRITE SYS$OUTPUT "    TCPIP      :  To link with TCPIP (post UCX) TCP/IP library."
 $   WRITE SYS$OUTPUT ""
 $!
 $!  Time To EXIT.
@@ -1127,7 +1077,7 @@ $ CC = CC + "/DEFINE=(" + CCDEFS + ")" + CCDISABLEWARNINGS
 $!
 $! Show user the result
 $!
-$ WRITE SYS$OUTPUT "Main Compiling Command: ",CC
+$ WRITE/SYMBOL SYS$OUTPUT "Main Compiling Command: ",CC
 $!
 $! Special Threads For OpenVMS v7.1 Or Later
 $!

apps/nseq.c

@@ -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");
-		EXIT(1);
+		OPENSSL_EXIT(1);
 	}
 
 	if (infile) {
@@ -121,7 +121,7 @@ int MAIN(int argc, char **argv)
 		}
 	} else {
 		out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -162,6 +162,6 @@ end:
 	BIO_free_all(out);
 	NETSCAPE_CERT_SEQUENCE_free(seq);
 
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 }
 

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		= 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.
+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.
 
-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
+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
 
 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	= supplied
-organizationName	= supplied
+stateOrProvinceName	= match
+organizationName	= match
 organizationalUnitName	= optional
 commonName		= supplied
 emailAddress		= optional

apps/openssl.c

@@ -55,60 +55,6 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
-
 
 #include <stdio.h>
 #include <string.h>
@@ -121,114 +67,25 @@
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #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>
 
-/* The LHASH callbacks ("hash" & "cmp") have been replaced by functions with the
- * base prototypes (we cast each variable inside the function to the required
- * type of "FUNCTION*"). This removes the necessity for macro-generated wrapper
- * functions. */
-
-/* static unsigned long MS_CALLBACK hash(FUNCTION *a); */
-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 unsigned long MS_CALLBACK hash(FUNCTION *a);
+static int MS_CALLBACK cmp(FUNCTION *a,FUNCTION *b);
 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
+LHASH *config=NULL;
 BIO *bio_err=NULL;
 #endif
 
-
-static void lock_dbg_cb(int mode, int type, const char *file, int line)
-	{
-	static int modes[CRYPTO_NUM_LOCKS]; /* = {0, 0, ... } */
-	const char *errstr = NULL;
-	int rw;
-	
-	rw = mode & (CRYPTO_READ|CRYPTO_WRITE);
-	if (!((rw == CRYPTO_READ) || (rw == CRYPTO_WRITE)))
-		{
-		errstr = "invalid mode";
-		goto err;
-		}
-
-	if (type < 0 || type > CRYPTO_NUM_LOCKS)
-		{
-		errstr = "type out of bounds";
-		goto err;
-		}
-
-	if (mode & CRYPTO_LOCK)
-		{
-		if (modes[type])
-			{
-			errstr = "already locked";
-			/* must not happen in a single-threaded program
-			 * (would deadlock) */
-			goto err;
-			}
-
-		modes[type] = rw;
-		}
-	else if (mode & CRYPTO_UNLOCK)
-		{
-		if (!modes[type])
-			{
-			errstr = "not locked";
-			goto err;
-			}
-		
-		if (modes[type] != rw)
-			{
-			errstr = (rw == CRYPTO_READ) ?
-				"CRYPTO_r_unlock on write lock" :
-				"CRYPTO_w_unlock on read lock";
-			}
-
-		modes[type] = 0;
-		}
-	else
-		{
-		errstr = "invalid mode";
-		goto err;
-		}
-
- err:
-	if (errstr)
-		{
-		/* we cannot use bio_err here */
-		fprintf(stderr, "openssl (lock_dbg_cb): %s (mode=%d, type=%d) at %s:%d\n",
-			errstr, mode, type, file, 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
@@ -238,48 +95,24 @@ int main(int Argc, char *Argv[])
 	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 (getenv("OPENSSL_DEBUG_MEMORY") != NULL) /* if not defined, use compiled-in library defaults */
-		{
-		if (!(0 == strcmp(getenv("OPENSSL_DEBUG_MEMORY"), "off")))
-			{
+	if (getenv("OPENSSL_DEBUG_MEMORY") != NULL)
 		CRYPTO_malloc_debug_init();
-			CRYPTO_set_mem_debug_options(V_CRYPTO_MDEBUG_ALL);
-			}
-		else
-			{
-			/* OPENSSL_DEBUG_MEMORY=off */
-			CRYPTO_set_mem_debug_functions(0, 0, 0, 0, 0);
-			}
-		}
 	CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
 
-#if 0
-	if (getenv("OPENSSL_DEBUG_LOCKING") != NULL)
-#endif
-		{
-		CRYPTO_set_locking_callback(lock_dbg_cb);
-		}
-
 	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);
 
+	ERR_load_crypto_strings();
+
 	/* Lets load up our environment a little */
 	p=getenv("OPENSSL_CONF");
 	if (p == NULL)
@@ -287,7 +120,7 @@ int main(int Argc, char *Argv[])
 	if (p == NULL)
 		{
 		strcpy(config_name,X509_get_default_cert_area());
-#ifndef OPENSSL_SYS_VMS
+#ifndef VMS
 		strcat(config_name,"/");
 #endif
 		strcat(config_name,OPENSSL_CONF);
@@ -296,35 +129,20 @@ int main(int Argc, char *Argv[])
 
 	default_config_file=p;
 
-	config=NCONF_new(NULL);
-	i=NCONF_load(config,p,&errline);
-	if (i == 0)
-		{
-		NCONF_free(config);
-		config = NULL;
-		ERR_clear_error();
-		}
+	config=CONF_load(config,p,&errline);
+	if (config == NULL) ERR_clear_error();
 
 	prog=prog_init();
 
 	/* first check the program name */
-#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;
 		}
 
@@ -333,32 +151,14 @@ 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;
@@ -370,14 +170,7 @@ int main(int Argc, char *Argv[])
 			p[0]='\0';
 			if (i++)
 				prompt=">";
-			else 
-			   if(loop == 0){  /* first round in this loop*/
-				prompt="OpenSSL> ";
-				loop++;
-			   }
-			   else 
-				prompt="\nOpenSSL> ";
-
+			else	prompt="OpenSSL> ";
 			fputs(prompt,stdout);
 			fflush(stdout);
 			fgets(p,n,stdin);
@@ -406,13 +199,15 @@ int main(int Argc, char *Argv[])
 end:
 	if (config != NULL)
 		{
-		NCONF_free(config);
+		CONF_free(config);
 		config=NULL;
 		}
 	if (prog != NULL) lh_free(prog);
 	if (arg.data != NULL) OPENSSL_free(arg.data);
+	ERR_remove_state(0);
 
-	apps_shutdown();
+	EVP_cleanup();
+	ERR_free_strings();
 	
 	CRYPTO_mem_leaks(bio_err);
 	if (bio_err != NULL)
@@ -420,14 +215,13 @@ end:
 		BIO_free(bio_err);
 		bio_err=NULL;
 		}
-	EXIT(ret);
+	OPENSSL_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;
@@ -444,7 +238,7 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
 	else if ((strncmp(argv[0],"no-",3)) == 0)
 		{
 		BIO *bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		bio_stdout = BIO_push(tmpbio, bio_stdout);
@@ -481,7 +275,7 @@ static int do_cmd(LHASH *prog, int argc, char *argv[])
 		else /* strcmp(argv[0],LIST_CIPHER_COMMANDS) == 0 */
 			list_type = FUNC_TYPE_CIPHER;
 		bio_stdout = BIO_new_fp(stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		bio_stdout = BIO_push(tmpbio, bio_stdout);
@@ -556,23 +350,19 @@ static LHASH *prog_init(void)
 	    ;
 	qsort(functions,i,sizeof *functions,SortFnByName);
 
-	if ((ret=lh_new(hash, cmp)) == NULL)
-		return(NULL);
+	if ((ret=lh_new(hash,cmp)) == NULL) return(NULL);
 
 	for (f=functions; f->name != NULL; f++)
 		lh_insert(ret,f);
 	return(ret);
 	}
 
-/* static int MS_CALLBACK cmp(FUNCTION *a, FUNCTION *b) */
-static int MS_CALLBACK cmp(const void *a_void, const void *b_void)
+static int MS_CALLBACK cmp(FUNCTION *a, FUNCTION *b)
 	{
-	return(strncmp(((FUNCTION *)a_void)->name,
-			((FUNCTION *)b_void)->name,8));
+	return(strncmp(a->name,b->name,8));
 	}
 
-/* static unsigned long MS_CALLBACK hash(FUNCTION *a) */
-static unsigned long MS_CALLBACK hash(const void *a_void)
+static unsigned long MS_CALLBACK hash(FUNCTION *a)
 	{
-	return(lh_strhash(((FUNCTION *)a_void)->name));
+	return(lh_strhash(a->name));
 	}

apps/openssl.cnf

@@ -6,15 +6,7 @@
 # This definition stops the following lines choking if HOME isn't
 # defined.
 HOME			= .
-
-#
-# 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.;
+RANDFILE		= $ENV::HOME/.rnd
 
 # Extra OBJECT IDENTIFIER info:
 #oid_file		= $ENV::HOME/.oid
@@ -41,12 +33,8 @@ default_ca	= CA_default		# The default ca section
 
 ####################################################################
 [ CA_default ]
-#
-# 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
+
+dir		= ./demoCA		# Where everything is kept
 certs		= $dir/certs		# Where the issued certs are kept
 crl_dir		= $dir/crl		# Where the issued crl are kept
 database	= $dir/index.txt	# database index file.
@@ -60,14 +48,6 @@ RANDFILE	= $dir/private/.rand	# private random number file
 
 x509_extensions	= usr_cert		# The extentions to add to the cert
 
-# Comment out the following two lines for the "traditional"
-# (and highly broken) format.
-name_opt 	= ca_default		# Subject Name options
-cert_opt 	= ca_default		# Certificate field options
-
-# Extension copying option: use with caution.
-# copy_extensions = copy
-
 # Extensions to add to a CRL. Note: Netscape communicator chokes on V2 CRLs
 # so this is commented out by default to leave a V1 CRL.
 # crl_extensions	= crl_ext
@@ -152,7 +132,7 @@ commonName			= Common Name (eg, YOUR name)
 commonName_max			= 64
 
 emailAddress			= Email Address
-emailAddress_max		= 64
+emailAddress_max		= 40
 
 # SET-ex3			= SET extension number 3
 
@@ -186,11 +166,6 @@ 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
@@ -205,9 +180,6 @@ authorityKeyIdentifier=keyid,issuer:always
 # This stuff is for subjectAltName and issuerAltname.
 # Import the email address.
 # subjectAltName=email:copy
-# An alternative to produce certificates that aren't
-# deprecated according to PKIX.
-# subjectAltName=email:move
 
 # Copy subject details
 # issuerAltName=issuer:copy

apps/passwd.c

@@ -1,10 +1,10 @@
 /* apps/passwd.c */
 
-#if defined OPENSSL_NO_MD5 || defined CHARSET_EBCDIC
+#if defined NO_MD5 || defined CHARSET_EBCDIC
 # define NO_MD5CRYPT_1
 #endif
 
-#if !defined(OPENSSL_NO_DES) || !defined(NO_MD5CRYPT_1)
+#if !defined(NO_DES) || !defined(NO_MD5CRYPT_1)
 
 #include <assert.h>
 #include <string.h>
@@ -15,11 +15,11 @@
 #include <openssl/err.h>
 #include <openssl/evp.h>
 #include <openssl/rand.h>
-#ifndef OPENSSL_NO_DES
+
+#ifndef NO_DES
 # include <openssl/des.h>
 #endif
 #ifndef NO_MD5CRYPT_1
-# include <openssl/evp.h>
 # include <openssl/md5.h>
 #endif
 
@@ -50,7 +50,6 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
  * -salt string  - salt
  * -in file      - read passwords from file
  * -stdin        - read passwords from stdin
- * -noverify     - never verify when reading password from terminal
  * -quiet        - no warnings
  * -table        - format output as table
  * -reverse      - switch table columns
@@ -63,7 +62,6 @@ int MAIN(int argc, char **argv)
 	int ret = 1;
 	char *infile = NULL;
 	int in_stdin = 0;
-	int in_noverify = 0;
 	char *salt = NULL, *passwd = NULL, **passwds = NULL;
 	char *salt_malloc = NULL, *passwd_malloc = NULL;
 	size_t passwd_malloc_size = 0;
@@ -79,14 +77,11 @@ int MAIN(int argc, char **argv)
 	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 err;
 	out = BIO_new(BIO_s_file());
 	if (out == NULL)
 		goto err;
 	BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 	{
 	BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 	out = BIO_push(tmpbio, out);
@@ -133,8 +128,6 @@ int MAIN(int argc, char **argv)
 			else
 				badopt = 1;
 			}
-		else if (strcmp(argv[i], "-noverify") == 0)
-			in_noverify = 1;
 		else if (strcmp(argv[i], "-quiet") == 0)
 			quiet = 1;
 		else if (strcmp(argv[i], "-table") == 0)
@@ -160,7 +153,7 @@ int MAIN(int argc, char **argv)
 		badopt = 1;
 
 	/* reject unsupported algorithms */
-#ifdef OPENSSL_NO_DES
+#ifdef NO_DES
 	if (usecrypt) badopt = 1;
 #endif
 #ifdef NO_MD5CRYPT_1
@@ -171,7 +164,7 @@ int MAIN(int argc, char **argv)
 		{
 		BIO_printf(bio_err, "Usage: passwd [options] [passwords]\n");
 		BIO_printf(bio_err, "where options are\n");
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 		BIO_printf(bio_err, "-crypt             standard Unix password algorithm (default)\n");
 #endif
 #ifndef NO_MD5CRYPT_1
@@ -181,7 +174,6 @@ int MAIN(int argc, char **argv)
 		BIO_printf(bio_err, "-salt string       use provided salt\n");
 		BIO_printf(bio_err, "-in file           read passwords from file\n");
 		BIO_printf(bio_err, "-stdin             read passwords from stdin\n");
-		BIO_printf(bio_err, "-noverify          never verify when reading password from terminal\n");
 		BIO_printf(bio_err, "-quiet             no warnings\n");
 		BIO_printf(bio_err, "-table             format output as table\n");
 		BIO_printf(bio_err, "-reverse           switch table columns\n");
@@ -230,7 +222,7 @@ int MAIN(int argc, char **argv)
 		
 		passwds = passwds_static;
 		if (in == NULL)
-			if (EVP_read_pw_string(passwd_malloc, passwd_malloc_size, "Password: ", !(passed_salt || in_noverify)) != 0)
+			if (EVP_read_pw_string(passwd_malloc, passwd_malloc_size, "Password: ", 0) != 0)
 				goto err;
 		passwds[0] = passwd_malloc;
 		}
@@ -292,8 +284,7 @@ err:
 		BIO_free(in);
 	if (out)
 		BIO_free_all(out);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 
@@ -314,7 +305,7 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 	unsigned char buf[MD5_DIGEST_LENGTH];
 	char *salt_out;
 	int n, i;
-	EVP_MD_CTX md,md2;
+	MD5_CTX md;
 	size_t passwd_len, salt_len;
 
 	passwd_len = strlen(passwd);
@@ -329,47 +320,49 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 	salt_len = strlen(salt_out);
 	assert(salt_len <= 8);
 	
-	EVP_MD_CTX_init(&md);
-	EVP_DigestInit_ex(&md,EVP_md5(), NULL);
-	EVP_DigestUpdate(&md, passwd, passwd_len);
-	EVP_DigestUpdate(&md, "$", 1);
-	EVP_DigestUpdate(&md, magic, strlen(magic));
-	EVP_DigestUpdate(&md, "$", 1);
-	EVP_DigestUpdate(&md, salt_out, salt_len);
+	MD5_Init(&md);
+	MD5_Update(&md, passwd, passwd_len);
+	MD5_Update(&md, "$", 1);
+	MD5_Update(&md, magic, strlen(magic));
+	MD5_Update(&md, "$", 1);
+	MD5_Update(&md, salt_out, salt_len);
 	
-	EVP_MD_CTX_init(&md2);
-	EVP_DigestInit_ex(&md2,EVP_md5(), NULL);
-	EVP_DigestUpdate(&md2, passwd, passwd_len);
-	EVP_DigestUpdate(&md2, salt_out, salt_len);
-	EVP_DigestUpdate(&md2, passwd, passwd_len);
-	EVP_DigestFinal_ex(&md2, buf, NULL);
+	 {
+		MD5_CTX md2;
 
+		MD5_Init(&md2);
+		MD5_Update(&md2, passwd, passwd_len);
+		MD5_Update(&md2, salt_out, salt_len);
+		MD5_Update(&md2, passwd, passwd_len);
+		MD5_Final(buf, &md2);
+	 }
 	for (i = passwd_len; i > sizeof buf; i -= sizeof buf)
-		EVP_DigestUpdate(&md, buf, sizeof buf);
-	EVP_DigestUpdate(&md, buf, i);
+		MD5_Update(&md, buf, sizeof buf);
+	MD5_Update(&md, buf, i);
 	
 	n = passwd_len;
 	while (n)
 		{
-		EVP_DigestUpdate(&md, (n & 1) ? "\0" : passwd, 1);
+		MD5_Update(&md, (n & 1) ? "\0" : passwd, 1);
 		n >>= 1;
 		}
-	EVP_DigestFinal_ex(&md, buf, NULL);
+	MD5_Final(buf, &md);
 
 	for (i = 0; i < 1000; i++)
 		{
-		EVP_DigestInit_ex(&md2,EVP_md5(), NULL);
-		EVP_DigestUpdate(&md2, (i & 1) ? (unsigned char *) passwd : buf,
+		MD5_CTX md2;
+
+		MD5_Init(&md2);
+		MD5_Update(&md2, (i & 1) ? (unsigned char *) passwd : buf,
 		                 (i & 1) ? passwd_len : sizeof buf);
 		if (i % 3)
-			EVP_DigestUpdate(&md2, salt_out, salt_len);
+			MD5_Update(&md2, salt_out, salt_len);
 		if (i % 7)
-			EVP_DigestUpdate(&md2, passwd, passwd_len);
-		EVP_DigestUpdate(&md2, (i & 1) ? buf : (unsigned char *) passwd,
+			MD5_Update(&md2, passwd, passwd_len);
+		MD5_Update(&md2, (i & 1) ? buf : (unsigned char *) passwd,
 		                 (i & 1) ? sizeof buf : passwd_len);
-		EVP_DigestFinal_ex(&md2, buf, NULL);
+		MD5_Final(buf, &md2);
 		}
-	EVP_MD_CTX_cleanup(&md2);
 	
 	 {
 		/* transform buf into output string */
@@ -407,7 +400,6 @@ static char *md5crypt(const char *passwd, const char *magic, const char *salt)
 		*output = 0;
 		assert(strlen(out_buf) < sizeof(out_buf));
 	 }
-	EVP_MD_CTX_cleanup(&md);
 
 	return out_buf;
 	}
@@ -426,7 +418,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 	/* first make sure we have a salt */
 	if (!passed_salt)
 		{
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 		if (usecrypt)
 			{
 			if (*salt_malloc_p == NULL)
@@ -445,7 +437,7 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 			                                    * back to ASCII */
 #endif
 			}
-#endif /* !OPENSSL_NO_DES */
+#endif /* !NO_DES */
 
 #ifndef NO_MD5CRYPT_1
 		if (use1 || useapr1)
@@ -480,9 +472,9 @@ static int do_passwd(int passed_salt, char **salt_p, char **salt_malloc_p,
 	assert(strlen(passwd) <= pw_maxlen);
 	
 	/* now compute password hash */
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	if (usecrypt)
-		hash = DES_crypt(passwd, *salt_p);
+		hash = des_crypt(passwd, *salt_p);
 #endif
 #ifndef NO_MD5CRYPT_1
 	if (use1 || useapr1)
@@ -506,6 +498,6 @@ err:
 int MAIN(int argc, char **argv)
 	{
 	fputs("Program not available.\n", stderr)
-	EXIT(1);
+	OPENSSL_EXIT(1);
 	}
 #endif

apps/pkcs12.c

@@ -1,5 +1,5 @@
 /* pkcs12.c */
-#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
+#if !defined(NO_DES) && !defined(NO_SHA1)
 
 /* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
  * project 1999.
@@ -69,7 +69,7 @@
 
 #define PROG pkcs12_main
 
-const EVP_CIPHER *enc;
+EVP_CIPHER *enc;
 
 
 #define NOKEYS		0x1
@@ -92,13 +92,11 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-    ENGINE *e = NULL;
     char *infile=NULL, *outfile=NULL, *keyname = NULL;	
     char *certfile=NULL;
-    BIO *in=NULL, *out = NULL;
+    BIO *in=NULL, *out = NULL, *inkey = NULL, *certsin = NULL;
     char **args;
     char *name = NULL;
-    char *csp_name = NULL;
     PKCS12 *p12 = NULL;
     char pass[50], macpass[50];
     int export_cert = 0;
@@ -120,16 +118,12 @@ int MAIN(int argc, char **argv)
     char *passin = NULL, *passout = NULL;
     char *inrand = NULL;
     char *CApath = NULL, *CAfile = NULL;
-    char *engine=NULL;
 
     apps_startup();
 
     enc = EVP_des_ede3_cbc();
     if (bio_err == NULL ) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
     args = argv + 1;
 
 
@@ -150,15 +144,10 @@ int MAIN(int argc, char **argv)
     			cert_pbe = NID_pbe_WithSHA1And3_Key_TripleDES_CBC;
 		else if (!strcmp (*args, "-export")) export_cert = 1;
 		else if (!strcmp (*args, "-des")) enc=EVP_des_cbc();
-#ifndef OPENSSL_NO_IDEA
+#ifndef NO_IDEA
 		else if (!strcmp (*args, "-idea")) enc=EVP_idea_cbc();
 #endif
 		else if (!strcmp (*args, "-des3")) enc = EVP_des_ede3_cbc();
-#ifndef OPENSSL_NO_AES
-		else if (!strcmp(*args,"-aes128")) enc=EVP_aes_128_cbc();
-		else if (!strcmp(*args,"-aes192")) enc=EVP_aes_192_cbc();
-		else if (!strcmp(*args,"-aes256")) enc=EVP_aes_256_cbc();
-#endif
 		else if (!strcmp (*args, "-noiter")) iter = 1;
 		else if (!strcmp (*args, "-maciter"))
 					 maciter = PKCS12_DEFAULT_ITER;
@@ -205,11 +194,6 @@ int MAIN(int argc, char **argv)
 			args++;	
 			name = *args;
 		    } else badarg = 1;
-		} else if (!strcmp (*args, "-CSP")) {
-		    if (args[1]) {
-			args++;	
-			csp_name = *args;
-		    } else badarg = 1;
 		} else if (!strcmp (*args, "-caname")) {
 		    if (args[1]) {
 			args++;	
@@ -252,11 +236,6 @@ int MAIN(int argc, char **argv)
 			args++;	
 			CAfile = *args;
 		    } else badarg = 1;
-		} else if (!strcmp(*args,"-engine")) {
-		    if (args[1]) {
-			args++;	
-			engine = *args;
-		    } else badarg = 1;
 		} else badarg = 1;
 
 	} else badarg = 1;
@@ -285,12 +264,8 @@ int MAIN(int argc, char **argv)
 	BIO_printf (bio_err, "-info         give info about PKCS#12 structure.\n");
 	BIO_printf (bio_err, "-des          encrypt private keys with DES\n");
 	BIO_printf (bio_err, "-des3         encrypt private keys with triple DES (default)\n");
-#ifndef OPENSSL_NO_IDEA
+#ifndef NO_IDEA
 	BIO_printf (bio_err, "-idea         encrypt private keys with 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, "-nodes        don't encrypt private keys\n");
 	BIO_printf (bio_err, "-noiter       don't use encryption iteration\n");
@@ -304,15 +279,12 @@ int MAIN(int argc, char **argv)
 	BIO_printf (bio_err, "-password p   set import/export password source\n");
 	BIO_printf (bio_err, "-passin p     input file pass phrase source\n");
 	BIO_printf (bio_err, "-passout p    output file pass phrase source\n");
-	BIO_printf (bio_err, "-engine e     use engine e, possibly a hardware device.\n");
 	BIO_printf(bio_err,  "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 	BIO_printf(bio_err,  "              load the file (or the files in the directory) into\n");
 	BIO_printf(bio_err,  "              the random number generator\n");
     	goto end;
     }
 
-    e = setup_engine(bio_err, engine, 0);
-
     if(passarg) {
 	if(export_cert) passargout = passarg;
 	else passargin = passarg;
@@ -357,7 +329,6 @@ int MAIN(int argc, char **argv)
 	    goto end;
    }
 
-#if 0
    if (certfile) {
     	if(!(certsin = BIO_new_file(certfile, "r"))) {
 	    BIO_printf(bio_err, "Can't open certificate file %s\n", certfile);
@@ -373,7 +344,6 @@ int MAIN(int argc, char **argv)
 	    goto end;
 	}
      }
-#endif
 
 #ifdef CRYPTO_MDEBUG
     CRYPTO_pop_info();
@@ -382,7 +352,7 @@ int MAIN(int argc, char **argv)
 
     if (!outfile) {
 	out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 	{
 	    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 	    out = BIO_push(tmpbio, out);
@@ -427,9 +397,12 @@ 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,
-		passin, e, "private key");
+	key = PEM_read_bio_PrivateKey(inkey ? inkey : in, NULL, NULL, passin);
+	if (!inkey) (void) BIO_reset(in);
+	else BIO_free(inkey);
 	if (!key) {
+		BIO_printf (bio_err, "Error loading private key\n");
+		ERR_print_errors(bio_err);
 		goto export_end;
 	}
 
@@ -438,9 +411,12 @@ int MAIN(int argc, char **argv)
 	CRYPTO_push_info("reading certs from input");
 #endif
 
+	certs = sk_X509_new_null();
+
 	/* Load in all certs in input file */
-	if(!(certs = load_certs(bio_err, infile, FORMAT_PEM, NULL, e,
-		"certificates"))) {
+	if(!cert_load(in, certs)) {
+		BIO_printf(bio_err, "Error loading certificates from input\n");
+		ERR_print_errors(bio_err);
 		goto export_end;
 	}
 
@@ -470,17 +446,13 @@ int MAIN(int argc, char **argv)
 	bags = sk_PKCS12_SAFEBAG_new_null ();
 
 	/* Add any more certificates asked for */
-	if (certfile) {
-		STACK_OF(X509) *morecerts=NULL;
-		if(!(morecerts = load_certs(bio_err, certfile, FORMAT_PEM,
-					    NULL, e,
-					    "certificates from certfile"))) {
+	if (certsin) {
+		if(!cert_load(certsin, certs)) {
+			BIO_printf(bio_err, "Error loading certificates from certfile\n");
+			ERR_print_errors(bio_err);
 			goto export_end;
 		}
-		while(sk_X509_num(morecerts) > 0) {
-			sk_X509_push(certs, sk_X509_shift(morecerts));
-		}
-		sk_X509_free(morecerts);
+	    	BIO_free(certsin);
  	}
 
 #ifdef CRYPTO_MDEBUG
@@ -508,9 +480,10 @@ 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);
-		if (vret) {
+		} else {
 			BIO_printf (bio_err, "Error %s getting chain.\n",
 					X509_verify_cert_error_string(vret));
 			goto export_end;
@@ -526,7 +499,7 @@ int MAIN(int argc, char **argv)
 	for(i = 0; i < sk_X509_num(certs); i++) {
 		X509 *cert = NULL;
 		cert = sk_X509_value(certs, i);
-		bag = PKCS12_x5092certbag(cert);
+		bag = M_PKCS12_x5092certbag(cert);
 		/* If it matches private key set id */
 		if(cert == ucert) {
 			if(name) PKCS12_add_friendlyname(bag, name, -1);
@@ -537,8 +510,6 @@ 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();
@@ -577,7 +548,6 @@ int MAIN(int argc, char **argv)
 	PKCS8_PRIV_KEY_INFO_free(p8);
 	p8 = NULL;
         if (name) PKCS12_add_friendlyname (bag, name, -1);
-	if(csp_name) PKCS12_add_CSPName_asc(bag, csp_name, -1);
 	PKCS12_add_localkeyid (bag, keyid, keyidlen);
 	bags = sk_PKCS12_SAFEBAG_new_null();
 	sk_PKCS12_SAFEBAG_push (bags, bag);
@@ -598,9 +568,9 @@ int MAIN(int argc, char **argv)
 	CRYPTO_push_info("building pkcs12");
 #endif
 
-	p12 = PKCS12_init(NID_pkcs7_data);
+	p12 = PKCS12_init (NID_pkcs7_data);
 
-	PKCS12_pack_authsafes(p12, safes);
+	M_PKCS12_pack_authsafes (p12, safes);
 
 	sk_PKCS7_pop_free(safes, PKCS7_free);
 	safes = NULL;
@@ -627,7 +597,6 @@ 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();
@@ -697,8 +666,7 @@ int MAIN(int argc, char **argv)
     if (canames) sk_free(canames);
     if(passin) OPENSSL_free(passin);
     if(passout) OPENSSL_free(passout);
-    apps_shutdown();
-    EXIT(ret);
+    OPENSSL_EXIT(ret);
 }
 
 int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
@@ -709,20 +677,20 @@ int dump_certs_keys_p12 (BIO *out, PKCS12 *p12, char *pass,
 	int i, bagnid;
 	PKCS7 *p7;
 
-	if (!( asafes = PKCS12_unpack_authsafes(p12))) return 0;
+	if (!( asafes = M_PKCS12_unpack_authsafes (p12))) return 0;
 	for (i = 0; i < sk_PKCS7_num (asafes); i++) {
 		p7 = sk_PKCS7_value (asafes, i);
 		bagnid = OBJ_obj2nid (p7->type);
 		if (bagnid == NID_pkcs7_data) {
-			bags = PKCS12_unpack_p7data(p7);
+			bags = M_PKCS12_unpack_p7data (p7);
 			if (options & INFO) BIO_printf (bio_err, "PKCS7 Data\n");
 		} else if (bagnid == NID_pkcs7_encrypted) {
 			if (options & INFO) {
-				BIO_printf(bio_err, "PKCS7 Encrypted data: ");
-				alg_print(bio_err, 
+				BIO_printf (bio_err, "PKCS7 Encrypted data: ");
+				alg_print (bio_err, 
 					p7->d.encrypted->enc_data->algorithm);
 			}
-			bags = PKCS12_unpack_p7encdata(p7, pass, passlen);
+			bags = M_PKCS12_unpack_p7encdata (p7, pass, passlen);
 		} else continue;
 		if (!bags) return 0;
 	    	if (!dump_certs_pkeys_bags (out, bags, pass, passlen, 
@@ -777,7 +745,7 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
 		}
 		if (options & NOKEYS) return 1;
 		print_attribs (out, bag->attrib, "Bag Attributes");
-		if (!(p8 = PKCS12_decrypt_skey(bag, pass, passlen)))
+		if (!(p8 = M_PKCS12_decrypt_skey (bag, pass, passlen)))
 				return 0;
 		if (!(pkey = EVP_PKCS82PKEY (p8))) {
 			PKCS8_PRIV_KEY_INFO_free(p8);
@@ -798,7 +766,7 @@ int dump_certs_pkeys_bag (BIO *out, PKCS12_SAFEBAG *bag, char *pass,
 		print_attribs (out, bag->attrib, "Bag Attributes");
 		if (M_PKCS12_cert_bag_type(bag) != NID_x509Certificate )
 								 return 1;
-		if (!(x509 = PKCS12_certbag2x509(bag))) return 0;
+		if (!(x509 = M_PKCS12_certbag2x509(bag))) return 0;
 		dump_cert_text (out, x509);
 		PEM_write_bio_X509 (out, x509);
 		X509_free(x509);
@@ -830,9 +798,6 @@ int get_cert_chain (X509 *cert, X509_STORE *store, STACK_OF(X509) **chain)
 	STACK_OF(X509) *chn;
 	int i;
 
-	/* FIXME: Should really check the return status of X509_STORE_CTX_init
-	 * for an error, but how that fits into the return value of this
-	 * function is less obvious. */
 	X509_STORE_CTX_init(&store_ctx, store, cert, NULL);
 	if (X509_verify_cert(&store_ctx) <= 0) {
 		i = X509_STORE_CTX_get_error (&store_ctx);

apps/pkcs7.c

@@ -82,15 +82,13 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	PKCS7 *p7=NULL;
 	int i,badops=0;
 	BIO *in=NULL,*out=NULL;
 	int informat,outformat;
 	char *infile,*outfile,*prog;
 	int print_certs=0,text=0,noout=0;
-	int ret=0;
-	char *engine=NULL;
+	int ret=1;
 
 	apps_startup();
 
@@ -134,11 +132,6 @@ int MAIN(int argc, char **argv)
 			text=1;
 		else if (strcmp(*argv,"-print_certs") == 0)
 			print_certs=1;
-		else if (strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) goto bad;
-			engine= *(++argv);
-			}
 		else
 			{
 			BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -161,15 +154,11 @@ bad:
 		BIO_printf(bio_err," -print_certs  print any certs or crl in the input\n");
 		BIO_printf(bio_err," -text         print full details of certificates\n");
 		BIO_printf(bio_err," -noout        don't output encoded data\n");
-		BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");
-		ret = 1;
-		goto end;
+		OPENSSL_EXIT(1);
 		}
 
 	ERR_load_crypto_strings();
 
-        e = setup_engine(bio_err, engine, 0);
-
 	in=BIO_new(BIO_s_file());
 	out=BIO_new(BIO_s_file());
 	if ((in == NULL) || (out == NULL))
@@ -209,7 +198,7 @@ bad:
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -300,6 +289,5 @@ end:
 	if (p7 != NULL) PKCS7_free(p7);
 	if (in != NULL) BIO_free(in);
 	if (out != NULL) BIO_free_all(out);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}

apps/pkcs8.c

@@ -70,7 +70,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-	ENGINE *e = NULL;
 	char **args, *infile = NULL, *outfile = NULL;
 	char *passargin = NULL, *passargout = NULL;
 	BIO *in = NULL, *out = NULL;
@@ -83,19 +82,12 @@ int MAIN(int argc, char **argv)
 	int nocrypt = 0;
 	X509_SIG *p8;
 	PKCS8_PRIV_KEY_INFO *p8inf;
-	EVP_PKEY *pkey=NULL;
+	EVP_PKEY *pkey;
 	char pass[50], *passin = NULL, *passout = NULL, *p8pass = NULL;
 	int badarg = 0;
-	char *engine=NULL;
-
 	if (bio_err == NULL) bio_err = BIO_new_fp (stderr, BIO_NOCLOSE);
-
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	informat=FORMAT_PEM;
 	outformat=FORMAT_PEM;
-
 	ERR_load_crypto_strings();
 	OpenSSL_add_all_algorithms();
 	args = argv + 1;
@@ -146,11 +138,6 @@ int MAIN(int argc, char **argv)
 			if (!args[1]) goto bad;
 			passargout= *(++args);
 			}
-		else if (strcmp(*args,"-engine") == 0)
-			{
-			if (!args[1]) goto bad;
-			engine= *(++args);
-			}
 		else if (!strcmp (*args, "-in")) {
 			if (args[1]) {
 				args++;
@@ -183,12 +170,9 @@ int MAIN(int argc, char **argv)
 		BIO_printf(bio_err, "-nocrypt        use or expect unencrypted private key\n");
 		BIO_printf(bio_err, "-v2 alg         use PKCS#5 v2.0 and cipher \"alg\"\n");
 		BIO_printf(bio_err, "-v1 obj         use PKCS#5 v1.5 and cipher \"alg\"\n");
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\n");
 		return (1);
 	}
 
-        e = setup_engine(bio_err, engine, 0);
-
 	if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
 		BIO_printf(bio_err, "Error getting passwords\n");
 		return (1);
@@ -212,22 +196,30 @@ int MAIN(int argc, char **argv)
 		}
 	} else {
 		out = BIO_new_fp (stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 			out = BIO_push(tmpbio, out);
 		}
 #endif
 	}
-	if (topk8)
-		{
-		BIO_free(in); /* Not needed in this section */
-		pkey = load_key(bio_err, infile, informat, passin, e, "key");
-		if (!pkey) {
+	if (topk8) {
+		if(informat == FORMAT_PEM)
+			pkey = PEM_read_bio_PrivateKey(in, NULL, NULL, passin);
+		else if(informat == FORMAT_ASN1)
+			pkey = d2i_PrivateKey_bio(in, NULL);
+		else {
+			BIO_printf(bio_err, "Bad format specified for key\n");
 			return (1);
 		}
+		if (!pkey) {
+			BIO_printf(bio_err, "Error reading key\n", outfile);
+			ERR_print_errors(bio_err);
+			return (1);
+		}
+		BIO_free(in);
 		if (!(p8inf = EVP_PKEY2PKCS8_broken(pkey, p8_broken))) {
-			BIO_printf(bio_err, "Error converting key\n", outfile);
+			BIO_printf(bio_err, "Error converting key\n");
 			ERR_print_errors(bio_err);
 			return (1);
 		}
@@ -244,14 +236,14 @@ int MAIN(int argc, char **argv)
 			if(passout) p8pass = passout;
 			else {
 				p8pass = pass;
-				EVP_read_pw_string(pass, 50, "Enter Encryption Password:", 1);
+				if (EVP_read_pw_string(pass, 50, "Enter Encryption Password:", 1))
+					return (1);
 			}
 			app_RAND_load_file(NULL, bio_err, 0);
 			if (!(p8 = PKCS8_encrypt(pbe_nid, cipher,
 					p8pass, strlen(p8pass),
 					NULL, 0, iter, p8inf))) {
-				BIO_printf(bio_err, "Error encrypting key\n",
-								 outfile);
+				BIO_printf(bio_err, "Error encrypting key\n");
 				ERR_print_errors(bio_err);
 				return (1);
 			}
@@ -294,7 +286,7 @@ int MAIN(int argc, char **argv)
 		}
 
 		if (!p8) {
-			BIO_printf (bio_err, "Error reading key\n", outfile);
+			BIO_printf (bio_err, "Error reading key\n");
 			ERR_print_errors(bio_err);
 			return (1);
 		}
@@ -303,18 +295,18 @@ int MAIN(int argc, char **argv)
 			p8pass = pass;
 			EVP_read_pw_string(pass, 50, "Enter Password:", 0);
 		}
-		p8inf = PKCS8_decrypt(p8, p8pass, strlen(p8pass));
+		p8inf = M_PKCS8_decrypt(p8, p8pass, strlen(p8pass));
 		X509_SIG_free(p8);
 	}
 
 	if (!p8inf) {
-		BIO_printf(bio_err, "Error decrypting key\n", outfile);
+		BIO_printf(bio_err, "Error decrypting key\n");
 		ERR_print_errors(bio_err);
 		return (1);
 	}
 
 	if (!(pkey = EVP_PKCS82PKEY(p8inf))) {
-		BIO_printf(bio_err, "Error converting key\n", outfile);
+		BIO_printf(bio_err, "Error converting key\n");
 		ERR_print_errors(bio_err);
 		return (1);
 	}
@@ -350,7 +342,6 @@ int MAIN(int argc, char **argv)
 			return (1);
 	}
 
-	end:
 	EVP_PKEY_free(pkey);
 	BIO_free_all(out);
 	BIO_free(in);

apps/progs.h

@@ -17,8 +17,6 @@ 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[]);
@@ -37,8 +35,6 @@ extern int pkcs8_main(int argc,char *argv[]);
 extern int spkac_main(int argc,char *argv[]);
 extern int smime_main(int argc,char *argv[]);
 extern int rand_main(int argc,char *argv[]);
-extern int engine_main(int argc,char *argv[]);
-extern int ocsp_main(int argc,char *argv[]);
 
 #define FUNC_TYPE_GENERAL	1
 #define FUNC_TYPE_MD		2
@@ -55,245 +51,205 @@ FUNCTION functions[] = {
 	{FUNC_TYPE_GENERAL,"asn1parse",asn1parse_main},
 	{FUNC_TYPE_GENERAL,"req",req_main},
 	{FUNC_TYPE_GENERAL,"dgst",dgst_main},
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 	{FUNC_TYPE_GENERAL,"dh",dh_main},
 #endif
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 	{FUNC_TYPE_GENERAL,"dhparam",dhparam_main},
 #endif
 	{FUNC_TYPE_GENERAL,"enc",enc_main},
 	{FUNC_TYPE_GENERAL,"passwd",passwd_main},
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 	{FUNC_TYPE_GENERAL,"gendh",gendh_main},
 #endif
 	{FUNC_TYPE_GENERAL,"errstr",errstr_main},
 	{FUNC_TYPE_GENERAL,"ca",ca_main},
 	{FUNC_TYPE_GENERAL,"crl",crl_main},
-#ifndef OPENSSL_NO_RSA
+#ifndef NO_RSA
 	{FUNC_TYPE_GENERAL,"rsa",rsa_main},
 #endif
-#ifndef OPENSSL_NO_RSA
+#ifndef NO_RSA
 	{FUNC_TYPE_GENERAL,"rsautl",rsautl_main},
 #endif
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 	{FUNC_TYPE_GENERAL,"dsa",dsa_main},
 #endif
-#ifndef OPENSSL_NO_DSA
+#ifndef 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
+#ifndef NO_RSA
 	{FUNC_TYPE_GENERAL,"genrsa",genrsa_main},
 #endif
-#ifndef OPENSSL_NO_DSA
+#ifndef NO_DSA
 	{FUNC_TYPE_GENERAL,"gendsa",gendsa_main},
 #endif
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))
 	{FUNC_TYPE_GENERAL,"s_server",s_server_main},
 #endif
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))
 	{FUNC_TYPE_GENERAL,"s_client",s_client_main},
 #endif
 	{FUNC_TYPE_GENERAL,"speed",speed_main},
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))
 	{FUNC_TYPE_GENERAL,"s_time",s_time_main},
 #endif
 	{FUNC_TYPE_GENERAL,"version",version_main},
 	{FUNC_TYPE_GENERAL,"pkcs7",pkcs7_main},
 	{FUNC_TYPE_GENERAL,"crl2pkcs7",crl2pkcs7_main},
 	{FUNC_TYPE_GENERAL,"sess_id",sess_id_main},
-#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))
+#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))
 	{FUNC_TYPE_GENERAL,"ciphers",ciphers_main},
 #endif
 	{FUNC_TYPE_GENERAL,"nseq",nseq_main},
-#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)
+#if !defined(NO_DES) && !defined(NO_SHA1)
 	{FUNC_TYPE_GENERAL,"pkcs12",pkcs12_main},
 #endif
 	{FUNC_TYPE_GENERAL,"pkcs8",pkcs8_main},
 	{FUNC_TYPE_GENERAL,"spkac",spkac_main},
 	{FUNC_TYPE_GENERAL,"smime",smime_main},
 	{FUNC_TYPE_GENERAL,"rand",rand_main},
-	{FUNC_TYPE_GENERAL,"engine",engine_main},
-	{FUNC_TYPE_GENERAL,"ocsp",ocsp_main},
-#ifndef OPENSSL_NO_MD2
 	{FUNC_TYPE_MD,"md2",dgst_main},
-#endif
-#ifndef OPENSSL_NO_MD4
 	{FUNC_TYPE_MD,"md4",dgst_main},
-#endif
-#ifndef OPENSSL_NO_MD5
 	{FUNC_TYPE_MD,"md5",dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA
 	{FUNC_TYPE_MD,"sha",dgst_main},
-#endif
-#ifndef OPENSSL_NO_SHA1
 	{FUNC_TYPE_MD,"sha1",dgst_main},
-#endif
-#ifndef OPENSSL_NO_MDC2
 	{FUNC_TYPE_MD,"mdc2",dgst_main},
-#endif
-#ifndef OPENSSL_NO_RMD160
 	{FUNC_TYPE_MD,"rmd160",dgst_main},
-#endif
-#ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-128-cbc",enc_main},
-#endif
-#ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-128-ecb",enc_main},
-#endif
-#ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-192-cbc",enc_main},
-#endif
-#ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-192-ecb",enc_main},
-#endif
-#ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-256-cbc",enc_main},
-#endif
-#ifndef OPENSSL_NO_AES
-	{FUNC_TYPE_CIPHER,"aes-256-ecb",enc_main},
-#endif
 	{FUNC_TYPE_CIPHER,"base64",enc_main},
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des3",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"desx",enc_main},
 #endif
-#ifndef OPENSSL_NO_IDEA
+#ifndef NO_IDEA
 	{FUNC_TYPE_CIPHER,"idea",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC4
+#ifndef NO_RC4
 	{FUNC_TYPE_CIPHER,"rc4",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC4
+#ifndef NO_RC4
 	{FUNC_TYPE_CIPHER,"rc4-40",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC2
+#ifndef NO_RC2
 	{FUNC_TYPE_CIPHER,"rc2",enc_main},
 #endif
-#ifndef OPENSSL_NO_BF
+#ifndef NO_BF
 	{FUNC_TYPE_CIPHER,"bf",enc_main},
 #endif
-#ifndef OPENSSL_NO_CAST
+#ifndef NO_CAST
 	{FUNC_TYPE_CIPHER,"cast",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC5
+#ifndef NO_RC5
 	{FUNC_TYPE_CIPHER,"rc5",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-ecb",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-ede",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-ede3",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-cbc",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-ede-cbc",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-ede3-cbc",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-cfb",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-ede-cfb",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-ede3-cfb",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-ofb",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-ede-ofb",enc_main},
 #endif
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 	{FUNC_TYPE_CIPHER,"des-ede3-ofb",enc_main},
 #endif
-#ifndef OPENSSL_NO_IDEA
+#ifndef NO_IDEA
 	{FUNC_TYPE_CIPHER,"idea-cbc",enc_main},
 #endif
-#ifndef OPENSSL_NO_IDEA
+#ifndef NO_IDEA
 	{FUNC_TYPE_CIPHER,"idea-ecb",enc_main},
 #endif
-#ifndef OPENSSL_NO_IDEA
+#ifndef NO_IDEA
 	{FUNC_TYPE_CIPHER,"idea-cfb",enc_main},
 #endif
-#ifndef OPENSSL_NO_IDEA
+#ifndef NO_IDEA
 	{FUNC_TYPE_CIPHER,"idea-ofb",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC2
+#ifndef NO_RC2
 	{FUNC_TYPE_CIPHER,"rc2-cbc",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC2
+#ifndef NO_RC2
 	{FUNC_TYPE_CIPHER,"rc2-ecb",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC2
+#ifndef NO_RC2
 	{FUNC_TYPE_CIPHER,"rc2-cfb",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC2
+#ifndef NO_RC2
 	{FUNC_TYPE_CIPHER,"rc2-ofb",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC2
+#ifndef NO_RC2
 	{FUNC_TYPE_CIPHER,"rc2-64-cbc",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC2
+#ifndef NO_RC2
 	{FUNC_TYPE_CIPHER,"rc2-40-cbc",enc_main},
 #endif
-#ifndef OPENSSL_NO_BF
+#ifndef NO_BF
 	{FUNC_TYPE_CIPHER,"bf-cbc",enc_main},
 #endif
-#ifndef OPENSSL_NO_BF
+#ifndef NO_BF
 	{FUNC_TYPE_CIPHER,"bf-ecb",enc_main},
 #endif
-#ifndef OPENSSL_NO_BF
+#ifndef NO_BF
 	{FUNC_TYPE_CIPHER,"bf-cfb",enc_main},
 #endif
-#ifndef OPENSSL_NO_BF
+#ifndef NO_BF
 	{FUNC_TYPE_CIPHER,"bf-ofb",enc_main},
 #endif
-#ifndef OPENSSL_NO_CAST
+#ifndef NO_CAST
 	{FUNC_TYPE_CIPHER,"cast5-cbc",enc_main},
 #endif
-#ifndef OPENSSL_NO_CAST
+#ifndef NO_CAST
 	{FUNC_TYPE_CIPHER,"cast5-ecb",enc_main},
 #endif
-#ifndef OPENSSL_NO_CAST
+#ifndef NO_CAST
 	{FUNC_TYPE_CIPHER,"cast5-cfb",enc_main},
 #endif
-#ifndef OPENSSL_NO_CAST
+#ifndef NO_CAST
 	{FUNC_TYPE_CIPHER,"cast5-ofb",enc_main},
 #endif
-#ifndef OPENSSL_NO_CAST
+#ifndef NO_CAST
 	{FUNC_TYPE_CIPHER,"cast-cbc",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC5
+#ifndef NO_RC5
 	{FUNC_TYPE_CIPHER,"rc5-cbc",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC5
+#ifndef NO_RC5
 	{FUNC_TYPE_CIPHER,"rc5-ecb",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC5
+#ifndef NO_RC5
 	{FUNC_TYPE_CIPHER,"rc5-cfb",enc_main},
 #endif
-#ifndef OPENSSL_NO_RC5
+#ifndef NO_RC5
 	{FUNC_TYPE_CIPHER,"rc5-ofb",enc_main},
 #endif
 	{0,NULL,NULL}

apps/progs.pl

@@ -28,17 +28,15 @@ foreach (@ARGV)
 	push(@files,$_);
 	$str="\t{FUNC_TYPE_GENERAL,\"$_\",${_}_main},\n";
 	if (($_ =~ /^s_/) || ($_ =~ /^ciphers$/))
-		{ print "#if !defined(OPENSSL_NO_SOCK) && !(defined(OPENSSL_NO_SSL2) && defined(OPENSSL_NO_SSL3))\n${str}#endif\n"; } 
+		{ print "#if !defined(NO_SOCK) && !(defined(NO_SSL2) && defined(NO_SSL3))\n${str}#endif\n"; } 
 	elsif ( ($_ =~ /^rsa$/) || ($_ =~ /^genrsa$/) || ($_ =~ /^rsautl$/)) 
-		{ print "#ifndef OPENSSL_NO_RSA\n${str}#endif\n";  }
+		{ print "#ifndef 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";}
+		{ print "#ifndef NO_DSA\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^dh$/) || ($_ =~ /^gendh$/) || ($_ =~ /^dhparam$/))
-		{ print "#ifndef OPENSSL_NO_DH\n${str}#endif\n"; }
+		{ print "#ifndef NO_DH\n${str}#endif\n"; }
 	elsif ( ($_ =~ /^pkcs12$/))
-		{ print "#if !defined(OPENSSL_NO_DES) && !defined(OPENSSL_NO_SHA1)\n${str}#endif\n"; }
+		{ print "#if !defined(NO_DES) && !defined(NO_SHA1)\n${str}#endif\n"; }
 	else
 		{ print $str; }
 	}
@@ -46,13 +44,10 @@ foreach (@ARGV)
 foreach ("md2","md4","md5","sha","sha1","mdc2","rmd160")
 	{
 	push(@files,$_);
-	printf "#ifndef OPENSSL_NO_".uc($_)."\n\t{FUNC_TYPE_MD,\"".$_."\",dgst_main},\n#endif\n";
+	printf "\t{FUNC_TYPE_MD,\"%s\",dgst_main},\n",$_;
 	}
 
 foreach (
-	"aes-128-cbc", "aes-128-ecb",
-	"aes-192-cbc", "aes-192-ecb",
-	"aes-256-cbc", "aes-256-ecb",
 	"base64",
 	"des", "des3", "desx", "idea", "rc4", "rc4-40",
 	"rc2", "bf", "cast", "rc5",
@@ -69,14 +64,13 @@ foreach (
 	push(@files,$_);
 
 	$t=sprintf("\t{FUNC_TYPE_CIPHER,\"%s\",enc_main},\n",$_);
-	if    ($_ =~ /des/)  { $t="#ifndef OPENSSL_NO_DES\n${t}#endif\n"; }
-	elsif ($_ =~ /aes/)  { $t="#ifndef OPENSSL_NO_AES\n${t}#endif\n"; }
-	elsif ($_ =~ /idea/) { $t="#ifndef OPENSSL_NO_IDEA\n${t}#endif\n"; }
-	elsif ($_ =~ /rc4/)  { $t="#ifndef OPENSSL_NO_RC4\n${t}#endif\n"; }
-	elsif ($_ =~ /rc2/)  { $t="#ifndef OPENSSL_NO_RC2\n${t}#endif\n"; }
-	elsif ($_ =~ /bf/)   { $t="#ifndef OPENSSL_NO_BF\n${t}#endif\n"; }
-	elsif ($_ =~ /cast/) { $t="#ifndef OPENSSL_NO_CAST\n${t}#endif\n"; }
-	elsif ($_ =~ /rc5/)  { $t="#ifndef OPENSSL_NO_RC5\n${t}#endif\n"; }
+	if    ($_ =~ /des/)  { $t="#ifndef NO_DES\n${t}#endif\n"; }
+	elsif ($_ =~ /idea/) { $t="#ifndef NO_IDEA\n${t}#endif\n"; }
+	elsif ($_ =~ /rc4/)  { $t="#ifndef NO_RC4\n${t}#endif\n"; }
+	elsif ($_ =~ /rc2/)  { $t="#ifndef NO_RC2\n${t}#endif\n"; }
+	elsif ($_ =~ /bf/)   { $t="#ifndef NO_BF\n${t}#endif\n"; }
+	elsif ($_ =~ /cast/) { $t="#ifndef NO_CAST\n${t}#endif\n"; }
+	elsif ($_ =~ /rc5/)  { $t="#ifndef NO_RC5\n${t}#endif\n"; }
 	print $t;
 	}
 

apps/rand.c

@@ -1,57 +1,4 @@
 /* apps/rand.c */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
 
 #include "apps.h"
 
@@ -76,7 +23,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	int i, r, ret = 1;
 	int badopt;
 	char *outfile = NULL;
@@ -84,7 +30,6 @@ int MAIN(int argc, char **argv)
 	int base64 = 0;
 	BIO *out = NULL;
 	int num = -1;
-	char *engine=NULL;
 
 	apps_startup();
 
@@ -92,9 +37,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err = BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err, stderr, BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto err;
-
 	badopt = 0;
 	i = 0;
 	while (!badopt && argv[++i] != NULL)
@@ -106,13 +48,6 @@ int MAIN(int argc, char **argv)
 			else
 				badopt = 1;
 			}
-		else if (strcmp(argv[i], "-engine") == 0)
-			{
-			if ((argv[i+1] != NULL) && (engine == NULL))
-				engine = argv[++i];
-			else
-				badopt = 1;
-			}
 		else if (strcmp(argv[i], "-rand") == 0)
 			{
 			if ((argv[i+1] != NULL) && (inrand == NULL))
@@ -150,14 +85,11 @@ int MAIN(int argc, char **argv)
 		BIO_printf(bio_err, "Usage: rand [options] num\n");
 		BIO_printf(bio_err, "where options are\n");
 		BIO_printf(bio_err, "-out file            - write to file\n");
-		BIO_printf(bio_err, "-engine e             - use engine e, possibly a hardware device.\n");
 		BIO_printf(bio_err, "-rand file%cfile%c...  - seed PRNG from files\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 		BIO_printf(bio_err, "-base64              - encode output\n");
 		goto err;
 		}
 
-        e = setup_engine(bio_err, engine, 0);
-
 	app_RAND_load_file(NULL, bio_err, (inrand != NULL));
 	if (inrand != NULL)
 		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
@@ -171,7 +103,7 @@ int MAIN(int argc, char **argv)
 	else
 		{
 		r = BIO_set_fp(out, stdout, BIO_NOCLOSE | BIO_FP_TEXT);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -212,6 +144,5 @@ err:
 	ERR_print_errors(bio_err);
 	if (out)
 		BIO_free_all(out);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}

apps/rsa.c

@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_RSA
+#ifndef NO_RSA
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -79,9 +79,6 @@
  * -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
  * -modulus	- print the RSA key modulus
  * -check	- verify key consistency
@@ -93,18 +90,16 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	int ret=1;
 	RSA *rsa=NULL;
 	int i,badops=0, sgckey=0;
 	const EVP_CIPHER *enc=NULL;
-	BIO *out=NULL;
+	BIO *in=NULL,*out=NULL;
 	int informat,outformat,text=0,check=0,noout=0;
 	int pubin = 0, pubout = 0;
 	char *infile,*outfile,*prog;
 	char *passargin = NULL, *passargout = NULL;
 	char *passin = NULL, *passout = NULL;
-	char *engine=NULL;
 	int modulus=0;
 
 	apps_startup();
@@ -113,9 +108,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	infile=NULL;
 	outfile=NULL;
 	informat=FORMAT_PEM;
@@ -156,11 +148,6 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			passargout= *(++argv);
 			}
-		else if (strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) goto bad;
-			engine= *(++argv);
-			}
 		else if (strcmp(*argv,"-sgckey") == 0)
 			sgckey=1;
 		else if (strcmp(*argv,"-pubin") == 0)
@@ -199,12 +186,8 @@ bad:
 		BIO_printf(bio_err," -passout arg    output file pass phrase source\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
+#ifndef 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");
@@ -212,14 +195,11 @@ bad:
 		BIO_printf(bio_err," -check          verify key consistency\n");
 		BIO_printf(bio_err," -pubin          expect a public key in input file\n");
 		BIO_printf(bio_err," -pubout         output a public key\n");
-		BIO_printf(bio_err," -engine e       use engine e, possibly a hardware device.\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;
@@ -230,29 +210,69 @@ bad:
 		goto end;
 	}
 
+	in=BIO_new(BIO_s_file());
 	out=BIO_new(BIO_s_file());
-
+	if ((in == NULL) || (out == NULL))
 		{
-		EVP_PKEY	*pkey;
-
-		if (pubin)
-			pkey = load_pubkey(bio_err, infile,
-				(informat == FORMAT_NETSCAPE && sgckey ?
-					FORMAT_IISSGC : informat),
-				passin, e, "Public Key");
-		else
-			pkey = load_key(bio_err, infile,
-				(informat == FORMAT_NETSCAPE && sgckey ?
-					FORMAT_IISSGC : informat),
-				passin, e, "Private Key");
-
-		if (pkey != NULL)
-		rsa = pkey == NULL ? NULL : EVP_PKEY_get1_RSA(pkey);
-		EVP_PKEY_free(pkey);
+		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 RSA key\n");
+	if	(informat == FORMAT_ASN1) {
+		if (pubin) rsa=d2i_RSA_PUBKEY_bio(in,NULL);
+		else rsa=d2i_RSAPrivateKey_bio(in,NULL);
+	}
+#ifndef NO_RC4
+	else if (informat == FORMAT_NETSCAPE)
+		{
+		BUF_MEM *buf=NULL;
+		unsigned char *p;
+		int size=0;
+
+		buf=BUF_MEM_new();
+		for (;;)
+			{
+			if ((buf == NULL) || (!BUF_MEM_grow(buf,size+1024*10)))
+				goto end;
+			i=BIO_read(in,&(buf->data[size]),1024*10);
+			size+=i;
+			if (i == 0) break;
+			if (i < 0)
+				{
+				perror("reading private key");
+				BUF_MEM_free(buf);
+				goto end;
+				}
+			}
+		p=(unsigned char *)buf->data;
+		rsa=d2i_RSA_NET(NULL,&p,(long)size,NULL, sgckey);
+		BUF_MEM_free(buf);
+		}
+#endif
+	else if (informat == FORMAT_PEM) {
+		if(pubin) rsa=PEM_read_bio_RSA_PUBKEY(in,NULL,NULL,NULL);
+		else rsa=PEM_read_bio_RSAPrivateKey(in,NULL, NULL,passin);
+	}
+	else
+		{
+		BIO_printf(bio_err,"bad input format specified for key\n");
+		goto end;
+		}
 	if (rsa == NULL)
 		{
+		BIO_printf(bio_err,"unable to load key\n");
 		ERR_print_errors(bio_err);
 		goto end;
 		}
@@ -260,7 +280,7 @@ bad:
 	if (outfile == NULL)
 		{
 		BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		out = BIO_push(tmpbio, out);
@@ -299,14 +319,14 @@ bad:
 			BIO_printf(out,"RSA key ok\n");
 		else if (r == 0)
 			{
-			long err;
+			long e;
 
-			while ((err = ERR_peek_error()) != 0 &&
-				ERR_GET_LIB(err) == ERR_LIB_RSA &&
-				ERR_GET_FUNC(err) == RSA_F_RSA_CHECK_KEY &&
-				ERR_GET_REASON(err) != ERR_R_MALLOC_FAILURE)
+			while ((e = ERR_peek_error()) != 0 &&
+				ERR_GET_LIB(e) == ERR_LIB_RSA &&
+				ERR_GET_FUNC(e) == RSA_F_RSA_CHECK_KEY &&
+				ERR_GET_REASON(e) != ERR_R_MALLOC_FAILURE)
 				{
-				BIO_printf(out, "RSA key error: %s\n", ERR_reason_error_string(err));
+				BIO_printf(out, "RSA key error: %s\n", ERR_reason_error_string(e));
 				ERR_get_error(); /* remove e from error stack */
 				}
 			}
@@ -328,7 +348,7 @@ bad:
 		if(pubout || pubin) i=i2d_RSA_PUBKEY_bio(out,rsa);
 		else i=i2d_RSAPrivateKey_bio(out,rsa);
 	}
-#ifndef OPENSSL_NO_RC4
+#ifndef NO_RC4
 	else if (outformat == FORMAT_NETSCAPE)
 		{
 		unsigned char *p,*pp;
@@ -364,14 +384,14 @@ bad:
 	else
 		ret=0;
 end:
+	if(in != NULL) BIO_free(in);
 	if(out != NULL) BIO_free_all(out);
 	if(rsa != NULL) RSA_free(rsa);
 	if(passin) OPENSSL_free(passin);
 	if(passout) OPENSSL_free(passout);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
-#else /* !OPENSSL_NO_RSA */
+#else /* !NO_RSA */
 
 # if PEDANTIC
 static void *dummy=&dummy;

apps/rsautl.c

@@ -56,7 +56,7 @@
  *
  */
 
-#ifndef OPENSSL_NO_RSA
+#ifndef NO_RSA
 
 #include "apps.h"
 #include <string.h>
@@ -82,10 +82,8 @@ int MAIN(int argc, char **);
 
 int MAIN(int argc, char **argv)
 {
-	ENGINE *e = NULL;
 	BIO *in = NULL, *out = NULL;
 	char *infile = NULL, *outfile = NULL;
-	char *engine = NULL;
 	char *keyfile = NULL;
 	char rsa_mode = RSA_VERIFY, key_type = KEY_PRIVKEY;
 	int keyform = FORMAT_PEM;
@@ -104,9 +102,6 @@ int MAIN(int argc, char **argv)
 	argv++;
 
 	if(!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
-
-	if (!load_config(bio_err, NULL))
-		goto end;
 	ERR_load_crypto_strings();
 	OpenSSL_add_all_algorithms();
 	pad = RSA_PKCS1_PADDING;
@@ -122,12 +117,6 @@ int MAIN(int argc, char **argv)
 		} else if(!strcmp(*argv, "-inkey")) {
 			if (--argc < 1) badarg = 1;
 			keyfile = *(++argv);
-		} else if (strcmp(*argv,"-keyform") == 0) {
-			if (--argc < 1) badarg = 1;
-			keyform=str2fmt(*(++argv));
-		} else if(!strcmp(*argv, "-engine")) {
-			if (--argc < 1) badarg = 1;
-			engine = *(++argv);
 		} else if(!strcmp(*argv, "-pubin")) {
 			key_type = KEY_PUBKEY;
 		} else if(!strcmp(*argv, "-certin")) {
@@ -162,25 +151,20 @@ int MAIN(int argc, char **argv)
 		goto end;
 	}
 
-        e = setup_engine(bio_err, engine, 0);
-
 /* FIXME: seed PRNG only if needed */
 	app_RAND_load_file(NULL, bio_err, 0);
 	
 	switch(key_type) {
 		case KEY_PRIVKEY:
-		pkey = load_key(bio_err, keyfile, keyform,
-			NULL, e, "Private Key");
+		pkey = load_key(bio_err, keyfile, keyform, NULL);
 		break;
 
 		case KEY_PUBKEY:
-		pkey = load_pubkey(bio_err, keyfile, keyform,
-			NULL, e, "Public Key");
+		pkey = load_pubkey(bio_err, keyfile, keyform);
 		break;
 
 		case KEY_CERT:
-		x = load_cert(bio_err, keyfile, keyform,
-			NULL, e, "Certificate");
+		x = load_cert(bio_err, keyfile, keyform);
 		if(x) {
 			pkey = X509_get_pubkey(x);
 			X509_free(x);
@@ -189,6 +173,7 @@ int MAIN(int argc, char **argv)
 	}
 
 	if(!pkey) {
+		BIO_printf(bio_err, "Error loading key\n");
 		return 1;
 	}
 
@@ -218,7 +203,7 @@ int MAIN(int argc, char **argv)
 		}
 	} else {
 		out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		    out = BIO_push(tmpbio, out);
@@ -293,7 +278,6 @@ static void usage()
 	BIO_printf(bio_err, "-in file        input file\n");
 	BIO_printf(bio_err, "-out file       output file\n");
 	BIO_printf(bio_err, "-inkey file     input key\n");
-	BIO_printf(bio_err, "-keyform arg    private key format - default PEM\n");
 	BIO_printf(bio_err, "-pubin          input is an RSA public\n");
 	BIO_printf(bio_err, "-certin         input is a certificate carrying an RSA public key\n");
 	BIO_printf(bio_err, "-ssl            use SSL v2 padding\n");
@@ -305,8 +289,6 @@ static void usage()
 	BIO_printf(bio_err, "-encrypt        encrypt with public key\n");
 	BIO_printf(bio_err, "-decrypt        decrypt with private key\n");
 	BIO_printf(bio_err, "-hexdump        hex dump output\n");
-	BIO_printf(bio_err, "-engine e       use engine e, possibly a hardware device.\n");
-
 }
 
 #endif

apps/s_apps.h

@@ -55,64 +55,9 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
 
 #include <sys/types.h>
-#include <openssl/opensslconf.h>
-
-#if defined(OPENSSL_SYS_VMS) && !defined(FD_SET)
+#if (defined(VMS) || defined(__VMS)) && !defined(FD_SET)
 /* VAX C does not defined fd_set and friends, but it's actually quite simple */
 /* These definitions are borrowed from SOCKETSHR.	/Richard Levitte */
 #define MAX_NOFILE	32
@@ -142,9 +87,13 @@ typedef fd_mask fd_set;
 int do_server(int port, int *ret, int (*cb) (), char *context);
 #ifdef HEADER_X509_H
 int MS_CALLBACK verify_callback(int ok, X509_STORE_CTX *ctx);
+#else
+int MS_CALLBACK verify_callback(int ok, char *ctx);
 #endif
 #ifdef HEADER_SSL_H
 int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file);
+#else
+int set_cert_stuff(char *ctx, char *cert_file, char *key_file);
 #endif
 int init_client(int *sock, char *server, int port);
 int should_retry(int i);
@@ -155,6 +104,8 @@ long MS_CALLBACK bio_dump_cb(BIO *bio, int cmd, const char *argp,
 	int argi, long argl, long ret);
 
 #ifdef HEADER_SSL_H
-void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret);
-void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg);
+void MS_CALLBACK apps_ssl_info_callback(SSL *s, int where, int ret);
+#else
+void MS_CALLBACK apps_ssl_info_callback(char *s, int where, int ret);
 #endif
+

apps/s_cb.c

@@ -55,59 +55,6 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -239,23 +186,21 @@ 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\n",
+		BIO_printf(out,"read from %08X [%08lX] (%d bytes => %ld (0x%X))\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\n",
+		BIO_printf(out,"write to %08X [%08lX] (%d bytes => %ld (0x%X))\n",
 			bio,argp,argi,ret,ret);
 		BIO_dump(out,argp,(int)ret);
-		BIO_printf(out,"\n");
 		}
 	return(ret);
 	}
 
-void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret)
+void MS_CALLBACK apps_ssl_info_callback(SSL *s, int where, int ret)
 	{
 	char *str;
 	int w;
@@ -268,7 +213,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\n",str,SSL_state_string_long(s));
+		BIO_printf(bio_err,"%s:%s\n",str,SSL_state_string_long(s));
 		}
 	else if (where & SSL_CB_ALERT)
 		{
@@ -291,261 +236,3 @@ void MS_CALLBACK apps_ssl_info_callback(const SSL *s, int where, int ret)
 		}
 	}
 
-
-void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *buf, size_t len, SSL *ssl, void *arg)
-	{
-	BIO *bio = arg;
-	const char *str_write_p, *str_version, *str_content_type = "", *str_details1 = "", *str_details2= "";
-	
-	str_write_p = write_p ? ">>>" : "<<<";
-
-	switch (version)
-		{
-	case SSL2_VERSION:
-		str_version = "SSL 2.0";
-		break;
-	case SSL3_VERSION:
-		str_version = "SSL 3.0 ";
-		break;
-	case TLS1_VERSION:
-		str_version = "TLS 1.0 ";
-		break;
-	default:
-		str_version = "???";
-		}
-
-	if (version == SSL2_VERSION)
-		{
-		str_details1 = "???";
-
-		if (len > 0)
-			{
-			switch (((unsigned char*)buf)[0])
-				{
-				case 0:
-					str_details1 = ", ERROR:";
-					str_details2 = " ???";
-					if (len >= 3)
-						{
-						unsigned err = (((unsigned char*)buf)[1]<<8) + ((unsigned char*)buf)[2];
-						
-						switch (err)
-							{
-						case 0x0001:
-							str_details2 = " NO-CIPHER-ERROR";
-							break;
-						case 0x0002:
-							str_details2 = " NO-CERTIFICATE-ERROR";
-							break;
-						case 0x0004:
-							str_details2 = " BAD-CERTIFICATE-ERROR";
-							break;
-						case 0x0006:
-							str_details2 = " UNSUPPORTED-CERTIFICATE-TYPE-ERROR";
-							break;
-							}
-						}
-
-					break;
-				case 1:
-					str_details1 = ", CLIENT-HELLO";
-					break;
-				case 2:
-					str_details1 = ", CLIENT-MASTER-KEY";
-					break;
-				case 3:
-					str_details1 = ", CLIENT-FINISHED";
-					break;
-				case 4:
-					str_details1 = ", SERVER-HELLO";
-					break;
-				case 5:
-					str_details1 = ", SERVER-VERIFY";
-					break;
-				case 6:
-					str_details1 = ", SERVER-FINISHED";
-					break;
-				case 7:
-					str_details1 = ", REQUEST-CERTIFICATE";
-					break;
-				case 8:
-					str_details1 = ", CLIENT-CERTIFICATE";
-					break;
-				}
-			}
-		}
-
-	if (version == SSL3_VERSION || version == TLS1_VERSION)
-		{
-		switch (content_type)
-			{
-		case 20:
-			str_content_type = "ChangeCipherSpec";
-			break;
-		case 21:
-			str_content_type = "Alert";
-			break;
-		case 22:
-			str_content_type = "Handshake";
-			break;
-			}
-
-		if (content_type == 21) /* Alert */
-			{
-			str_details1 = ", ???";
-			
-			if (len == 2)
-				{
-				switch (((unsigned char*)buf)[0])
-					{
-				case 1:
-					str_details1 = ", warning";
-					break;
-				case 2:
-					str_details1 = ", fatal";
-					break;
-					}
-
-				str_details2 = " ???";
-				switch (((unsigned char*)buf)[1])
-					{
-				case 0:
-					str_details2 = " close_notify";
-					break;
-				case 10:
-					str_details2 = " unexpected_message";
-					break;
-				case 20:
-					str_details2 = " bad_record_mac";
-					break;
-				case 21:
-					str_details2 = " decryption_failed";
-					break;
-				case 22:
-					str_details2 = " record_overflow";
-					break;
-				case 30:
-					str_details2 = " decompression_failure";
-					break;
-				case 40:
-					str_details2 = " handshake_failure";
-					break;
-				case 42:
-					str_details2 = " bad_certificate";
-					break;
-				case 43:
-					str_details2 = " unsupported_certificate";
-					break;
-				case 44:
-					str_details2 = " certificate_revoked";
-					break;
-				case 45:
-					str_details2 = " certificate_expired";
-					break;
-				case 46:
-					str_details2 = " certificate_unknown";
-					break;
-				case 47:
-					str_details2 = " illegal_parameter";
-					break;
-				case 48:
-					str_details2 = " unknown_ca";
-					break;
-				case 49:
-					str_details2 = " access_denied";
-					break;
-				case 50:
-					str_details2 = " decode_error";
-					break;
-				case 51:
-					str_details2 = " decrypt_error";
-					break;
-				case 60:
-					str_details2 = " export_restriction";
-					break;
-				case 70:
-					str_details2 = " protocol_version";
-					break;
-				case 71:
-					str_details2 = " insufficient_security";
-					break;
-				case 80:
-					str_details2 = " internal_error";
-					break;
-				case 90:
-					str_details2 = " user_canceled";
-					break;
-				case 100:
-					str_details2 = " no_renegotiation";
-					break;
-					}
-				}
-			}
-		
-		if (content_type == 22) /* Handshake */
-			{
-			str_details1 = "???";
-
-			if (len > 0)
-				{
-				switch (((unsigned char*)buf)[0])
-					{
-				case 0:
-					str_details1 = ", HelloRequest";
-					break;
-				case 1:
-					str_details1 = ", ClientHello";
-					break;
-				case 2:
-					str_details1 = ", ServerHello";
-					break;
-				case 11:
-					str_details1 = ", Certificate";
-					break;
-				case 12:
-					str_details1 = ", ServerKeyExchange";
-					break;
-				case 13:
-					str_details1 = ", CertificateRequest";
-					break;
-				case 14:
-					str_details1 = ", ServerHelloDone";
-					break;
-				case 15:
-					str_details1 = ", CertificateVerify";
-					break;
-				case 16:
-					str_details1 = ", ClientKeyExchange";
-					break;
-				case 20:
-					str_details1 = ", Finished";
-					break;
-					}
-				}
-			}
-		}
-
-	BIO_printf(bio, "%s %s%s [length %04lx]%s%s\n", str_write_p, str_version, str_content_type, (unsigned long)len, str_details1, str_details2);
-
-	if (len > 0)
-		{
-		size_t num, i;
-		
-		BIO_printf(bio, "   ");
-		num = len;
-#if 0
-		if (num > 16)
-			num = 16;
-#endif
-		for (i = 0; i < num; i++)
-			{
-			if (i % 16 == 0 && i > 0)
-				BIO_printf(bio, "\n   ");
-			BIO_printf(bio, " %02x", ((unsigned char*)buf)[i]);
-			}
-		if (i < len)
-			BIO_printf(bio, " ...");
-		BIO_printf(bio, "\n");
-		}
-	BIO_flush(bio);
-	}

apps/s_client.c

@@ -55,66 +55,12 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
 
 #include <assert.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <openssl/e_os2.h>
-#ifdef OPENSSL_NO_STDIO
+#ifdef NO_STDIO
 #define APPS_WIN16
 #endif
 
@@ -122,7 +68,7 @@
    recursive header file inclusion, resulting in the compiler complaining
    that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
    is needed to have fileno() declared correctly...  So let's define u_int */
-#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
+#if defined(VMS) && defined(__DECC) && !defined(__U_INT)
 #define __U_INT
 typedef unsigned int u_int;
 #endif
@@ -136,16 +82,12 @@ typedef unsigned int u_int;
 #include <openssl/rand.h>
 #include "s_apps.h"
 
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 #include <conio.h>
 #endif
 
 
-#ifdef OPENSSL_SYS_VMS
-#include "term_sock.h"
-#endif
-      
-#if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
+#if (defined(VMS) && __VMS_VER < 70000000)
 /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif
@@ -170,7 +112,6 @@ static int c_nbio=0;
 #endif
 static int c_Pause=0;
 static int c_debug=0;
-static int c_msg=0;
 static int c_showcerts=0;
 
 static void sc_usage(void);
@@ -197,7 +138,6 @@ static void sc_usage(void)
 	BIO_printf(bio_err," -pause        - sleep(1) after each read(2) and write(2) system call\n");
 	BIO_printf(bio_err," -showcerts    - show all certificates in the chain\n");
 	BIO_printf(bio_err," -debug        - extra output\n");
-	BIO_printf(bio_err," -msg          - Show protocol messages\n");
 	BIO_printf(bio_err," -nbio_test    - more ssl protocol testing\n");
 	BIO_printf(bio_err," -state        - print the 'ssl' states\n");
 #ifdef FIONBIO
@@ -211,14 +151,8 @@ static void sc_usage(void)
 	BIO_printf(bio_err," -tls1         - just use TLSv1\n");
 	BIO_printf(bio_err," -no_tls1/-no_ssl3/-no_ssl2 - turn off that protocol\n");
 	BIO_printf(bio_err," -bugs         - Switch on all SSL implementation bug workarounds\n");
-	BIO_printf(bio_err," -serverpref   - Use server's cipher preferences (only SSLv2)\n");
 	BIO_printf(bio_err," -cipher       - preferred cipher to use, use the 'openssl ciphers'\n");
 	BIO_printf(bio_err,"                 command to see what is available\n");
-	BIO_printf(bio_err," -starttls prot - use the STARTTLS command before starting TLS\n");
-	BIO_printf(bio_err,"                 for those protocols that support it, where\n");
-	BIO_printf(bio_err,"                 'prot' defines which one to assume.  Currently,\n");
-	BIO_printf(bio_err,"                 only \"smtp\" is supported.\n");
-	BIO_printf(bio_err," -engine id    - Initialise and use the specified engine\n");
 	BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 
 	}
@@ -229,9 +163,8 @@ int MAIN(int argc, char **argv)
 	{
 	int off=0;
 	SSL *con=NULL,*con2=NULL;
-	X509_STORE *store = NULL;
 	int s,k,width,state=0;
-	char *cbuf=NULL,*sbuf=NULL,*mbuf=NULL;
+	char *cbuf=NULL,*sbuf=NULL;
 	int cbuf_len,cbuf_off;
 	int sbuf_len,sbuf_off;
 	fd_set readfds,writefds;
@@ -245,26 +178,19 @@ int MAIN(int argc, char **argv)
 	int write_tty,read_tty,write_ssl,read_ssl,tty_on,ssl_pending;
 	SSL_CTX *ctx=NULL;
 	int ret=1,in_init=1,i,nbio_test=0;
-	int smtp_starttls = 0;
-	int prexit = 0, vflags = 0;
+	int prexit = 0;
 	SSL_METHOD *meth=NULL;
 	BIO *sbio;
 	char *inrand=NULL;
-	char *engine_id=NULL;
-	ENGINE *e=NULL;
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef 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)
+#if !defined(NO_SSL2) && !defined(NO_SSL3)
 	meth=SSLv23_client_method();
-#elif !defined(OPENSSL_NO_SSL3)
+#elif !defined(NO_SSL3)
 	meth=SSLv3_client_method();
-#elif !defined(OPENSSL_NO_SSL2)
+#elif !defined(NO_SSL2)
 	meth=SSLv2_client_method();
 #endif
 
@@ -273,18 +199,13 @@ int MAIN(int argc, char **argv)
 	c_quiet=0;
 	c_ign_eof=0;
 	c_debug=0;
-	c_msg=0;
 	c_showcerts=0;
 
 	if (bio_err == NULL)
 		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	if (	((cbuf=OPENSSL_malloc(BUFSIZZ)) == NULL) ||
-		((sbuf=OPENSSL_malloc(BUFSIZZ)) == NULL) ||
-		((mbuf=OPENSSL_malloc(BUFSIZZ)) == NULL))
+		((sbuf=OPENSSL_malloc(BUFSIZZ)) == NULL))
 		{
 		BIO_printf(bio_err,"out of memory\n");
 		goto end;
@@ -329,10 +250,6 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			cert_file= *(++argv);
 			}
-		else if	(strcmp(*argv,"-crl_check") == 0)
-			vflags |= X509_V_FLAG_CRL_CHECK;
-		else if	(strcmp(*argv,"-crl_check_all") == 0)
-			vflags |= X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL;
 		else if	(strcmp(*argv,"-prexit") == 0)
 			prexit=1;
 		else if	(strcmp(*argv,"-crlf") == 0)
@@ -348,23 +265,21 @@ int MAIN(int argc, char **argv)
 			c_Pause=1;
 		else if	(strcmp(*argv,"-debug") == 0)
 			c_debug=1;
-		else if	(strcmp(*argv,"-msg") == 0)
-			c_msg=1;
 		else if	(strcmp(*argv,"-showcerts") == 0)
 			c_showcerts=1;
 		else if	(strcmp(*argv,"-nbio_test") == 0)
 			nbio_test=1;
 		else if	(strcmp(*argv,"-state") == 0)
 			state=1;
-#ifndef OPENSSL_NO_SSL2
+#ifndef NO_SSL2
 		else if	(strcmp(*argv,"-ssl2") == 0)
 			meth=SSLv2_client_method();
 #endif
-#ifndef OPENSSL_NO_SSL3
+#ifndef NO_SSL3
 		else if	(strcmp(*argv,"-ssl3") == 0)
 			meth=SSLv3_client_method();
 #endif
-#ifndef OPENSSL_NO_TLS1
+#ifndef NO_TLS1
 		else if	(strcmp(*argv,"-tls1") == 0)
 			meth=TLSv1_client_method();
 #endif
@@ -395,8 +310,6 @@ int MAIN(int argc, char **argv)
 			off|=SSL_OP_NO_SSLv3;
 		else if (strcmp(*argv,"-no_ssl2") == 0)
 			off|=SSL_OP_NO_SSLv2;
-		else if (strcmp(*argv,"-serverpref") == 0)
-			off|=SSL_OP_CIPHER_SERVER_PREFERENCE;
 		else if	(strcmp(*argv,"-cipher") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -406,20 +319,6 @@ int MAIN(int argc, char **argv)
 		else if (strcmp(*argv,"-nbio") == 0)
 			{ c_nbio=1; }
 #endif
-		else if	(strcmp(*argv,"-starttls") == 0)
-			{
-			if (--argc < 1) goto bad;
-			++argv;
-			if (strcmp(*argv,"smtp") == 0)
-				smtp_starttls = 1;
-			else
-				goto bad;
-			}
-		else if	(strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) goto bad;
-			engine_id = *(++argv);
-			}
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -444,15 +343,15 @@ bad:
 	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\n");
+		BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n");
 		}
 	if (inrand != NULL)
-		BIO_printf(bio_err,"%ld semi-random bytes loaded\n\n",
+		BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
 			app_RAND_load_files(inrand));
 
 	if (bio_c_out == NULL)
 		{
-		if (c_quiet && !c_debug && !c_msg)
+		if (c_quiet)
 			{
 			bio_c_out=BIO_new(BIO_s_null());
 			}
@@ -465,9 +364,6 @@ 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)
 		{
@@ -504,16 +400,8 @@ bad:
 		/* goto end; */
 		}
 
-	store = SSL_CTX_get_cert_store(ctx);
-	X509_STORE_set_flags(store, vflags);
 
 	con=SSL_new(ctx);
-#ifndef OPENSSL_NO_KRB5
-	if (con  &&  (con->kssl_ctx = kssl_ctx_new()) != NULL)
-                {
-                kssl_ctx_setstring(con->kssl_ctx, KSSL_SERVER, host);
-		}
-#endif	/* OPENSSL_NO_KRB5  */
 /*	SSL_set_cipher_list(con,"RC4-MD5"); */
 
 re_start:
@@ -524,7 +412,7 @@ re_start:
 		SHUTDOWN(s);
 		goto end;
 		}
-	BIO_printf(bio_c_out,"CONNECTED(%08X)\n\n",s);
+	BIO_printf(bio_c_out,"CONNECTED(%08X)\n",s);
 
 #ifdef FIONBIO
 	if (c_nbio)
@@ -555,21 +443,11 @@ re_start:
 		BIO_set_callback(sbio,bio_dump_cb);
 		BIO_set_callback_arg(sbio,bio_c_out);
 		}
-	if (c_msg)
-		{
-		SSL_set_msg_callback(con, msg_cb);
-		SSL_set_msg_callback_arg(con, bio_c_out);
-		}
 
 	SSL_set_bio(con,sbio,sbio);
 	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;
@@ -583,14 +461,6 @@ re_start:
 	sbuf_len=0;
 	sbuf_off=0;
 
-	/* This is an ugly hack that does a lot of assumptions */
-	if (smtp_starttls)
-		{
-		BIO_read(sbio,mbuf,BUFSIZZ);
-		BIO_printf(sbio,"STARTTLS\r\n");
-		BIO_read(sbio,sbuf,BUFSIZZ);
-		}
-
 	for (;;)
 		{
 		FD_ZERO(&readfds);
@@ -610,13 +480,6 @@ re_start:
 				print_stuff(bio_c_out,con,full_log);
 				if (full_log > 0) full_log--;
 
-				if (smtp_starttls)
-					{
-					BIO_printf(bio_err,"%s",mbuf);
-					/* We don't need to know any more */
-					smtp_starttls = 0;
-					}
-
 				if (reconnect)
 					{
 					reconnect--;
@@ -633,15 +496,11 @@ re_start:
 
 		if (!ssl_pending)
 			{
-#ifndef OPENSSL_SYS_WINDOWS
+#ifndef WINDOWS
 			if (tty_on)
 				{
-#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);
@@ -664,7 +523,7 @@ re_start:
 			 * will choke the compiler: if you do have a cast then
 			 * you can either go for (int *) or (void *).
 			 */
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 			/* Under Windows we make the assumption that we can
 			 * always write to the tty: therefore if we need to
 			 * write to the tty we just fall through. Otherwise
@@ -763,7 +622,7 @@ re_start:
 				goto shut;
 				}
 			}
-#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_VMS)
+#ifdef WINDOWS
 		/* Assume Windows can always write */
 		else if (!ssl_pending && write_tty)
 #else
@@ -822,7 +681,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\n");
+				BIO_printf(bio_c_out,"read R BLOCK\n");
 				write_tty=0;
 				read_ssl=1;
 				if ((read_tty == 0) && (write_ssl == 0))
@@ -844,25 +703,17 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
 				}
 			}
 
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 		else if ((_kbhit()) || (WAIT_OBJECT_0 == WaitForSingleObject(GetStdHandle(STD_INPUT_HANDLE), 0)))
-#else
-#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;
 
-#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++)
@@ -881,11 +732,7 @@ printf("read=%d pending=%d peek=%d\n",k,SSL_pending(con),SSL_peek(con,zbuf,10240
 				assert(lf_num == 0);
 				}
 			else
-#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')))
 				{
@@ -921,19 +768,14 @@ end:
 	if (con != NULL) SSL_free(con);
 	if (con2 != NULL) SSL_free(con2);
 	if (ctx != NULL) SSL_CTX_free(ctx);
-	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 (cbuf != NULL) { OPENSSL_cleanse(cbuf,BUFSIZZ); OPENSSL_free(cbuf); }
+	if (sbuf != NULL) { OPENSSL_cleanse(sbuf,BUFSIZZ); OPENSSL_free(sbuf); }
 	if (bio_c_out != NULL)
 		{
 		BIO_free(bio_c_out);
 		bio_c_out=NULL;
 		}
-	apps_shutdown();
-#ifdef OPENSSL_SYS_VMS
-        TerminalSocket (TERM_SOCK_DELETE, &stdin_sock);
-#endif
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 
@@ -966,7 +808,7 @@ static void print_stuff(BIO *bio, SSL *s, int full)
 				BIO_printf(bio,"%2d s:%s\n",i,buf);
 				X509_NAME_oneline(X509_get_issuer_name(
 					sk_X509_value(sk,i)),buf,BUFSIZ);
-				BIO_printf(bio,"   i:%s\n\n",buf);
+				BIO_printf(bio,"   i:%s\n",buf);
 				if (c_showcerts)
 					PEM_write_bio_X509(bio,sk_X509_value(sk,i));
 				}
@@ -1040,7 +882,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\n",
+	BIO_printf(bio,"%s, Cipher is %s\n",
 		SSL_CIPHER_get_version(c),
 		SSL_CIPHER_get_name(c));
 	if (peer != NULL) {
@@ -1051,7 +893,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\n");
+	BIO_printf(bio,"---\n");
 	if (peer != NULL)
 		X509_free(peer);
 	/* flush, or debugging output gets mixed with http response */

apps/s_server.c

@@ -55,59 +55,6 @@
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
-/* ====================================================================
- * Copyright (c) 1998-2001 The OpenSSL Project.  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer. 
- *
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *
- * 3. All advertising materials mentioning features or use of this
- *    software must display the following acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
- *
- * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
- *    endorse or promote products derived from this software without
- *    prior written permission. For written permission, please contact
- *    openssl-core@openssl.org.
- *
- * 5. Products derived from this software may not be called "OpenSSL"
- *    nor may "OpenSSL" appear in their names without prior written
- *    permission of the OpenSSL Project.
- *
- * 6. Redistributions of any form whatsoever must retain the following
- *    acknowledgment:
- *    "This product includes software developed by the OpenSSL Project
- *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
- *
- * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
- * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
- * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
- * OF THE POSSIBILITY OF SUCH DAMAGE.
- * ====================================================================
- *
- * This product includes cryptographic software written by Eric Young
- * (eay@cryptsoft.com).  This product includes software written by Tim
- * Hudson (tjh@cryptsoft.com).
- *
- */
 
 #include <assert.h>
 #include <stdio.h>
@@ -115,8 +62,7 @@
 #include <string.h>
 #include <sys/types.h>
 #include <sys/stat.h>
-#include <openssl/e_os2.h>
-#ifdef OPENSSL_NO_STDIO
+#ifdef NO_STDIO
 #define APPS_WIN16
 #endif
 
@@ -124,7 +70,7 @@
    recursive header file inclusion, resulting in the compiler complaining
    that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
    is needed to have fileno() declared correctly...  So let's define u_int */
-#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
+#if defined(VMS) && defined(__DECC) && !defined(__U_INT)
 #define __U_INT
 typedef unsigned int u_int;
 #endif
@@ -140,20 +86,16 @@ typedef unsigned int u_int;
 #include <openssl/rand.h>
 #include "s_apps.h"
 
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 #include <conio.h>
 #endif
 
-#ifdef OPENSSL_SYS_VMS
-#include "term_sock.h"
-#endif
-       
-#if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
+#if (defined(VMS) && __VMS_VER < 70000000)
 /* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif
 
-#ifndef OPENSSL_NO_RSA
+#ifndef NO_RSA
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength);
 #endif
 static int sv_body(char *hostname, int s, unsigned char *context);
@@ -162,9 +104,7 @@ static void close_accept_socket(void );
 static void sv_usage(void);
 static int init_ssl_connection(SSL *s);
 static void print_stats(BIO *bp,SSL_CTX *ctx);
-static int generate_session_id(const SSL *ssl, unsigned char *id,
-				unsigned int *id_len);
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 static DH *load_dh_param(char *dhfile);
 static DH *get_dh512(void);
 #endif
@@ -180,7 +120,7 @@ static void s_server_init(void);
 # endif
 #endif
 
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 static unsigned char dh512_p[]={
 	0xDA,0x58,0x3C,0x16,0xD9,0x85,0x22,0x89,0xD0,0xE4,0xAF,0x75,
 	0x6F,0x4C,0xCA,0x92,0xDD,0x4B,0xE5,0x33,0xB8,0x04,0xFB,0x0F,
@@ -234,12 +174,9 @@ static int www=0;
 
 static BIO *bio_s_out=NULL;
 static int s_debug=0;
-static int s_msg=0;
 static int s_quiet=0;
 
 static int hack=0;
-static char *engine_id=NULL;
-static const char *session_id_prefix=NULL;
 
 #ifdef MONOLITH
 static void s_server_init(void)
@@ -260,10 +197,8 @@ static void s_server_init(void)
 
 	bio_s_out=NULL;
 	s_debug=0;
-	s_msg=0;
 	s_quiet=0;
 	hack=0;
-	engine_id=NULL;
 	}
 #endif
 
@@ -289,13 +224,11 @@ static void sv_usage(void)
 	BIO_printf(bio_err," -nbio_test    - test with the non-blocking test bio\n");
 	BIO_printf(bio_err," -crlf         - convert LF from terminal into CRLF\n");
 	BIO_printf(bio_err," -debug        - Print more output\n");
-	BIO_printf(bio_err," -msg          - Show protocol messages\n");
 	BIO_printf(bio_err," -state        - Print the SSL states\n");
 	BIO_printf(bio_err," -CApath arg   - PEM format directory of CA's\n");
 	BIO_printf(bio_err," -CAfile arg   - PEM format file of CA's\n");
 	BIO_printf(bio_err," -nocert       - Don't use any certificates (Anon-DH)\n");
 	BIO_printf(bio_err," -cipher arg   - play with 'openssl ciphers' to see what goes here\n");
-	BIO_printf(bio_err," -serverpref   - Use server's cipher preferences\n");
 	BIO_printf(bio_err," -quiet        - No server output\n");
 	BIO_printf(bio_err," -no_tmp_rsa   - Do not generate a tmp RSA key\n");
 	BIO_printf(bio_err," -ssl2         - Just talk SSLv2\n");
@@ -304,16 +237,12 @@ static void sv_usage(void)
 	BIO_printf(bio_err," -no_ssl2      - Just disable SSLv2\n");
 	BIO_printf(bio_err," -no_ssl3      - Just disable SSLv3\n");
 	BIO_printf(bio_err," -no_tls1      - Just disable TLSv1\n");
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 	BIO_printf(bio_err," -no_dhe       - Disable ephemeral DH\n");
 #endif
 	BIO_printf(bio_err," -bugs         - Turn on SSL bug compatibility\n");
 	BIO_printf(bio_err," -www          - Respond to a 'GET /' with a status page\n");
 	BIO_printf(bio_err," -WWW          - Respond to a 'GET /<path> HTTP/1.0' with file ./<path>\n");
-	BIO_printf(bio_err," -HTTP         - Respond to a 'GET /<path> HTTP/1.0' with file ./<path>\n");
-        BIO_printf(bio_err,"                 with the assumption it contains a complete HTTP response.\n");
-	BIO_printf(bio_err," -engine id    - Initialise and use the specified engine\n");
-	BIO_printf(bio_err," -id_prefix arg - Generate SSL/TLS session IDs prefixed by 'arg'\n");
 	BIO_printf(bio_err," -rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 	}
 
@@ -324,10 +253,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, char *in, int inl);
-static long ebcdic_ctrl(BIO *b, int cmd, long num, char *ptr);
+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_gets(BIO *bp, char *buf, int size);
-static int ebcdic_puts(BIO *bp, char *str);
+static int ebcdic_puts(BIO *bp, const char *str);
 
 #define BIO_TYPE_EBCDIC_FILTER	(18|0x0200)
 static BIO_METHOD methods_ebcdic=
@@ -392,7 +321,7 @@ static int ebcdic_read(BIO *b, char *out, int outl)
 	return(ret);
 }
 
-static int ebcdic_write(BIO *b, char *in, int inl)
+static int ebcdic_write(BIO *b, const char *in, int inl)
 {
 	EBCDIC_OUTBUFF *wbuf;
 	int ret=0;
@@ -425,7 +354,7 @@ static int ebcdic_write(BIO *b, char *in, int inl)
 	return(ret);
 }
 
-static long ebcdic_ctrl(BIO *b, int cmd, long num, char *ptr)
+static long ebcdic_ctrl(BIO *b, int cmd, long num, void *ptr)
 {
 	long ret;
 
@@ -444,7 +373,7 @@ static long ebcdic_ctrl(BIO *b, int cmd, long num, char *ptr)
 
 static int ebcdic_gets(BIO *bp, char *buf, int size)
 {
-	int i, ret;
+	int i, ret=0;
 	if (bp->next_bio == NULL) return(0);
 /*	return(BIO_gets(bp->next_bio,buf,size));*/
 	for (i=0; i<size-1; ++i)
@@ -463,7 +392,7 @@ static int ebcdic_gets(BIO *bp, char *buf, int size)
 	return (ret < 0 && i == 0) ? ret : i;
 }
 
-static int ebcdic_puts(BIO *bp, char *str)
+static int ebcdic_puts(BIO *bp, const char *str)
 {
 	if (bp->next_bio == NULL) return(0);
 	return ebcdic_write(bp, str, strlen(str));
@@ -474,8 +403,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char *argv[])
 	{
-	X509_STORE *store = NULL;
-	int vflags = 0;
 	short port=PORT;
 	char *CApath=NULL,*CAfile=NULL;
 	char *context = NULL;
@@ -486,14 +413,16 @@ int MAIN(int argc, char *argv[])
 	int no_tmp_rsa=0,no_dhe=0,nocert=0;
 	int state=0;
 	SSL_METHOD *meth=NULL;
-	ENGINE *e=NULL;
 	char *inrand=NULL;
+#ifndef NO_DH
+	DH *dh=NULL;
+#endif
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
+#if !defined(NO_SSL2) && !defined(NO_SSL3)
 	meth=SSLv23_server_method();
-#elif !defined(OPENSSL_NO_SSL3)
+#elif !defined(NO_SSL3)
 	meth=SSLv3_server_method();
-#elif !defined(OPENSSL_NO_SSL2)
+#elif !defined(NO_SSL2)
 	meth=SSLv2_server_method();
 #endif
 
@@ -508,9 +437,6 @@ int MAIN(int argc, char *argv[])
 	if (bio_err == NULL)
 		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	verify_depth=0;
 #ifdef FIONBIO
 	s_nbio=0;
@@ -583,16 +509,6 @@ int MAIN(int argc, char *argv[])
 			if (--argc < 1) goto bad;
 			CApath= *(++argv);
 			}
-		else if (strcmp(*argv,"-crl_check") == 0)
-			{
-			vflags |= X509_V_FLAG_CRL_CHECK;
-			}
-		else if (strcmp(*argv,"-crl_check") == 0)
-			{
-			vflags |= X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL;
-			}
-		else if	(strcmp(*argv,"-serverpref") == 0)
-			{ off|=SSL_OP_CIPHER_SERVER_PREFERENCE; }
 		else if	(strcmp(*argv,"-cipher") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -616,8 +532,6 @@ int MAIN(int argc, char *argv[])
 			}
 		else if	(strcmp(*argv,"-debug") == 0)
 			{ s_debug=1; }
-		else if	(strcmp(*argv,"-msg") == 0)
-			{ s_msg=1; }
 		else if	(strcmp(*argv,"-hack") == 0)
 			{ hack=1; }
 		else if	(strcmp(*argv,"-state") == 0)
@@ -636,36 +550,24 @@ int MAIN(int argc, char *argv[])
 			{ www=1; }
 		else if	(strcmp(*argv,"-WWW") == 0)
 			{ www=2; }
-		else if	(strcmp(*argv,"-HTTP") == 0)
-			{ www=3; }
 		else if	(strcmp(*argv,"-no_ssl2") == 0)
 			{ off|=SSL_OP_NO_SSLv2; }
 		else if	(strcmp(*argv,"-no_ssl3") == 0)
 			{ off|=SSL_OP_NO_SSLv3; }
 		else if	(strcmp(*argv,"-no_tls1") == 0)
 			{ off|=SSL_OP_NO_TLSv1; }
-#ifndef OPENSSL_NO_SSL2
+#ifndef NO_SSL2
 		else if	(strcmp(*argv,"-ssl2") == 0)
 			{ meth=SSLv2_server_method(); }
 #endif
-#ifndef OPENSSL_NO_SSL3
+#ifndef NO_SSL3
 		else if	(strcmp(*argv,"-ssl3") == 0)
 			{ meth=SSLv3_server_method(); }
 #endif
-#ifndef OPENSSL_NO_TLS1
+#ifndef NO_TLS1
 		else if	(strcmp(*argv,"-tls1") == 0)
 			{ meth=TLSv1_server_method(); }
 #endif
-		else if (strcmp(*argv, "-id_prefix") == 0)
-			{
-			if (--argc < 1) goto bad;
-			session_id_prefix = *(++argv);
-			}
-		else if (strcmp(*argv,"-engine") == 0)
-			{
-			if (--argc < 1) goto bad;
-			engine_id= *(++argv);
-			}
 		else if (strcmp(*argv,"-rand") == 0)
 			{
 			if (--argc < 1) goto bad;
@@ -698,7 +600,7 @@ bad:
 
 	if (bio_s_out == NULL)
 		{
-		if (s_quiet && !s_debug && !s_msg)
+		if (s_quiet && !s_debug)
 			{
 			bio_s_out=BIO_new(BIO_s_null());
 			}
@@ -709,7 +611,7 @@ bad:
 			}
 		}
 
-#if !defined(OPENSSL_NO_RSA) || !defined(OPENSSL_NO_DSA) || !defined(OPENSSL_NO_ECDSA)
+#if !defined(NO_RSA) || !defined(NO_DSA)
 	if (nocert)
 #endif
 		{
@@ -722,34 +624,18 @@ bad:
 	SSL_load_error_strings();
 	OpenSSL_add_ssl_algorithms();
 
-        e = setup_engine(bio_err, engine_id, 1);
-
 	ctx=SSL_CTX_new(meth);
 	if (ctx == NULL)
 		{
 		ERR_print_errors(bio_err);
 		goto end;
 		}
-	if (session_id_prefix)
-		{
-		if(strlen(session_id_prefix) >= 32)
-			BIO_printf(bio_err,
-"warning: id_prefix is too long, only one new session will be possible\n");
-		else if(strlen(session_id_prefix) >= 16)
-			BIO_printf(bio_err,
-"warning: id_prefix is too long if you use SSLv2\n");
-		if(!SSL_CTX_set_generate_session_id(ctx, generate_session_id))
-			{
-			BIO_printf(bio_err,"error setting 'id_prefix'\n");
-			ERR_print_errors(bio_err);
-			goto end;
-			}
-		BIO_printf(bio_err,"id_prefix '%s' set.\n", session_id_prefix);
-		}
+
 	SSL_CTX_set_quiet_shutdown(ctx,1);
 	if (bugs) SSL_CTX_set_options(ctx,SSL_OP_ALL);
 	if (hack) SSL_CTX_set_options(ctx,SSL_OP_NETSCAPE_DEMO_CIPHER_CHANGE_BUG);
 	SSL_CTX_set_options(ctx,off);
+	if (hack) SSL_CTX_set_options(ctx,SSL_OP_NON_EXPORT_FIRST);
 
 	if (state) SSL_CTX_set_info_callback(ctx,apps_ssl_info_callback);
 
@@ -774,19 +660,11 @@ bad:
 		ERR_print_errors(bio_err);
 		/* goto end; */
 		}
-	store = SSL_CTX_get_cert_store(ctx);
-	X509_STORE_set_flags(store, vflags);
 
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 	if (!no_dhe)
 		{
-		DH *dh=NULL;
-
-		if (dhfile)
-			dh = load_dh_param(dhfile);
-		else if (s_cert_file)
-			dh = load_dh_param(s_cert_file);
-
+		dh=load_dh_param(dhfile ? dhfile : s_cert_file);
 		if (dh != NULL)
 			{
 			BIO_printf(bio_s_out,"Setting temp DH parameters\n");
@@ -811,7 +689,7 @@ bad:
 			goto end;
 		}
 
-#ifndef OPENSSL_NO_RSA
+#ifndef NO_RSA
 #if 1
 	if (!no_tmp_rsa)
 		SSL_CTX_set_tmp_rsa_callback(ctx,tmp_rsa_cb);
@@ -831,7 +709,7 @@ bad:
 			goto end;
 			}
 		RSA_free(rsa);
-		BIO_printf(bio_s_out,"\n\n");
+		BIO_printf(bio_s_out,"\n");
 		}
 #endif
 #endif
@@ -863,8 +741,7 @@ end:
 		BIO_free(bio_s_out);
 		bio_s_out=NULL;
 		}
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 static void print_stats(BIO *bio, SSL_CTX *ssl_ctx)
@@ -887,7 +764,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\n",
+	BIO_printf(bio,"%4d cache full overflows (%d allowed)\n",
 		SSL_CTX_sess_cache_full(ssl_ctx),
 		SSL_CTX_sess_get_cache_size(ssl_ctx));
 	}
@@ -901,14 +778,9 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 	unsigned long l;
 	SSL *con=NULL;
 	BIO *sbio;
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef 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)
 		{
@@ -929,15 +801,6 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 
 	if (con == NULL) {
 		con=SSL_new(ctx);
-#ifndef OPENSSL_NO_KRB5
-		if ((con->kssl_ctx = kssl_ctx_new()) != NULL)
-                        {
-                        kssl_ctx_setstring(con->kssl_ctx, KSSL_SERVICE,
-								KRB5SVC);
-                        kssl_ctx_setstring(con->kssl_ctx, KSSL_KEYTAB,
-								KRB5KEYTAB);
-                        }
-#endif	/* OPENSSL_NO_KRB5 */
 		if(context)
 		      SSL_set_session_id_context(con, context,
 						 strlen((char *)context));
@@ -962,17 +825,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 		BIO_set_callback(SSL_get_rbio(con),bio_dump_cb);
 		BIO_set_callback_arg(SSL_get_rbio(con),bio_s_out);
 		}
-	if (s_msg)
-		{
-		SSL_set_msg_callback(con, msg_cb);
-		SSL_set_msg_callback_arg(con, bio_s_out);
-		}
 
-#ifdef OPENSSL_SYS_VMS
-        if (stdin_sock > s)
-            width = stdin_sock + 1;
-        else
-#endif
 	width=s+1;
 	for (;;)
 		{
@@ -985,12 +838,8 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 		if (!read_from_sslcon)
 			{
 			FD_ZERO(&readfds);
-#ifndef OPENSSL_SYS_WINDOWS
-#ifdef OPENSSL_SYS_VMS
-                        FD_SET(stdin_sock,&readfds);
-#else
+#ifndef WINDOWS
 			FD_SET(fileno(stdin),&readfds);
-#endif
 #endif
 			FD_SET(s,&readfds);
 			/* Note: under VMS with SOCKETSHR the second parameter is
@@ -999,7 +848,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 			 * the compiler: if you do have a cast then you can either
 			 * go for (int *) or (void *).
 			 */
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 			/* Under Windows we can't select on stdin: only
 			 * on sockets. As a workaround we timeout the select every
 			 * second and check for any keypress. In a proper Windows
@@ -1014,11 +863,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 #else
 			i=select(width,(void *)&readfds,NULL,NULL,NULL);
 			if (i <= 0) continue;
-#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))
@@ -1030,11 +875,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 				{
 				int j, lf_num;
 
-#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++)
@@ -1053,11 +894,7 @@ static int sv_body(char *hostname, int s, unsigned char *context)
 				assert(lf_num == 0);
 				}
 			else
-#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'))
@@ -1126,7 +963,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\n");
+					BIO_printf(bio_s_out,"Write BLOCK\n");
 					break;
 				case SSL_ERROR_SYSCALL:
 				case SSL_ERROR_SSL:
@@ -1136,7 +973,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\n");
+					BIO_printf(bio_s_out,"DONE\n");
 					ret=1;
 					goto err;
 					}
@@ -1174,13 +1011,12 @@ 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\n");
+					BIO_printf(bio_s_out,"Read BLOCK\n");
 					break;
 				case SSL_ERROR_SYSCALL:
 				case SSL_ERROR_SSL:
@@ -1207,14 +1043,11 @@ err:
 	BIO_printf(bio_s_out,"CONNECTION CLOSED\n");
 	if (buf != NULL)
 		{
-		memset(buf,0,bufsize);
+		OPENSSL_cleanse(buf,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);
 	}
 
@@ -1272,7 +1105,7 @@ static int init_ssl_connection(SSL *con)
 	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\n",(str != NULL)?str:"(NONE)");
+	BIO_printf(bio_s_out,"CIPHER is %s\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)
@@ -1281,7 +1114,7 @@ static int init_ssl_connection(SSL *con)
 	return(1);
 	}
 
-#ifndef OPENSSL_NO_DH
+#ifndef NO_DH
 static DH *load_dh_param(char *dhfile)
 	{
 	DH *ret=NULL;
@@ -1350,13 +1183,6 @@ static int www_body(char *hostname, int s, unsigned char *context)
 	if (!BIO_set_write_buffer_size(io,bufsize)) goto err;
 
 	if ((con=SSL_new(ctx)) == NULL) goto err;
-#ifndef OPENSSL_NO_KRB5
-	if ((con->kssl_ctx = kssl_ctx_new()) != NULL)
-		{
-		kssl_ctx_setstring(con->kssl_ctx, KSSL_SERVICE, KRB5SVC);
-		kssl_ctx_setstring(con->kssl_ctx, KSSL_KEYTAB, KRB5KEYTAB);
-		}
-#endif	/* OPENSSL_NO_KRB5 */
 	if(context) SSL_set_session_id_context(con, context,
 					       strlen((char *)context));
 
@@ -1384,11 +1210,6 @@ static int www_body(char *hostname, int s, unsigned char *context)
 		BIO_set_callback(SSL_get_rbio(con),bio_dump_cb);
 		BIO_set_callback_arg(SSL_get_rbio(con),bio_s_out);
 		}
-	if (s_msg)
-		{
-		SSL_set_msg_callback(con, msg_cb);
-		SSL_set_msg_callback_arg(con, bio_s_out);
-		}
 
 	blank=0;
 	for (;;)
@@ -1428,8 +1249,8 @@ static int www_body(char *hostname, int s, unsigned char *context)
 				}
 			else
 				{
-				BIO_printf(bio_s_out,"read R BLOCK\n\n");
-#ifndef OPENSSL_SYS_MSDOS
+				BIO_printf(bio_s_out,"read R BLOCK\n");
+#if !defined(MSDOS) && !defined(VXWORKS)
 				sleep(1);
 #endif
 				continue;
@@ -1523,8 +1344,7 @@ static int www_body(char *hostname, int s, unsigned char *context)
 			BIO_puts(io,"</BODY></HTML>\r\n\r\n");
 			break;
 			}
-		else if ((www == 2 || www == 3)
-                         && (strncmp("GET /",buf,5) == 0))
+		else if ((www == 2) && (strncmp("GET /",buf,5) == 0))
 			{
 			BIO *file;
 			char *p,*e;
@@ -1614,8 +1434,6 @@ static int www_body(char *hostname, int s, unsigned char *context)
 			if (!s_quiet)
 				BIO_printf(bio_err,"FILE:%s\n",p);
 
-                        if (www == 2)
-                                {
 			i=strlen(p);
 			if (	((i > 5) && (strcmp(&(p[i-5]),".html") == 0)) ||
 				((i > 4) && (strcmp(&(p[i-4]),".php") == 0)) ||
@@ -1623,7 +1441,6 @@ static int www_body(char *hostname, int s, unsigned char *context)
 				BIO_puts(io,"HTTP/1.0 200 ok\r\nContent-type: text/html\r\n\r\n");
 			else
 				BIO_puts(io,"HTTP/1.0 200 ok\r\nContent-type: text/plain\r\n\r\n");
-                                }
 			/* send the file */
 			total_bytes=0;
 			for (;;)
@@ -1654,7 +1471,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\n");
+							BIO_printf(bio_s_out,"rwrite W BLOCK\n");
 							}
 						}
 					else
@@ -1701,7 +1518,7 @@ err:
 	return(ret);
 	}
 
-#ifndef OPENSSL_NO_RSA
+#ifndef NO_RSA
 static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
 	{
 	static RSA *rsa_tmp=NULL;
@@ -1723,26 +1540,3 @@ static RSA MS_CALLBACK *tmp_rsa_cb(SSL *s, int is_export, int keylength)
 	return(rsa_tmp);
 	}
 #endif
-
-#define MAX_SESSION_ID_ATTEMPTS 10
-static int generate_session_id(const SSL *ssl, unsigned char *id,
-				unsigned int *id_len)
-	{
-	unsigned int count = 0;
-	do	{
-		RAND_pseudo_bytes(id, *id_len);
-		/* Prefix the session_id with the required prefix. NB: If our
-		 * prefix is too long, clip it - but there will be worse effects
-		 * anyway, eg. the server could only possibly create 1 session
-		 * ID (ie. the prefix!) so all future session negotiations will
-		 * fail due to conflicts. */
-		memcpy(id, session_id_prefix,
-			(strlen(session_id_prefix) < *id_len) ?
-			strlen(session_id_prefix) : *id_len);
-		}
-	while(SSL_has_matching_session_id(ssl, id, *id_len) &&
-		(++count < MAX_SESSION_ID_ATTEMPTS));
-	if(count >= MAX_SESSION_ID_ATTEMPTS)
-		return 0;
-	return 1;
-	}

apps/s_socket.c

@@ -62,13 +62,11 @@
 #include <errno.h>
 #include <signal.h>
 
-#include <openssl/e_os2.h>
-
 /* With IPv6, it looks like Digital has mixed up the proper order of
    recursive header file inclusion, resulting in the compiler complaining
    that u_int isn't defined, but only if _POSIX_C_SOURCE is defined, which
    is needed to have fileno() declared correctly...  So let's define u_int */
-#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__U_INT)
+#if defined(VMS) && defined(__DECC) && !defined(__U_INT)
 #define __U_INT
 typedef unsigned int u_int;
 #endif
@@ -82,7 +80,7 @@ typedef unsigned int u_int;
 #include <openssl/ssl.h>
 
 static struct hostent *GetHostByName(char *name);
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 static void sock_cleanup(void);
 #endif
 static int sock_init(void);
@@ -92,17 +90,17 @@ static int init_server_long(int *sock, int port,char *ip);
 static int do_accept(int acc_sock, int *sock, char **host);
 static int host_ip(char *str, unsigned char ip[4]);
 
-#ifdef OPENSSL_SYS_WIN16
+#ifdef WIN16
 #define SOCKET_PROTOCOL	0 /* more microsoft stupidity */
 #else
 #define SOCKET_PROTOCOL	IPPROTO_TCP
 #endif
 
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 static struct WSAData wsa_state;
 static int wsa_init_done=0;
 
-#ifdef OPENSSL_SYS_WIN16
+#ifdef WIN16
 static HWND topWnd=0;
 static FARPROC lpTopWndProc=NULL;
 static FARPROC lpTopHookProc=NULL;
@@ -131,10 +129,10 @@ static BOOL CALLBACK enumproc(HWND hwnd,LPARAM lParam)
 	return(FALSE);
 	}
 
-#endif /* OPENSSL_SYS_WIN32 */
-#endif /* OPENSSL_SYS_WINDOWS */
+#endif /* WIN32 */
+#endif /* WINDOWS */
 
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 static void sock_cleanup(void)
 	{
 	if (wsa_init_done)
@@ -148,7 +146,7 @@ static void sock_cleanup(void)
 
 static int sock_init(void)
 	{
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 	if (!wsa_init_done)
 		{
 		int err;
@@ -165,15 +163,15 @@ static int sock_init(void)
 			return(0);
 			}
 
-#ifdef OPENSSL_SYS_WIN16
+#ifdef WIN16
 		EnumTaskWindows(GetCurrentTask(),enumproc,0L);
 		lpTopWndProc=(FARPROC)GetWindowLong(topWnd,GWL_WNDPROC);
 		lpTopHookProc=MakeProcInstance((FARPROC)topHookProc,_hInstance);
 
 		SetWindowLong(topWnd,GWL_WNDPROC,(LONG)lpTopHookProc);
-#endif /* OPENSSL_SYS_WIN16 */
+#endif /* WIN16 */
 		}
-#endif /* OPENSSL_SYS_WINDOWS */
+#endif /* WINDOWS */
 	return(1);
 	}
 
@@ -211,7 +209,7 @@ static int init_client_ip(int *sock, unsigned char ip[4], int port)
 	s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
 	if (s == INVALID_SOCKET) { perror("socket"); return(0); }
 
-#ifndef OPENSSL_SYS_MPE
+#ifndef MPE
 	i=0;
 	i=setsockopt(s,SOL_SOCKET,SO_KEEPALIVE,(char *)&i,sizeof(i));
 	if (i < 0) { perror("keepalive"); return(0); }
@@ -287,7 +285,7 @@ static int init_server_long(int *sock, int port, char *ip)
 #endif
 	if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
 		{
-#ifndef OPENSSL_SYS_WINDOWS
+#ifndef WINDOWS
 		perror("bind");
 #endif
 		goto err;
@@ -320,7 +318,7 @@ static int do_accept(int acc_sock, int *sock, char **host)
 
 	if (!sock_init()) return(0);
 
-#ifndef OPENSSL_SYS_WINDOWS
+#ifndef WINDOWS
 redoit:
 #endif
 
@@ -334,7 +332,7 @@ redoit:
 	ret=accept(acc_sock,(struct sockaddr *)&from,(void *)&len);
 	if (ret == INVALID_SOCKET)
 		{
-#ifdef OPENSSL_SYS_WINDOWS
+#ifdef WINDOWS
 		i=WSAGetLastError();
 		BIO_printf(bio_err,"accept error %d\n",i);
 #else

apps/s_time.c

@@ -67,25 +67,22 @@
 #include <stdlib.h>
 #include <string.h>
 
-#define USE_SOCKETS
-#include "apps.h"
-#ifdef OPENSSL_NO_STDIO
+#ifdef NO_STDIO
 #define APPS_WIN16
 #endif
+#define USE_SOCKETS
 #include <openssl/x509.h>
 #include <openssl/ssl.h>
 #include <openssl/pem.h>
+#include "apps.h"
 #include "s_apps.h"
 #include <openssl/err.h>
 #ifdef WIN32_STUFF
 #include "winmain.h"
 #include "wintext.h"
 #endif
-#if !defined(OPENSSL_SYS_MSDOS)
-#include OPENSSL_UNISTD
-#endif
 
-#if !defined(OPENSSL_SYS_MSDOS) && !defined(OPENSSL_SYS_VXWORKS) && (!defined(OPENSSL_SYS_VMS) || defined(__DECC)) && !defined(OPENSSL_SYS_MACOSX)
+#if !defined(MSDOS) && !defined(VXWORKS) && (!defined(VMS) || defined(__DECC)) || defined (_DARWIN)
 #define TIMES
 #endif
 
@@ -101,11 +98,11 @@
    The __TMS macro will show if it was.  If it wasn't defined, we should
    undefine TIMES, since that tells the rest of the program how things
    should be handled.				-- Richard Levitte */
-#if defined(OPENSSL_SYS_VMS_DECC) && !defined(__TMS)
+#if defined(VMS) && defined(__DECC) && !defined(__TMS)
 #undef TIMES
 #endif
 
-#if !defined(TIMES) && !defined(OPENSSL_SYS_VXWORKS)
+#if !defined(TIMES) && !defined(VXWORKS)
 #include <sys/timeb.h>
 #endif
 
@@ -119,22 +116,19 @@
 #include <sys/param.h>
 #endif
 
+#ifdef VXWORKS
+#include <tickLib.h>
+#undef SIGALRM
+#endif
+
 /* The following if from times(3) man page.  It may need to be changed
 */
 #ifndef HZ
-# ifdef _SC_CLK_TCK
-#  define HZ ((double)sysconf(_SC_CLK_TCK))
-# else
-#  ifndef CLK_TCK
-#   ifndef _BSD_CLK_TCK_ /* FreeBSD hack */
-#    define HZ	100.0
-#   else /* _BSD_CLK_TCK_ */
-#    define HZ ((double)_BSD_CLK_TCK_)
-#   endif
-#  else /* CLK_TCK */
-#   define HZ ((double)CLK_TCK)
-#  endif
-# endif
+#ifndef CLK_TCK
+#define HZ      100.0
+#else /* CLK_TCK */
+#define HZ ((double)CLK_TCK)
+#endif
 #endif
 
 #undef PROG
@@ -187,7 +181,7 @@ static int perform=0;
 #ifdef FIONBIO
 static int t_nbio=0;
 #endif
-#ifdef OPENSSL_SYS_WIN32
+#ifdef WIN32
 static int exitNow = 0;		/* Set when it's time to exit main */
 #endif
 
@@ -211,7 +205,7 @@ static void s_time_init(void)
 #ifdef FIONBIO
 	t_nbio=0;
 #endif
-#ifdef OPENSSL_SYS_WIN32
+#ifdef WIN32
 	exitNow = 0;		/* Set when it's time to exit main */
 #endif
 	}
@@ -327,11 +321,11 @@ static int parseArgs(int argc, char **argv)
 		}
 	else if(strcmp(*argv,"-bugs") == 0)
 	    st_bugs=1;
-#ifndef OPENSSL_NO_SSL2
+#ifndef NO_SSL2
 	else if(strcmp(*argv,"-ssl2") == 0)
 	    s_time_meth=SSLv2_client_method();
 #endif
-#ifndef OPENSSL_NO_SSL3
+#ifndef NO_SSL3
 	else if(strcmp(*argv,"-ssl3") == 0)
 	    s_time_meth=SSLv3_client_method();
 #endif
@@ -381,7 +375,7 @@ static double tm_Time_F(int s)
 		ret=((double)(tend.tms_utime-tstart.tms_utime))/HZ;
 		return((ret == 0.0)?1e-6:ret);
 	}
-#elif defined(OPENSSL_SYS_VXWORKS)
+#elif defined(VXWORKS)
         {
 	static unsigned long tick_start, tick_end;
 
@@ -435,11 +429,11 @@ int MAIN(int argc, char **argv)
 	if (bio_err == NULL)
 		bio_err=BIO_new_fp(stderr,BIO_NOCLOSE);
 
-#if !defined(OPENSSL_NO_SSL2) && !defined(OPENSSL_NO_SSL3)
+#if !defined(NO_SSL2) && !defined(NO_SSL3)
 	s_time_meth=SSLv23_client_method();
-#elif !defined(OPENSSL_NO_SSL3)
+#elif !defined(NO_SSL3)
 	s_time_meth=SSLv3_client_method();
-#elif !defined(OPENSSL_NO_SSL2)
+#elif !defined(NO_SSL2)
 	s_time_meth=SSLv2_client_method();
 #endif
 
@@ -472,6 +466,7 @@ int MAIN(int argc, char **argv)
 
 	if (tm_cipher == NULL ) {
 		fprintf( stderr, "No CIPHER specified\n" );
+/*		OPENSSL_EXIT(1); */
 	}
 
 	if (!(perform & 1)) goto next;
@@ -638,8 +633,7 @@ end:
 		SSL_CTX_free(tm_ctx);
 		tm_ctx=NULL;
 		}
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 /***********************************************************************

apps/sess_id.c

@@ -156,7 +156,7 @@ int MAIN(int argc, char **argv)
 		{
 bad:
 		for (pp=sess_id_usage; (*pp != NULL); pp++)
-			BIO_printf(bio_err,"%s",*pp);
+			BIO_printf(bio_err,*pp);
 		goto end;
 		}
 
@@ -208,7 +208,7 @@ bad:
 		if (outfile == NULL)
 			{
 			BIO_set_fp(out,stdout,BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 			{
 			BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 			out = BIO_push(tmpbio, out);
@@ -272,8 +272,7 @@ bad:
 end:
 	if (out != NULL) BIO_free_all(out);
 	if (x != NULL) SSL_SESSION_free(x);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
 static SSL_SESSION *load_sess_id(char *infile, int format)

apps/smime.c

@@ -67,6 +67,7 @@
 
 #undef PROG
 #define PROG smime_main
+static X509_STORE *setup_verify(char *CAfile, char *CApath);
 static int save_certs(char *signerfile, STACK_OF(X509) *signers);
 
 #define SMIME_OP	0x10
@@ -80,7 +81,6 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 {
-	ENGINE *e = NULL;
 	int operation = 0;
 	int ret = 0;
 	char **args;
@@ -88,7 +88,7 @@ int MAIN(int argc, char **argv)
 	char *infile = NULL, *outfile = NULL;
 	char *signerfile = NULL, *recipfile = NULL;
 	char *certfile = NULL, *keyfile = NULL, *contfile=NULL;
-	const EVP_CIPHER *cipher = NULL;
+	EVP_CIPHER *cipher = NULL;
 	PKCS7 *p7 = NULL;
 	X509_STORE *store = NULL;
 	X509 *cert = NULL, *recip = NULL, *signer = NULL;
@@ -96,55 +96,36 @@ int MAIN(int argc, char **argv)
 	STACK_OF(X509) *encerts = NULL, *other = NULL;
 	BIO *in = NULL, *out = NULL, *indata = NULL;
 	int badarg = 0;
-	int flags = PKCS7_DETACHED, store_flags = 0;
+	int flags = PKCS7_DETACHED;
 	char *to = NULL, *from = NULL, *subject = NULL;
 	char *CAfile = NULL, *CApath = NULL;
 	char *passargin = NULL, *passin = NULL;
 	char *inrand = NULL;
 	int need_rand = 0;
 	int informat = FORMAT_SMIME, outformat = FORMAT_SMIME;
-        int keyform = FORMAT_PEM;
-	char *engine=NULL;
-
 	args = argv + 1;
+
 	ret = 1;
 
-	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;
-
 	while (!badarg && *args && *args[0] == '-') {
 		if (!strcmp (*args, "-encrypt")) operation = SMIME_ENCRYPT;
 		else if (!strcmp (*args, "-decrypt")) operation = SMIME_DECRYPT;
 		else if (!strcmp (*args, "-sign")) operation = SMIME_SIGN;
 		else if (!strcmp (*args, "-verify")) operation = SMIME_VERIFY;
 		else if (!strcmp (*args, "-pk7out")) operation = SMIME_PK7OUT;
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 		else if (!strcmp (*args, "-des3")) 
 				cipher = EVP_des_ede3_cbc();
 		else if (!strcmp (*args, "-des")) 
 				cipher = EVP_des_cbc();
 #endif
-#ifndef OPENSSL_NO_RC2
+#ifndef NO_RC2
 		else if (!strcmp (*args, "-rc2-40")) 
 				cipher = EVP_rc2_40_cbc();
 		else if (!strcmp (*args, "-rc2-128")) 
 				cipher = EVP_rc2_cbc();
 		else if (!strcmp (*args, "-rc2-64")) 
 				cipher = EVP_rc2_64_cbc();
-#endif
-#ifndef OPENSSL_NO_AES
-		else if (!strcmp(*args,"-aes128"))
-				cipher = EVP_aes_128_cbc();
-		else if (!strcmp(*args,"-aes192"))
-				cipher = EVP_aes_192_cbc();
-		else if (!strcmp(*args,"-aes256"))
-				cipher = EVP_aes_256_cbc();
 #endif
 		else if (!strcmp (*args, "-text")) 
 				flags |= PKCS7_TEXT;
@@ -166,21 +147,12 @@ int MAIN(int argc, char **argv)
 				flags |= PKCS7_BINARY;
 		else if (!strcmp (*args, "-nosigs"))
 				flags |= PKCS7_NOSIGS;
-		else if (!strcmp (*args, "-crl_check"))
-				store_flags |= X509_V_FLAG_CRL_CHECK;
-		else if (!strcmp (*args, "-crl_check_all"))
-				store_flags |= X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL;
 		else if (!strcmp(*args,"-rand")) {
 			if (args[1]) {
 				args++;
 				inrand = *args;
 			} else badarg = 1;
 			need_rand = 1;
-		} else if (!strcmp(*args,"-engine")) {
-			if (args[1]) {
-				args++;
-				engine = *args;
-			} else badarg = 1;
 		} else if (!strcmp(*args,"-passin")) {
 			if (args[1]) {
 				args++;
@@ -216,11 +188,6 @@ int MAIN(int argc, char **argv)
 				args++;
 				keyfile = *args;
 			} else badarg = 1;
-		} else if (!strcmp (*args, "-keyform")) {
-			if (args[1]) {
-				args++;
-				keyform = str2fmt(*args);
-			} else badarg = 1;
 		} else if (!strcmp (*args, "-certfile")) {
 			if (args[1]) {
 				args++;
@@ -292,18 +259,14 @@ int MAIN(int argc, char **argv)
 		BIO_printf (bio_err, "-sign          sign message\n");
 		BIO_printf (bio_err, "-verify        verify signed message\n");
 		BIO_printf (bio_err, "-pk7out        output PKCS#7 structure\n");
-#ifndef OPENSSL_NO_DES
+#ifndef NO_DES
 		BIO_printf (bio_err, "-des3          encrypt with triple DES\n");
 		BIO_printf (bio_err, "-des           encrypt with DES\n");
 #endif
-#ifndef OPENSSL_NO_RC2
+#ifndef NO_RC2
 		BIO_printf (bio_err, "-rc2-40        encrypt with RC2-40 (default)\n");
 		BIO_printf (bio_err, "-rc2-64        encrypt with RC2-64\n");
 		BIO_printf (bio_err, "-rc2-128       encrypt with RC2-128\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, "-nointern      don't search certificates in message for signer\n");
 		BIO_printf (bio_err, "-nosigs        don't verify message signature\n");
@@ -318,7 +281,6 @@ int MAIN(int argc, char **argv)
 		BIO_printf (bio_err, "-in file       input file\n");
 		BIO_printf (bio_err, "-inform arg    input format SMIME (default), PEM or DER\n");
 		BIO_printf (bio_err, "-inkey file    input private key (if not signer or recipient)\n");
-		BIO_printf (bio_err, "-keyform arg   input private key format (PEM or ENGINE)\n");
 		BIO_printf (bio_err, "-out file      output file\n");
 		BIO_printf (bio_err, "-outform arg   output format SMIME (default), PEM or DER\n");
 		BIO_printf (bio_err, "-content file  supply or override content for detached signature\n");
@@ -328,9 +290,6 @@ int MAIN(int argc, char **argv)
 		BIO_printf (bio_err, "-text          include or delete text MIME headers\n");
 		BIO_printf (bio_err, "-CApath dir    trusted certificates directory\n");
 		BIO_printf (bio_err, "-CAfile file   trusted certificates file\n");
-		BIO_printf (bio_err, "-crl_check     check revocation status of signer's certificate using CRLs\n");
-		BIO_printf (bio_err, "-crl_check_all check revocation status of signer's certificate chain using CRLs\n");
-		BIO_printf (bio_err, "-engine e      use engine e, possibly a hardware device.\n");
 		BIO_printf (bio_err, "-passin arg    input file pass phrase source\n");
 		BIO_printf(bio_err,  "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR);
 		BIO_printf(bio_err,  "               load the file (or the files in the directory) into\n");
@@ -339,8 +298,6 @@ int MAIN(int argc, char **argv)
 		goto end;
 	}
 
-        e = setup_engine(bio_err, engine, 0);
-
 	if(!app_passwd(bio_err, passargin, NULL, &passin, NULL)) {
 		BIO_printf(bio_err, "Error getting password\n");
 		goto end;
@@ -367,7 +324,7 @@ int MAIN(int argc, char **argv)
 
 	if(operation == SMIME_ENCRYPT) {
 		if (!cipher) {
-#ifndef OPENSSL_NO_RC2			
+#ifndef NO_RC2			
 			cipher = EVP_rc2_40_cbc();
 #else
 			BIO_printf(bio_err, "No cipher selected\n");
@@ -376,11 +333,8 @@ int MAIN(int argc, char **argv)
 		}
 		encerts = sk_X509_new_null();
 		while (*args) {
-			if(!(cert = load_cert(bio_err,*args,FORMAT_PEM,
-				NULL, e, "recipient certificate file"))) {
-#if 0				/* An appropriate message is already printed */
+			if(!(cert = load_cert(bio_err,*args,FORMAT_PEM))) {
 				BIO_printf(bio_err, "Can't read recipient certificate file %s\n", *args);
-#endif
 				goto end;
 			}
 			sk_X509_push(encerts, cert);
@@ -390,32 +344,23 @@ int MAIN(int argc, char **argv)
 	}
 
 	if(signerfile && (operation == SMIME_SIGN)) {
-		if(!(signer = load_cert(bio_err,signerfile,FORMAT_PEM, NULL,
-			e, "signer certificate"))) {
-#if 0			/* An appropri message has already been printed */
+		if(!(signer = load_cert(bio_err,signerfile,FORMAT_PEM))) {
 			BIO_printf(bio_err, "Can't read signer certificate file %s\n", signerfile);
-#endif
 			goto end;
 		}
 	}
 
 	if(certfile) {
-		if(!(other = load_certs(bio_err,certfile,FORMAT_PEM, NULL,
-			e, "certificate file"))) {
-#if 0			/* An appropriate message has already been printed */
+		if(!(other = load_certs(bio_err,certfile,FORMAT_PEM))) {
 			BIO_printf(bio_err, "Can't read certificate file %s\n", certfile);
-#endif
 			ERR_print_errors(bio_err);
 			goto end;
 		}
 	}
 
 	if(recipfile && (operation == SMIME_DECRYPT)) {
-		if(!(recip = load_cert(bio_err,recipfile,FORMAT_PEM,NULL,
-			e, "recipient certificate file"))) {
-#if 0			/* An appropriate message has alrady been printed */
+		if(!(recip = load_cert(bio_err,recipfile,FORMAT_PEM))) {
 			BIO_printf(bio_err, "Can't read recipient certificate file %s\n", recipfile);
-#endif
 			ERR_print_errors(bio_err);
 			goto end;
 		}
@@ -428,9 +373,9 @@ int MAIN(int argc, char **argv)
 	} else keyfile = NULL;
 
 	if(keyfile) {
-		key = load_key(bio_err, keyfile, keyform, passin, e,
-			       "signing key file");
-		if (!key) {
+		if(!(key = load_key(bio_err,keyfile, FORMAT_PEM, passin))) {
+			BIO_printf(bio_err, "Can't read recipient certificate file %s\n", keyfile);
+			ERR_print_errors(bio_err);
 			goto end;
 		}
 	}
@@ -451,7 +396,7 @@ int MAIN(int argc, char **argv)
 		}
 	} else {
 		out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		    out = BIO_push(tmpbio, out);
@@ -460,11 +405,9 @@ int MAIN(int argc, char **argv)
 	}
 
 	if(operation == SMIME_VERIFY) {
-		if(!(store = setup_verify(bio_err, CAfile, CApath))) goto end;
-		X509_STORE_set_flags(store, store_flags);
+		if(!(store = setup_verify(CAfile, CApath))) goto end;
 	}
 
-
 	ret = 3;
 
 	if(operation == SMIME_ENCRYPT) {
@@ -564,6 +507,36 @@ end:
 	return (ret);
 }
 
+static X509_STORE *setup_verify(char *CAfile, char *CApath)
+{
+	X509_STORE *store;
+	X509_LOOKUP *lookup;
+	if(!(store = X509_STORE_new())) goto end;
+	lookup=X509_STORE_add_lookup(store,X509_LOOKUP_file());
+	if (lookup == NULL) goto end;
+	if (CAfile) {
+		if(!X509_LOOKUP_load_file(lookup,CAfile,X509_FILETYPE_PEM)) {
+			BIO_printf(bio_err, "Error loading file %s\n", CAfile);
+			goto end;
+		}
+	} else X509_LOOKUP_load_file(lookup,NULL,X509_FILETYPE_DEFAULT);
+		
+	lookup=X509_STORE_add_lookup(store,X509_LOOKUP_hash_dir());
+	if (lookup == NULL) goto end;
+	if (CApath) {
+		if(!X509_LOOKUP_add_dir(lookup,CApath,X509_FILETYPE_PEM)) {
+			BIO_printf(bio_err, "Error loading directory %s\n", CApath);
+			goto end;
+		}
+	} else X509_LOOKUP_add_dir(lookup,NULL,X509_FILETYPE_DEFAULT);
+
+	ERR_clear_error();
+	return store;
+	end:
+	X509_STORE_free(store);
+	return NULL;
+}
+
 static int save_certs(char *signerfile, STACK_OF(X509) *signers)
 {
 	int i;

apps/spkac.c

@@ -81,26 +81,21 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	int i,badops=0, ret = 1;
-	BIO *in = NULL,*out = NULL;
+	BIO *in = NULL,*out = NULL, *key = NULL;
 	int verify=0,noout=0,pubkey=0;
 	char *infile = NULL,*outfile = NULL,*prog;
 	char *passargin = NULL, *passin = NULL;
 	char *spkac = "SPKAC", *spksect = "default", *spkstr = NULL;
 	char *challenge = NULL, *keyfile = NULL;
-	CONF *conf = NULL;
+	LHASH *conf = NULL;
 	NETSCAPE_SPKI *spki = NULL;
 	EVP_PKEY *pkey = NULL;
-	char *engine=NULL;
 
 	apps_startup();
 
 	if (!bio_err) bio_err = BIO_new_fp(stderr, BIO_NOCLOSE);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	prog=argv[0];
 	argc--;
 	argv++;
@@ -141,11 +136,6 @@ int MAIN(int argc, char **argv)
 			if (--argc < 1) goto bad;
 			spksect= *(++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,"-pubkey") == 0)
@@ -171,7 +161,6 @@ bad:
 		BIO_printf(bio_err," -noout         don't print SPKAC\n");
 		BIO_printf(bio_err," -pubkey        output public key\n");
 		BIO_printf(bio_err," -verify        verify SPKAC signature\n");
-		BIO_printf(bio_err," -engine e      use engine e, possibly a hardware device.\n");
 		goto end;
 		}
 
@@ -181,13 +170,18 @@ bad:
 		goto end;
 	}
 
-        e = setup_engine(bio_err, engine, 0);
-
 	if(keyfile) {
-		pkey = load_key(bio_err,
-				strcmp(keyfile, "-") ? keyfile : NULL,
-				FORMAT_PEM, passin, e, "private key");
+		if(strcmp(keyfile, "-")) key = BIO_new_file(keyfile, "r");
+		else key = BIO_new_fp(stdin, BIO_NOCLOSE);
+		if(!key) {
+			BIO_printf(bio_err, "Error opening key file\n");
+			ERR_print_errors(bio_err);
+			goto end;
+		}
+		pkey = PEM_read_bio_PrivateKey(key, NULL, NULL, passin);
 		if(!pkey) {
+			BIO_printf(bio_err, "Error reading private key\n");
+			ERR_print_errors(bio_err);
 			goto end;
 		}
 		spki = NETSCAPE_SPKI_new();
@@ -200,7 +194,7 @@ bad:
 		if (outfile) out = BIO_new_file(outfile, "w");
 		else {
 			out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 			{
 			    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 			    out = BIO_push(tmpbio, out);
@@ -230,16 +224,15 @@ bad:
 		goto end;
 	}
 
-	conf = NCONF_new(NULL);
-	i = NCONF_load_bio(conf, in, NULL);
+	conf = CONF_load_bio(NULL, in, NULL);
 
-	if(!i) {
+	if(!conf) {
 		BIO_printf(bio_err, "Error parsing config file\n");
 		ERR_print_errors(bio_err);
 		goto end;
 	}
 
-	spkstr = NCONF_get_string(conf, spksect, spkac);
+	spkstr = CONF_get_string(conf, spksect, spkac);
 		
 	if(!spkstr) {
 		BIO_printf(bio_err, "Can't find SPKAC called \"%s\"\n", spkac);
@@ -258,7 +251,7 @@ bad:
 	if (outfile) out = BIO_new_file(outfile, "w");
 	else {
 		out = BIO_new_fp(stdout, BIO_NOCLOSE);
-#ifdef OPENSSL_SYS_VMS
+#ifdef VMS
 		{
 		    BIO *tmpbio = BIO_new(BIO_f_linebuffer());
 		    out = BIO_push(tmpbio, out);
@@ -288,12 +281,12 @@ bad:
 	ret = 0;
 
 end:
-	NCONF_free(conf);
+	CONF_free(conf);
 	NETSCAPE_SPKI_free(spki);
 	BIO_free(in);
 	BIO_free_all(out);
+	BIO_free(key);
 	EVP_PKEY_free(pkey);
 	if(passin) OPENSSL_free(passin);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}

apps/term_sock.c

@@ -1,581 +0,0 @@
-#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

apps/term_sock.h

@@ -1,21 +0,0 @@
-#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

apps/testdsa.h

@@ -3,18 +3,6 @@
 DSA *get_dsa512(void );
 DSA *get_dsa1024(void );
 DSA *get_dsa2048(void );
-static unsigned char dsa512_priv[] = {
-	0x65,0xe5,0xc7,0x38,0x60,0x24,0xb5,0x89,0xd4,0x9c,0xeb,0x4c,
-	0x9c,0x1d,0x7a,0x22,0xbd,0xd1,0xc2,0xd2,
-	};
-static unsigned char dsa512_pub[] = {
-	0x00,0x95,0xa7,0x0d,0xec,0x93,0x68,0xba,0x5f,0xf7,0x5f,0x07,
-	0xf2,0x3b,0xad,0x6b,0x01,0xdc,0xbe,0xec,0xde,0x04,0x7a,0x3a,
-	0x27,0xb3,0xec,0x49,0xfd,0x08,0x43,0x3d,0x7e,0xa8,0x2c,0x5e,
-	0x7b,0xbb,0xfc,0xf4,0x6e,0xeb,0x6c,0xb0,0x6e,0xf8,0x02,0x12,
-	0x8c,0x38,0x5d,0x83,0x56,0x7d,0xee,0x53,0x05,0x3e,0x24,0x84,
-	0xbe,0xba,0x0a,0x6b,0xc8,
-	};
 static unsigned char dsa512_p[]={
 	0x9D,0x1B,0x69,0x8E,0x26,0xDB,0xF2,0x2B,0x11,0x70,0x19,0x86,
 	0xF6,0x19,0xC8,0xF8,0x19,0xF2,0x18,0x53,0x94,0x46,0x06,0xD0,
@@ -41,34 +29,14 @@ DSA *get_dsa512()
 	DSA *dsa;
 
 	if ((dsa=DSA_new()) == NULL) return(NULL);
-	dsa->priv_key=BN_bin2bn(dsa512_priv,sizeof(dsa512_priv),NULL);
-	dsa->pub_key=BN_bin2bn(dsa512_pub,sizeof(dsa512_pub),NULL);
 	dsa->p=BN_bin2bn(dsa512_p,sizeof(dsa512_p),NULL);
 	dsa->q=BN_bin2bn(dsa512_q,sizeof(dsa512_q),NULL);
 	dsa->g=BN_bin2bn(dsa512_g,sizeof(dsa512_g),NULL);
-	if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL) ||
-				(dsa->q == NULL) || (dsa->g == NULL))
+	if ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))
 		return(NULL);
 	return(dsa);
 	}
 
-static unsigned char dsa1024_priv[]={
-	0x7d,0x21,0xda,0xbb,0x62,0x15,0x47,0x36,0x07,0x67,0x12,0xe8,
-	0x8c,0xaa,0x1c,0xcd,0x38,0x12,0x61,0x18,
-	};
-static unsigned char dsa1024_pub[]={
-	0x3c,0x4e,0x9c,0x2a,0x7f,0x16,0xc1,0x25,0xeb,0xac,0x78,0x63,
-	0x90,0x14,0x8c,0x8b,0xf4,0x68,0x43,0x3c,0x2d,0xee,0x65,0x50,
-	0x7d,0x9c,0x8f,0x8c,0x8a,0x51,0xd6,0x11,0x2b,0x99,0xaf,0x1e,
-	0x90,0x97,0xb5,0xd3,0xa6,0x20,0x25,0xd6,0xfe,0x43,0x02,0xd5,
-	0x91,0x7d,0xa7,0x8c,0xdb,0xc9,0x85,0xa3,0x36,0x48,0xf7,0x68,
-	0xaa,0x60,0xb1,0xf7,0x05,0x68,0x3a,0xa3,0x3f,0xd3,0x19,0x82,
-	0xd8,0x82,0x7a,0x77,0xfb,0xef,0xf4,0x15,0x0a,0xeb,0x06,0x04,
-	0x7f,0x53,0x07,0x0c,0xbc,0xcb,0x2d,0x83,0xdb,0x3e,0xd1,0x28,
-	0xa5,0xa1,0x31,0xe0,0x67,0xfa,0x50,0xde,0x9b,0x07,0x83,0x7e,
-	0x2c,0x0b,0xc3,0x13,0x50,0x61,0xe5,0xad,0xbd,0x36,0xb8,0x97,
-	0x4e,0x40,0x7d,0xe8,0x83,0x0d,0xbc,0x4b
-	};
 static unsigned char dsa1024_p[]={
 	0xA7,0x3F,0x6E,0x85,0xBF,0x41,0x6A,0x29,0x7D,0xF0,0x9F,0x47,
 	0x19,0x30,0x90,0x9A,0x09,0x1D,0xDA,0x6A,0x33,0x1E,0xC5,0x3D,
@@ -105,45 +73,14 @@ DSA *get_dsa1024()
 	DSA *dsa;
 
 	if ((dsa=DSA_new()) == NULL) return(NULL);
-	dsa->priv_key=BN_bin2bn(dsa1024_priv,sizeof(dsa1024_priv),NULL);
-	dsa->pub_key=BN_bin2bn(dsa1024_pub,sizeof(dsa1024_pub),NULL);
 	dsa->p=BN_bin2bn(dsa1024_p,sizeof(dsa1024_p),NULL);
 	dsa->q=BN_bin2bn(dsa1024_q,sizeof(dsa1024_q),NULL);
 	dsa->g=BN_bin2bn(dsa1024_g,sizeof(dsa1024_g),NULL);
-	if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL) ||
-				(dsa->q == NULL) || (dsa->g == NULL))
+	if ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))
 		return(NULL);
 	return(dsa);
 	}
 
-static unsigned char dsa2048_priv[]={
-	0x32,0x67,0x92,0xf6,0xc4,0xe2,0xe2,0xe8,0xa0,0x8b,0x6b,0x45,
-	0x0c,0x8a,0x76,0xb0,0xee,0xcf,0x91,0xa7,
-	};
-static unsigned char dsa2048_pub[]={
-	0x17,0x8f,0xa8,0x11,0x84,0x92,0xec,0x83,0x47,0xc7,0x6a,0xb0,
-	0x92,0xaf,0x5a,0x20,0x37,0xa3,0x64,0x79,0xd2,0xd0,0x3d,0xcd,
-	0xe0,0x61,0x88,0x88,0x21,0xcc,0x74,0x5d,0xce,0x4c,0x51,0x47,
-	0xf0,0xc5,0x5c,0x4c,0x82,0x7a,0xaf,0x72,0xad,0xb9,0xe0,0x53,
-	0xf2,0x78,0xb7,0xf0,0xb5,0x48,0x7f,0x8a,0x3a,0x18,0xd1,0x9f,
-	0x8b,0x7d,0xa5,0x47,0xb7,0x95,0xab,0x98,0xf8,0x7b,0x74,0x50,
-	0x56,0x8e,0x57,0xf0,0xee,0xf5,0xb7,0xba,0xab,0x85,0x86,0xf9,
-	0x2b,0xef,0x41,0x56,0xa0,0xa4,0x9f,0xb7,0x38,0x00,0x46,0x0a,
-	0xa6,0xf1,0xfc,0x1f,0xd8,0x4e,0x85,0x44,0x92,0x43,0x21,0x5d,
-	0x6e,0xcc,0xc2,0xcb,0x26,0x31,0x0d,0x21,0xc4,0xbd,0x8d,0x24,
-	0xbc,0xd9,0x18,0x19,0xd7,0xdc,0xf1,0xe7,0x93,0x50,0x48,0x03,
-	0x2c,0xae,0x2e,0xe7,0x49,0x88,0x5f,0x93,0x57,0x27,0x99,0x36,
-	0xb4,0x20,0xab,0xfc,0xa7,0x2b,0xf2,0xd9,0x98,0xd7,0xd4,0x34,
-	0x9d,0x96,0x50,0x58,0x9a,0xea,0x54,0xf3,0xee,0xf5,0x63,0x14,
-	0xee,0x85,0x83,0x74,0x76,0xe1,0x52,0x95,0xc3,0xf7,0xeb,0x04,
-	0x04,0x7b,0xa7,0x28,0x1b,0xcc,0xea,0x4a,0x4e,0x84,0xda,0xd8,
-	0x9c,0x79,0xd8,0x9b,0x66,0x89,0x2f,0xcf,0xac,0xd7,0x79,0xf9,
-	0xa9,0xd8,0x45,0x13,0x78,0xb9,0x00,0x14,0xc9,0x7e,0x22,0x51,
-	0x86,0x67,0xb0,0x9f,0x26,0x11,0x23,0xc8,0x38,0xd7,0x70,0x1d,
-	0x15,0x8e,0x4d,0x4f,0x95,0x97,0x40,0xa1,0xc2,0x7e,0x01,0x18,
-	0x72,0xf4,0x10,0xe6,0x8d,0x52,0x16,0x7f,0xf2,0xc9,0xf8,0x33,
-	0x8b,0x33,0xb7,0xce,
-	};
 static unsigned char dsa2048_p[]={
 	0xA0,0x25,0xFA,0xAD,0xF4,0x8E,0xB9,0xE5,0x99,0xF3,0x5D,0x6F,
 	0x4F,0x83,0x34,0xE2,0x7E,0xCF,0x6F,0xBF,0x30,0xAF,0x6F,0x81,
@@ -202,13 +139,10 @@ DSA *get_dsa2048()
 	DSA *dsa;
  
 	if ((dsa=DSA_new()) == NULL) return(NULL);
-	dsa->priv_key=BN_bin2bn(dsa2048_priv,sizeof(dsa2048_priv),NULL);
-	dsa->pub_key=BN_bin2bn(dsa2048_pub,sizeof(dsa2048_pub),NULL);
 	dsa->p=BN_bin2bn(dsa2048_p,sizeof(dsa2048_p),NULL);
 	dsa->q=BN_bin2bn(dsa2048_q,sizeof(dsa2048_q),NULL);
 	dsa->g=BN_bin2bn(dsa2048_g,sizeof(dsa2048_g),NULL);
-	if ((dsa->priv_key == NULL) || (dsa->pub_key == NULL) || (dsa->p == NULL) ||
-				(dsa->q == NULL) || (dsa->g == NULL))
+	if ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))
 		return(NULL);
 	return(dsa);
 	}

apps/verify.c

@@ -70,15 +70,14 @@
 #define PROG	verify_main
 
 static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx);
-static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose, ENGINE *e);
+static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose);
 static STACK_OF(X509) *load_untrusted(char *file);
-static int v_verbose=0, vflags = 0;
+static int v_verbose=0, issuer_checks = 0;
 
 int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
 	{
-	ENGINE *e = NULL;
 	int i,ret=1;
 	int purpose = -1;
 	char *CApath=NULL,*CAfile=NULL;
@@ -86,7 +85,6 @@ int MAIN(int argc, char **argv)
 	STACK_OF(X509) *untrusted = NULL, *trusted = NULL;
 	X509_STORE *cert_ctx=NULL;
 	X509_LOOKUP *lookup=NULL;
-	char *engine=NULL;
 
 	cert_ctx=X509_STORE_new();
 	if (cert_ctx == NULL) goto end;
@@ -100,9 +98,6 @@ int MAIN(int argc, char **argv)
 		if ((bio_err=BIO_new(BIO_s_file())) != NULL)
 			BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
-	if (!load_config(bio_err, NULL))
-		goto end;
-
 	argc--;
 	argv++;
 	for (;;)
@@ -142,21 +137,10 @@ int MAIN(int argc, char **argv)
 				if (argc-- < 1) goto end;
 				trustfile= *(++argv);
 				}
-			else if (strcmp(*argv,"-engine") == 0)
-				{
-				if (--argc < 1) goto end;
-				engine= *(++argv);
-				}
 			else if (strcmp(*argv,"-help") == 0)
 				goto end;
-			else if (strcmp(*argv,"-ignore_critical") == 0)
-				vflags |= X509_V_FLAG_IGNORE_CRITICAL;
 			else if (strcmp(*argv,"-issuer_checks") == 0)
-				vflags |= X509_V_FLAG_CB_ISSUER_CHECK;
-			else if (strcmp(*argv,"-crl_check") == 0)
-				vflags |= X509_V_FLAG_CRL_CHECK;
-			else if (strcmp(*argv,"-crl_check_all") == 0)
-				vflags |= X509_V_FLAG_CRL_CHECK|X509_V_FLAG_CRL_CHECK_ALL;
+				issuer_checks=1;
 			else if (strcmp(*argv,"-verbose") == 0)
 				v_verbose=1;
 			else if (argv[0][0] == '-')
@@ -170,8 +154,6 @@ int MAIN(int argc, char **argv)
 			break;
 		}
 
-        e = setup_engine(bio_err, engine, 0);
-
 	lookup=X509_STORE_add_lookup(cert_ctx,X509_LOOKUP_file());
 	if (lookup == NULL) abort();
 	if (CAfile) {
@@ -212,14 +194,14 @@ int MAIN(int argc, char **argv)
 		}
 	}
 
-	if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, purpose, e);
+	if (argc < 1) check(cert_ctx, NULL, untrusted, trusted, purpose);
 	else
 		for (i=0; i<argc; i++)
-			check(cert_ctx,argv[i], untrusted, trusted, purpose, e);
+			check(cert_ctx,argv[i], untrusted, trusted, purpose);
 	ret=0;
 end:
 	if (ret == 1) {
-		BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] [-crl_check] [-engine e] cert1 cert2 ...\n");
+		BIO_printf(bio_err,"usage: verify [-verbose] [-CApath path] [-CAfile file] [-purpose purpose] cert1 cert2 ...\n");
 		BIO_printf(bio_err,"recognized usages:\n");
 		for(i = 0; i < X509_PURPOSE_get_count(); i++) {
 			X509_PURPOSE *ptmp;
@@ -231,19 +213,42 @@ end:
 	if (cert_ctx != NULL) X509_STORE_free(cert_ctx);
 	sk_X509_pop_free(untrusted, X509_free);
 	sk_X509_pop_free(trusted, X509_free);
-	apps_shutdown();
-	EXIT(ret);
+	OPENSSL_EXIT(ret);
 	}
 
-static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose, ENGINE *e)
+static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X509) *tchain, int purpose)
 	{
 	X509 *x=NULL;
+	BIO *in=NULL;
 	int i=0,ret=0;
 	X509_STORE_CTX *csc;
 
-	x = load_cert(bio_err, file, FORMAT_PEM, NULL, e, "certificate file");
-	if (x == NULL)
+	in=BIO_new(BIO_s_file());
+	if (in == NULL)
+		{
+		ERR_print_errors(bio_err);
 		goto end;
+		}
+
+	if (file == NULL)
+		BIO_set_fp(in,stdin,BIO_NOCLOSE);
+	else
+		{
+		if (BIO_read_filename(in,file) <= 0)
+			{
+			perror(file);
+			goto end;
+			}
+		}
+
+	x=PEM_read_bio_X509(in,NULL,NULL,NULL);
+	if (x == NULL)
+		{
+		fprintf(stdout,"%s: unable to load certificate file\n",
+			(file == NULL)?"stdin":file);
+		ERR_print_errors(bio_err);
+		goto end;
+		}
 	fprintf(stdout,"%s: ",(file == NULL)?"stdin":file);
 
 	csc = X509_STORE_CTX_new();
@@ -252,14 +257,11 @@ static int check(X509_STORE *ctx, char *file, STACK_OF(X509) *uchain, STACK_OF(X
 		ERR_print_errors(bio_err);
 		goto end;
 		}
-	X509_STORE_set_flags(ctx, vflags);
-	if(!X509_STORE_CTX_init(csc,ctx,x,uchain))
-		{
-		ERR_print_errors(bio_err);
-		goto end;
-		}
+	X509_STORE_CTX_init(csc,ctx,x,uchain);
 	if(tchain) X509_STORE_CTX_trusted_stack(csc, tchain);
 	if(purpose >= 0) X509_STORE_CTX_set_purpose(csc, purpose);
+	if(issuer_checks)
+		X509_STORE_CTX_set_flags(csc, X509_V_FLAG_CB_ISSUER_CHECK);
 	i=X509_verify_cert(csc);
 	X509_STORE_CTX_free(csc);
 
@@ -273,6 +275,7 @@ end:
 	else
 		ERR_print_errors(bio_err);
 	if (x != NULL) X509_free(x);
+	if (in != NULL) BIO_free(in);
 
 	return(ret);
 	}
@@ -346,9 +349,6 @@ static int MS_CALLBACK cb(int ok, X509_STORE_CTX *ctx)
 		if (ctx->error == X509_V_ERR_PATH_LENGTH_EXCEEDED) ok=1;
 		if (ctx->error == X509_V_ERR_INVALID_PURPOSE) ok=1;
 		if (ctx->error == X509_V_ERR_DEPTH_ZERO_SELF_SIGNED_CERT) ok=1;
-		if (ctx->error == X509_V_ERR_CRL_HAS_EXPIRED) ok=1;
-		if (ctx->error == X509_V_ERR_CRL_NOT_YET_VALID) ok=1;
-		if (ctx->error == X509_V_ERR_UNHANDLED_CRITICAL_EXTENSION) ok=1;
 		}
 	if (!v_verbose)
 		ERR_clear_error();