Make sure that all test files are gone before starting the tests, or

[openssl.git] / apps / dsa.c

diff --git a/apps/dsa.c b/apps/dsa.c
index 229f2ea24664661c4196420fff73ef396743185b..4977671b8adc125a93052a346669737916e0ccea 100644 (file)
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -83,6 +83,8 @@
  * -modulus    - print the DSA public key
  */
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int ret=1;
@@ -93,6 +95,8 @@ int MAIN(int argc, char **argv)
        int informat,outformat,text=0,noout=0;
        int pubin = 0, pubout = 0;
        char *infile,*outfile,*prog;
+       char *passargin = NULL, *passargout = NULL;
+       char *passin = NULL, *passout = NULL;
        int modulus=0;
 
        apps_startup();
@@ -131,6 +135,16 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        outfile= *(++argv);
                        }
+               else if (strcmp(*argv,"-passin") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       passargin= *(++argv);
+                       }
+               else if (strcmp(*argv,"-passout") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       passargout= *(++argv);
+                       }
                else if (strcmp(*argv,"-noout") == 0)
                        noout=1;
                else if (strcmp(*argv,"-text") == 0)
@@ -156,23 +170,30 @@ int MAIN(int argc, char **argv)
 bad:
                BIO_printf(bio_err,"%s [options] <infile >outfile\n",prog);
                BIO_printf(bio_err,"where options are\n");
-               BIO_printf(bio_err," -inform arg   input format - DER or PEM\n");
-               BIO_printf(bio_err," -outform arg  output format - DER or PEM\n");
-               BIO_printf(bio_err," -in arg       input file\n");
-               BIO_printf(bio_err," -out arg      output file\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");
+               BIO_printf(bio_err," -inform arg     input format - DER or PEM\n");
+               BIO_printf(bio_err," -outform arg    output format - DER or PEM\n");
+               BIO_printf(bio_err," -in arg         input file\n");
+               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," -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
-               BIO_printf(bio_err," -idea         encrypt PEM output with cbc idea\n");
+               BIO_printf(bio_err," -idea           encrypt PEM output with cbc idea\n");
 #endif
-               BIO_printf(bio_err," -text         print the key in text\n");
-               BIO_printf(bio_err," -noout        don't print key out\n");
-               BIO_printf(bio_err," -modulus      print the DSA public value\n");
+               BIO_printf(bio_err," -text           print the key in text\n");
+               BIO_printf(bio_err," -noout          don't print key out\n");
+               BIO_printf(bio_err," -modulus        print the DSA public value\n");
                goto end;
                }
 
        ERR_load_crypto_strings();
 
+       if(!app_passwd(bio_err, passargin, passargout, &passin, &passout)) {
+               BIO_printf(bio_err, "Error getting passwords\n");
+               goto end;
+       }
+
        in=BIO_new(BIO_s_file());
        out=BIO_new(BIO_s_file());
        if ((in == NULL) || (out == NULL))
@@ -194,11 +215,11 @@ bad:
 
        BIO_printf(bio_err,"read DSA key\n");
        if      (informat == FORMAT_ASN1) {
-               if(pubin) dsa=d2i_DSAPublicKey_bio(in,NULL);
+               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_DSAPublicKey(in,NULL, NULL, NULL);
-               else dsa=PEM_read_bio_DSAPrivateKey(in,NULL,NULL,NULL);
+               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");
@@ -240,13 +261,14 @@ bad:
        if (noout) goto end;
        BIO_printf(bio_err,"writing DSA key\n");
        if      (outformat == FORMAT_ASN1) {
-               if(pubin || pubout) i=i2d_DSAPublicKey_bio(out,dsa);
+               if(pubin || pubout) i=i2d_DSA_PUBKEY_bio(out,dsa);
                else i=i2d_DSAPrivateKey_bio(out,dsa);
        } else if (outformat == FORMAT_PEM) {
                if(pubin || pubout)
-                       i=PEM_write_bio_DSAPublicKey(out,dsa);
-               else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL,NULL);
-       } else  {
+                       i=PEM_write_bio_DSA_PUBKEY(out,dsa);
+               else i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,
+                                                       NULL,0,NULL, passout);
+       } else {
                BIO_printf(bio_err,"bad output format specified for outfile\n");
                goto end;
                }
@@ -258,9 +280,11 @@ bad:
        else
                ret=0;
 end:
-       if (in != NULL) BIO_free(in);
-       if (out != NULL) BIO_free(out);
-       if (dsa != NULL) DSA_free(dsa);
+       if(in != NULL) BIO_free(in);
+       if(out != NULL) BIO_free(out);
+       if(dsa != NULL) DSA_free(dsa);
+       if(passin) Free(passin);
+       if(passout) Free(passout);
        EXIT(ret);
        }
 #endif