New '-dsaparam' option for 'openssl dhparam', and related fixes.

[openssl.git] / apps / rsa.c

diff --git a/apps/rsa.c b/apps/rsa.c
index 0351cb7d229a80a6d5b8d993436534deb59f402a..53d234ca350b621a3f1ac2d1bdf3effda0fc3f88 100644 (file)
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -86,6 +86,8 @@
  * -pubout     - Output a public key.
  */
 
+int MAIN(int, char **);
+
 int MAIN(int argc, char **argv)
        {
        int ret=1;
@@ -96,6 +98,8 @@ int MAIN(int argc, char **argv)
        int informat,outformat,text=0,check=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();
@@ -134,6 +138,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,"-pubin") == 0)
                        pubin=1;
                else if (strcmp(*argv,"-pubout") == 0)
@@ -161,26 +175,39 @@ 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 - one of DER NET PEM\n");
-               BIO_printf(bio_err," -outform arg  output format - one of DER NET 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 - one of DER NET PEM\n");
+               BIO_printf(bio_err," -outform arg    output format - one of DER NET 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," -in arg         input file\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 RSA key modulus\n");
-               BIO_printf(bio_err," -check        verify key consistency\n");
-               BIO_printf(bio_err," -pubin        expect a public key in input file\n");
-               BIO_printf(bio_err," -pubout       output a public key\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 RSA key modulus\n");
+               BIO_printf(bio_err," -check          verify key consistency\n");
+               BIO_printf(bio_err," -pubin          expect a public key in input file\n");
+               BIO_printf(bio_err," -pubout         output a public key\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;
+       }
+
+       if(check && pubin) {
+               BIO_printf(bio_err, "Only private keys can be checked\n");
+               goto end;
+       }
+
        in=BIO_new(BIO_s_file());
        out=BIO_new(BIO_s_file());
        if ((in == NULL) || (out == NULL))
@@ -200,9 +227,9 @@ bad:
                        }
                }
 
-       BIO_printf(bio_err,"read RSA private key\n");
+       BIO_printf(bio_err,"read RSA key\n");
        if      (informat == FORMAT_ASN1) {
-               if (pubin) rsa=d2i_RSAPublicKey_bio(in,NULL);
+               if (pubin) rsa=d2i_RSA_PUBKEY_bio(in,NULL);
                else rsa=d2i_RSAPrivateKey_bio(in,NULL);
        }
 #ifndef NO_RC4
@@ -228,13 +255,13 @@ bad:
                                }
                        }
                p=(unsigned char *)buf->data;
-               rsa=(RSA *)d2i_Netscape_RSA(NULL,&p,(long)size,NULL);
+               rsa=d2i_Netscape_RSA(NULL,&p,(long)size,NULL);
                BUF_MEM_free(buf);
                }
 #endif
        else if (informat == FORMAT_PEM) {
-               if(pubin) rsa=PEM_read_bio_RSAPublicKey(in,NULL,NULL,NULL);
-               else rsa=PEM_read_bio_RSAPrivateKey(in,NULL,NULL,NULL);
+               if(pubin) rsa=PEM_read_bio_RSA_PUBKEY(in,NULL,NULL,NULL);
+               else rsa=PEM_read_bio_RSAPrivateKey(in,NULL, NULL,passin);
        }
        else
                {
@@ -243,7 +270,7 @@ bad:
                }
        if (rsa == NULL)
                {
-               BIO_printf(bio_err,"unable to load Key\n");
+               BIO_printf(bio_err,"unable to load key\n");
                ERR_print_errors(bio_err);
                goto end;
                }
@@ -269,9 +296,9 @@ bad:
 
        if (modulus)
                {
-               fprintf(stdout,"Modulus=");
+               BIO_printf(out,"Modulus=");
                BN_print(out,rsa->n);
-               fprintf(stdout,"\n");
+               BIO_printf(out,"\n");
                }
 
        if (check)
@@ -308,7 +335,7 @@ bad:
                }
        BIO_printf(bio_err,"writing RSA key\n");
        if      (outformat == FORMAT_ASN1) {
-               if(pubout || pubin) i=i2d_RSAPublicKey_bio(out,rsa);
+               if(pubout || pubin) i=i2d_RSA_PUBKEY_bio(out,rsa);
                else i=i2d_RSAPrivateKey_bio(out,rsa);
        }
 #ifndef NO_RC4
@@ -332,9 +359,9 @@ bad:
 #endif
        else if (outformat == FORMAT_PEM) {
                if(pubout || pubin)
-                   i=PEM_write_bio_RSAPublicKey(out,rsa);
-               else
-                   i=PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,NULL,NULL);
+                   i=PEM_write_bio_RSA_PUBKEY(out,rsa);
+               else i=PEM_write_bio_RSAPrivateKey(out,rsa,
+                                               enc,NULL,0,NULL,passout);
        } else  {
                BIO_printf(bio_err,"bad output format specified for outfile\n");
                goto end;
@@ -347,9 +374,17 @@ bad:
        else
                ret=0;
 end:
-       if (in != NULL) BIO_free(in);
-       if (out != NULL) BIO_free(out);
-       if (rsa != NULL) RSA_free(rsa);
+       if(in != NULL) BIO_free(in);
+       if(out != NULL) BIO_free(out);
+       if(rsa != NULL) RSA_free(rsa);
+       if(passin) Free(passin);
+       if(passout) Free(passout);
        EXIT(ret);
        }
+#else /* !NO_RSA */
+
+# if PEDANTIC
+static void *dummy=&dummy;
+# endif
+
 #endif