Integrate engine in most utilities. Now really tested yet. (ab130644) · Commits · CYBER - Cyber Security / TS 103 523 MSP / TLMSP / TLMSP OpenSSL

apps/ca.c

+27 −0

Original line number	Diff line number	Diff line
		@@ -74,6 +74,7 @@
		#include <openssl/x509v3.h>
		#include <openssl/objects.h>
		#include <openssl/pem.h>
		#include <openssl/engine.h>

		#ifndef W_OK
		# ifdef VMS
		@@ -167,6 +168,7 @@ static char *ca_usage[]={
		" -revoke file - Revoke a certificate (given in file)\n",
		" -extensions .. - Extension section (override value in config file)\n",
		" -crlexts .. - CRL extension section (override value in config file)\n",
		" -engine e - use engine e, possibly a hardware device.\n",
		NULL
		};

		@@ -216,6 +218,7 @@ int MAIN(int, char **);

		int MAIN(int argc, char **argv)
		{
		ENGINE *e = NULL;
		char key=NULL,passargin=NULL;
		int total=0;
		int total_done=0;
		@@ -268,6 +271,7 @@ int MAIN(int argc, char **argv)
		#define BSIZE 256
		MS_STATIC char buf[3][BSIZE];
		char *randfile=NULL;
		char *engine = NULL;

		#ifdef EFENCE
		EF_PROTECT_FREE=1;
		@@ -419,6 +423,11 @@ EF_ALIGNMENT=0;
		if (--argc < 1) goto bad;
		crl_ext= *(++argv);
		}
		else if (strcmp(*argv,"-engine") == 0)
		{
		if (--argc < 1) goto bad;
		engine= *(++argv);
		}
		else
		{
		bad:
		@@ -439,6 +448,24 @@ bad:

		ERR_load_crypto_strings();

		if (engine != NULL)
		{
		if((e = ENGINE_by_id(engine)) == NULL)
		{
		BIO_printf(bio_err,"invalid engine \"%s\"\n",
		engine);
		goto err;
		}
		if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
		{
		BIO_printf(bio_err,"can't use that engine\n");
		goto err;
		}
		BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
		/* Free our "structural" reference. */
		ENGINE_free(e);
		}

		/*****************************************************************/
		if (configfile == NULL) configfile = getenv("OPENSSL_CONF");
		if (configfile == NULL) configfile = getenv("SSLEAY_CONF");

apps/dgst.c

+27 −0

Original line number	Diff line number	Diff line
		@@ -66,6 +66,7 @@
		#include <openssl/objects.h>
		#include <openssl/x509.h>
		#include <openssl/pem.h>
		#include <openssl/engine.h>

		#undef BUFSIZE
		#define BUFSIZE 1024*8
		@@ -80,6 +81,7 @@ 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;
		@@ -97,6 +99,7 @@ int MAIN(int argc, char **argv)
		EVP_PKEY *sigkey = NULL;
		unsigned char *sigbuf = NULL;
		unsigned int siglen = 0;
		char *engine=NULL;

		apps_startup();

		@@ -154,6 +157,11 @@ int MAIN(int argc, char **argv)
		if (--argc < 1) break;
		sigfile=*(++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)
		@@ -190,6 +198,7 @@ int MAIN(int argc, char **argv)
		BIO_printf(bio_err,"-prverify file verify a signature using private key in file\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);
		@@ -209,6 +218,24 @@ int MAIN(int argc, char **argv)
		goto end;
		}

		if (engine != NULL)
		{
		if((e = ENGINE_by_id(engine)) == NULL)
		{
		BIO_printf(bio_err,"invalid engine \"%s\"\n",
		engine);
		goto end;
		}
		if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
		{
		BIO_printf(bio_err,"can't use that engine\n");
		goto end;
		}
		BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
		/* Free our "structural" reference. */
		ENGINE_free(e);
		}

		in=BIO_new(BIO_s_file());
		bmd=BIO_new(BIO_f_md());
		if (debug)

apps/dh.c

+28 −1

Original line number	Diff line number	Diff line
		@@ -69,6 +69,7 @@
		#include <openssl/dh.h>
		#include <openssl/x509.h>
		#include <openssl/pem.h>
		#include <openssl/engine.h>

		#undef PROG
		#define PROG dh_main
		@@ -87,11 +88,12 @@ int MAIN(int, char **);

		int MAIN(int argc, char **argv)
		{
		ENGINE *e = NULL;
		DH *dh=NULL;
		int i,badops=0,text=0;
		BIO in=NULL,out=NULL;
		int informat,outformat,check=0,noout=0,C=0,ret=1;
		char infile,outfile,*prog;
		char infile,outfile,prog,engine;

		apps_startup();

		@@ -99,6 +101,7 @@ 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);

		engine=NULL;
		infile=NULL;
		outfile=NULL;
		informat=FORMAT_PEM;
		@@ -129,6 +132,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)
		@@ -160,11 +168,30 @@ 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();

		if (engine != NULL)
		{
		if((e = ENGINE_by_id(engine)) == NULL)
		{
		BIO_printf(bio_err,"invalid engine \"%s\"\n",
		engine);
		goto end;
		}
		if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
		{
		BIO_printf(bio_err,"can't use that engine\n");
		goto end;
		}
		BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
		/* Free our "structural" reference. */
		ENGINE_free(e);
		}

		in=BIO_new(BIO_s_file());
		out=BIO_new(BIO_s_file());
		if ((in == NULL) \|\| (out == NULL))

apps/dhparam.c

+27 −1

Original line number	Diff line number	Diff line
		@@ -121,6 +121,7 @@
		#include <openssl/dh.h>
		#include <openssl/x509.h>
		#include <openssl/pem.h>
		#include <openssl/engine.h>

		#ifndef NO_DSA
		#include <openssl/dsa.h>
		@@ -148,6 +149,7 @@ int MAIN(int, char **);

		int MAIN(int argc, char **argv)
		{
		ENGINE *e = NULL;
		DH *dh=NULL;
		int i,badops=0,text=0;
		#ifndef NO_DSA
		@@ -156,7 +158,7 @@ int MAIN(int argc, char **argv)
		BIO in=NULL,out=NULL;
		int informat,outformat,check=0,noout=0,C=0,ret=1;
		char infile,outfile,*prog;
		char *inrand=NULL;
		char inrand=NULL,engine=NULL;
		int num = 0, g = 0;

		apps_startup();
		@@ -195,6 +197,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)
		@@ -240,6 +247,7 @@ 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");
		@@ -249,6 +257,24 @@ bad:

		ERR_load_crypto_strings();

		if (engine != NULL)
		{
		if((e = ENGINE_by_id(engine)) == NULL)
		{
		BIO_printf(bio_err,"invalid engine \"%s\"\n",
		engine);
		goto end;
		}
		if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
		{
		BIO_printf(bio_err,"can't use that engine\n");
		goto end;
		}
		BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
		/* Free our "structural" reference. */
		ENGINE_free(e);
		}

		if (g && !num)
		num = DEFBITS;

apps/dsa.c

+28 −1

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@
		#include <openssl/evp.h>
		#include <openssl/x509.h>
		#include <openssl/pem.h>
		#include <openssl/engine.h>

		#undef PROG
		#define PROG dsa_main
		@@ -87,6 +88,7 @@ int MAIN(int, char **);

		int MAIN(int argc, char **argv)
		{
		ENGINE *e = NULL;
		int ret=1;
		DSA *dsa=NULL;
		int i,badops=0;
		@@ -94,7 +96,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;
		char infile,outfile,prog,engine;
		char passargin = NULL, passargout = NULL;
		char passin = NULL, passout = NULL;
		int modulus=0;
		@@ -105,6 +107,7 @@ 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);

		engine=NULL;
		infile=NULL;
		outfile=NULL;
		informat=FORMAT_PEM;
		@@ -145,6 +148,11 @@ 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)
		@@ -176,6 +184,7 @@ bad:
		BIO_printf(bio_err," -passin arg input file pass phrase source\n");
		BIO_printf(bio_err," -out arg output file\n");
		BIO_printf(bio_err," -passout arg output file pass phrase source\n");
		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 NO_IDEA
		@@ -189,6 +198,24 @@ bad:

		ERR_load_crypto_strings();

		if (engine != NULL)
		{
		if((e = ENGINE_by_id(engine)) == NULL)
		{
		BIO_printf(bio_err,"invalid engine \"%s\"\n",
		engine);
		goto end;
		}
		if(!ENGINE_set_default(e, ENGINE_METHOD_ALL))
		{
		BIO_printf(bio_err,"can't use that engine\n");
		goto end;
		}
		BIO_printf(bio_err,"engine \"%s\" set.\n", engine);
		/* Free our "structural" reference. */
		ENGINE_free(e);
		}

		if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
		BIO_printf(bio_err, "Error getting passwords\n");
		goto end;