Add generationQualifier OID (proposed by Fiel Cabral).

[openssl.git] / apps / ecdsa.c

diff --git a/apps/ecdsa.c b/apps/ecdsa.c
index e8aa7461b4900c0717be6f5a00cd2d0311d0a2e8..8f15ee2f12d5d3fcfdfe5a2d823d141d311abaf0 100644 (file)
--- a/apps/ecdsa.c
+++ b/apps/ecdsa.c
@@ -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 )   
@@ -174,6 +177,9 @@ 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;
@@ -227,12 +233,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 +276,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");