Commit b3dfaaa1 authored by Richard Levitte's avatar Richard Levitte
Browse files

Add AES support in the applications that support -des and -des3.

parent 5b7848a3

STATUS

+1 −4
Original line number Diff line number Diff line 


  OpenSSL STATUS                           Last modified at

  ______________                           $Date: 2002/02/20 14:07:07 $

  ______________                           $Date: 2002/02/20 18:03:00 $



  DEVELOPMENT STATE
@@ -61,9 +61,6 @@ 
       weakness in SSL/TLS should be added; see

       http://www.openssl.org/~bodo/tls-cbc.txt



    o  All 'openssl' subprograms taking '-des' and '-des3' options should

       include AES support (0.9.7-dev)



    o  'openssl speed' should include AES support (0.9.7-dev)



    o  apps/ca.c: "Sign the certificate?" - "n" creates empty certificate file

apps/dsa.c

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,9 @@ 
 * -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

 */
@@ -188,6 +191,10 @@ bad: 
		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");

apps/ecdsa.c

+11 −4
Original line number Diff line number Diff line
@@ -132,6 +132,9 @@ 
 * -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 )
@@ -227,12 +230,12 @@ int MAIN(int argc, char **argv) 
		else if (strcmp(*argv, "-pub") == 0)

		{

			pub = 1;

			buffer = (*(argv+1));

			if (strcmp(buffer, "compressed") == 0)

			buffer = (unsigned char *)(*(argv+1));

			if (strcmp((char *)buffer, "compressed") == 0)

				point_form = POINT_CONVERSION_COMPRESSED;

			else if (strcmp(buffer, "hybrid") == 0)

			else if (strcmp((char *)buffer, "hybrid") == 0)

				point_form = POINT_CONVERSION_HYBRID;

			else if (strcmp(buffer, "uncompressed") == 0)

			else if (strcmp((char *)buffer, "uncompressed") == 0)

				point_form = POINT_CONVERSION_UNCOMPRESSED;

			if (point_form)

			{
@@ -270,6 +273,10 @@ bad: 
		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");

apps/gendsa.c

+12 −0
Original line number Diff line number Diff line
@@ -129,6 +129,14 @@ int MAIN(int argc, char **argv) 
#ifndef OPENSSL_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)

			{
@@ -151,6 +159,10 @@ bad: 
#endif

#ifndef OPENSSL_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);

apps/genrsa.c

+12 −0
Original line number Diff line number Diff line
@@ -138,6 +138,14 @@ int MAIN(int argc, char **argv) 
#ifndef OPENSSL_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)

			{
@@ -157,6 +165,10 @@ bad: 
		BIO_printf(bio_err," -des3           encrypt the generated key with DES in ede cbc mode (168 bit key)\n");

#ifndef OPENSSL_NO_IDEA

		BIO_printf(bio_err," -idea           encrypt the generated key with IDEA in cbc mode\n");

#endif

#ifndef OPENSSL_NO_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");