1 files changed, 101 insertions, 39 deletions

diff --git a/src/lib/libssl/src/apps/dsa.c b/src/lib/libssl/src/apps/dsa.c
index fbd85a467a..9da1a41645 100644
--- a/src/lib/libssl/src/apps/dsa.c
+++ b/src/lib/libssl/src/apps/dsa.c
@@ -56,17 +56,18 @@
  * [including the GNU Public Licence.]
  */
 
+#ifndef OPENSSL_NO_DSA
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
 #include "apps.h"
-#include "bio.h"
-#include "err.h"
-#include "dsa.h"
-#include "evp.h"
-#include "x509.h"
-#include "pem.h"
+#include <openssl/bio.h>
+#include <openssl/err.h>
+#include <openssl/dsa.h>
+#include <openssl/evp.h>
+#include <openssl/x509.h>
+#include <openssl/pem.h>
 
 #undef PROG
 #define PROG    dsa_main
@@ -78,21 +79,28 @@
  * -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
  * -modulus     - print the DSA public key
  */
 
-int MAIN(argc, argv)
-int argc;
-char **argv;
+int MAIN(int, char **);
+
+int MAIN(int argc, char **argv)
         {
+        ENGINE *e = NULL;
         int ret=1;
         DSA *dsa=NULL;
         int i,badops=0;
-        EVP_CIPHER *enc=NULL;
+        const EVP_CIPHER *enc=NULL;
         BIO *in=NULL,*out=NULL;
         int informat,outformat,text=0,noout=0;
-        char *infile,*outfile,*prog;
+        int pubin = 0, pubout = 0;
+        char *infile,*outfile,*prog,*engine;
+        char *passargin = NULL, *passargout = NULL;
+        char *passin = NULL, *passout = NULL;
         int modulus=0;
 
         apps_startup();
@@ -101,6 +109,10 @@ 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;
         informat=FORMAT_PEM;
@@ -131,12 +143,31 @@ 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,"-engine") == 0)
+                        {
+                        if (--argc < 1) goto bad;
+                        engine= *(++argv);
+                        }
                 else if (strcmp(*argv,"-noout") == 0)
                         noout=1;
                 else if (strcmp(*argv,"-text") == 0)
                         text=1;
                 else if (strcmp(*argv,"-modulus") == 0)
                         modulus=1;
+                else if (strcmp(*argv,"-pubin") == 0)
+                        pubin=1;
+                else if (strcmp(*argv,"-pubout") == 0)
+                        pubout=1;
                 else if ((enc=EVP_get_cipherbyname(&(argv[0][1]))) == NULL)
                         {
                         BIO_printf(bio_err,"unknown option %s\n",*argv);
@@ -152,23 +183,37 @@ 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       inout 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");
-#ifndef NO_IDEA
-                BIO_printf(bio_err," -idea         encrypt PEM output with cbc idea\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," -engine e       use engine e, possibly a hardware device.\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 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");
-                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();
 
+        e = setup_engine(bio_err, engine, 0);
+
+        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))
@@ -188,25 +233,35 @@ bad:
                         }
                 }
 
-        BIO_printf(bio_err,"read DSA private key\n");
-        if      (informat == FORMAT_ASN1)
-                dsa=d2i_DSAPrivateKey_bio(in,NULL);
-        else if (informat == FORMAT_PEM)
-                dsa=PEM_read_bio_DSAPrivateKey(in,NULL,NULL);
-        else
+        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;
                 }
         if (dsa == NULL)
                 {
-                BIO_printf(bio_err,"unable to load Private Key\n");
+                BIO_printf(bio_err,"unable to load Key\n");
                 ERR_print_errors(bio_err);
                 goto end;
                 }
 
         if (outfile == NULL)
+                {
                 BIO_set_fp(out,stdout,BIO_NOCLOSE);
+#ifdef OPENSSL_SYS_VMS
+                {
+                BIO *tmpbio = BIO_new(BIO_f_linebuffer());
+                out = BIO_push(tmpbio, out);
+                }
+#endif
+                }
         else
                 {
                 if (BIO_write_filename(out,outfile) <= 0)
@@ -232,12 +287,16 @@ bad:
                 }
 
         if (noout) goto end;
-        BIO_printf(bio_err,"writing DSA private key\n");
-        if      (outformat == FORMAT_ASN1)
-                i=i2d_DSAPrivateKey_bio(out,dsa);
-        else if (outformat == FORMAT_PEM)
-                i=PEM_write_bio_DSAPrivateKey(out,dsa,enc,NULL,0,NULL);
-        else    {
+        BIO_printf(bio_err,"writing DSA key\n");
+        if      (outformat == FORMAT_ASN1) {
+                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_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;
                 }
@@ -249,9 +308,12 @@ 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_all(out);
+        if(dsa != NULL) DSA_free(dsa);
+        if(passin) OPENSSL_free(passin);
+        if(passout) OPENSSL_free(passout);
+        apps_shutdown();
         EXIT(ret);
         }
-
+#endif