Fix typos in wp-mmx.pl.

[openssl.git] / apps / dsa.c

diff --git a/apps/dsa.c b/apps/dsa.c
index a5ec5d7e6c1cd966e34f10305b07474c33d60db2..091f936571d9f2f703872b9f72b7e00046c5a5bc 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -110,6 +110,8 @@ int MAIN(int argc, char **argv)
        char *passin = NULL, *passout = NULL;
        int modulus=0;
 
+       int pvk_encr = 2;
+
        apps_startup();
 
        if (bio_err == NULL)
@@ -169,6 +171,12 @@ int MAIN(int argc, char **argv)
                        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)
@@ -249,16 +257,22 @@ bad:
                }
 
        BIO_printf(bio_err,"read DSA key\n");
-       if      (informat == FORMAT_ASN1) {
-               if(pubin) dsa=d2i_DSA_PUBKEY_bio(in,NULL);
-               else dsa=d2i_DSAPrivateKey_bio(in,NULL);
-       } else if (informat == FORMAT_PEM) {
-               if(pubin) dsa=PEM_read_bio_DSA_PUBKEY(in,NULL, NULL, NULL);
-               else dsa=PEM_read_bio_DSAPrivateKey(in,NULL,NULL,passin);
-       } else
+
                {
-               BIO_printf(bio_err,"bad input format specified for key\n");
-               goto end;
+               EVP_PKEY        *pkey;
+
+               if (pubin)
+                       pkey = load_pubkey(bio_err, infile, informat, 1,
+                               passin, e, "Public Key");
+               else
+                       pkey = load_key(bio_err, infile, informat, 1,
+                               passin, e, "Private Key");
+
+               if (pkey)
+                       {
+                       dsa = EVP_PKEY_get1_DSA(pkey);
+                       EVP_PKEY_free(pkey);
+                       }
                }
        if (dsa == NULL)
                {
@@ -311,6 +325,17 @@ bad:
                        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 || outformat == FORMAT_PVK) {
+               EVP_PKEY *pk;
+               pk = EVP_PKEY_new();
+               EVP_PKEY_set1_DSA(pk, dsa);
+               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);
        } else {
                BIO_printf(bio_err,"bad output format specified for outfile\n");
                goto end;