Initial experimental TLSv1.1 support

[openssl.git] / apps / dsa.c

diff --git a/apps/dsa.c b/apps/dsa.c
index 290f597b582f3b3d84623f96c43e90ece26bfb17..1109346f78c7672e4d2ef54b68e35975f5975314 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -84,6 +84,10 @@
  * -aes128     - encrypt output if PEM format
  * -aes192     - encrypt output if PEM format
  * -aes256     - encrypt output if PEM format
  * -aes128     - encrypt output if PEM format
  * -aes192     - encrypt output if PEM format
  * -aes256     - encrypt output if PEM format

+ * -camellia128 - encrypt output if PEM format
+ * -camellia192 - encrypt output if PEM format
+ * -camellia256 - encrypt output if PEM format
+ * -seed        - encrypt output if PEM format

  * -text       - print a text version
  * -modulus    - print the DSA public key
  */
  * -text       - print a text version
  * -modulus    - print the DSA public key
  */


@@ -92,9 +96,7 @@ int MAIN(int, char **);
 
 int MAIN(int argc, char **argv)
        {
 
 int MAIN(int argc, char **argv)
        {

-#ifndef OPENSSL_NO_ENGINE

        ENGINE *e = NULL;
        ENGINE *e = NULL;

-#endif

        int ret=1;
        DSA *dsa=NULL;
        int i,badops=0;
        int ret=1;
        DSA *dsa=NULL;
        int i,badops=0;


@@ -110,6 +112,8 @@ int MAIN(int argc, char **argv)
        char *passin = NULL, *passout = NULL;
        int modulus=0;
 
        char *passin = NULL, *passout = NULL;
        int modulus=0;
 

+       int pvk_encr = 2;
+

        apps_startup();
 
        if (bio_err == NULL)
        apps_startup();
 
        if (bio_err == NULL)


@@ -169,6 +173,12 @@ int MAIN(int argc, char **argv)
                        engine= *(++argv);
                        }
 #endif
                        engine= *(++argv);
                        }
 #endif

+               else if (strcmp(*argv,"-pvk-strong") == 0)
+                       pvk_encr=2;
+               else if (strcmp(*argv,"-pvk-weak") == 0)
+                       pvk_encr=1;
+               else if (strcmp(*argv,"-pvk-none") == 0)
+                       pvk_encr=0;

                else if (strcmp(*argv,"-noout") == 0)
                        noout=1;
                else if (strcmp(*argv,"-text") == 0)
                else if (strcmp(*argv,"-noout") == 0)
                        noout=1;
                else if (strcmp(*argv,"-text") == 0)


@@ -211,6 +221,13 @@ bad:
 #ifndef OPENSSL_NO_AES
                BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
                BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");
 #ifndef OPENSSL_NO_AES
                BIO_printf(bio_err," -aes128, -aes192, -aes256\n");
                BIO_printf(bio_err,"                 encrypt PEM output with cbc aes\n");

+#endif
+#ifndef OPENSSL_NO_CAMELLIA
+               BIO_printf(bio_err," -camellia128, -camellia192, -camellia256\n");
+               BIO_printf(bio_err,"                 encrypt PEM output with cbc camellia\n");
+#endif
+#ifndef OPENSSL_NO_SEED
+               BIO_printf(bio_err," -seed           encrypt PEM output with cbc seed\n");

 #endif
                BIO_printf(bio_err," -text           print the key in text\n");
                BIO_printf(bio_err," -noout          don't print key out\n");
 #endif
                BIO_printf(bio_err," -text           print the key in text\n");
                BIO_printf(bio_err," -noout          don't print key out\n");


@@ -317,20 +334,24 @@ bad:
                        i=PEM_write_bio_DSA_PUBKEY(out,dsa);
                else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
                                                        NULL,0,NULL, passout);
                        i=PEM_write_bio_DSA_PUBKEY(out,dsa);
                else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
                                                        NULL,0,NULL, passout);

-       } else if (outformat == FORMAT_MSBLOB) {
+#ifndef OPENSSL_NO_RSA
+       } else if (outformat == FORMAT_MSBLOB || outformat == FORMAT_PVK) {

                EVP_PKEY *pk;
                pk = EVP_PKEY_new();
                EVP_PKEY_set1_DSA(pk, dsa);
                EVP_PKEY *pk;
                pk = EVP_PKEY_new();
                EVP_PKEY_set1_DSA(pk, dsa);

-               if (pubin || pubout)
+               if (outformat == FORMAT_PVK)
+                       i = i2b_PVK_bio(out, pk, pvk_encr, 0, passout);
+               else if (pubin || pubout)

                        i = i2b_PublicKey_bio(out, pk);
                else
                        i = i2b_PrivateKey_bio(out, pk);
                EVP_PKEY_free(pk);
                        i = i2b_PublicKey_bio(out, pk);
                else
                        i = i2b_PrivateKey_bio(out, pk);
                EVP_PKEY_free(pk);

+#endif

        } else {
                BIO_printf(bio_err,"bad output format specified for outfile\n");
                goto end;
                }
        } else {
                BIO_printf(bio_err,"bad output format specified for outfile\n");
                goto end;
                }

-       if (!i)
+       if (i <= 0)

                {
                BIO_printf(bio_err,"unable to write private key\n");
                ERR_print_errors(bio_err);
                {
                BIO_printf(bio_err,"unable to write private key\n");
                ERR_print_errors(bio_err);


@@ -346,4 +367,10 @@ end:
        apps_shutdown();
        OPENSSL_EXIT(ret);
        }
        apps_shutdown();
        OPENSSL_EXIT(ret);
        }

+#else /* !OPENSSL_NO_DSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+

 #endif
 #endif