Only use DSA-functions if available.

[openssl.git] / apps / dsaparam.c

diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 118d974bb03e1e61b7c340d55ad5595824b59ea5..2f436803e36ce598d417f16303626b361fc021a5 100644 (file)
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -56,7 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
  * [including the GNU Public Licence.]
  */
 

-#ifndef NO_DSA
+#ifndef OPENSSL_NO_DSA
+#include <assert.h>

 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <time.h>


@@ -65,7 +66,6 @@
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/bn.h>
 #include <openssl/bio.h>
 #include <openssl/err.h>
 #include <openssl/bn.h>

-#include <openssl/rand.h>

 #include <openssl/dsa.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>
 #include <openssl/dsa.h>
 #include <openssl/x509.h>
 #include <openssl/pem.h>


@@ -73,7 +73,7 @@
 #undef PROG
 #define PROG   dsaparam_main
 
 #undef PROG
 #define PROG   dsaparam_main
 

-/* -inform arg - input format - default PEM (one of DER, TXT or PEM)
+/* -inform arg - input format - default PEM (DER or PEM)

  * -outform arg - output format - default PEM
  * -in arg     - input file - default stdin
  * -out arg    - output file - default stdout
  * -outform arg - output format - default PEM
  * -in arg     - input file - default stdin
  * -out arg    - output file - default stdout


@@ -84,16 +84,21 @@
  * -genkey
  */
 
  * -genkey
  */
 

-static void MS_CALLBACK dsa_cb(int p, int n, char *arg);
+static void MS_CALLBACK dsa_cb(int p, int n, void *arg);
+
+int MAIN(int, char **);
+

 int MAIN(int argc, char **argv)
        {
 int MAIN(int argc, char **argv)
        {

+       ENGINE *e = NULL;

        DSA *dsa=NULL;
        int i,badops=0,text=0;
        BIO *in=NULL,*out=NULL;
        int informat,outformat,noout=0,C=0,ret=1;
        char *infile,*outfile,*prog,*inrand=NULL;
        int numbits= -1,num,genkey=0;
        DSA *dsa=NULL;
        int i,badops=0,text=0;
        BIO *in=NULL,*out=NULL;
        int informat,outformat,noout=0,C=0,ret=1;
        char *infile,*outfile,*prog,*inrand=NULL;
        int numbits= -1,num,genkey=0;

-       char buffer[200],*randfile=NULL;
+       int need_rand=0;
+       char *engine=NULL;

 
        apps_startup();
 
 
        apps_startup();
 


@@ -101,6 +106,9 @@ int MAIN(int argc, char **argv)
                if ((bio_err=BIO_new(BIO_s_file())) != NULL)
                        BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT);
 
                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;
+

        infile=NULL;
        outfile=NULL;
        informat=FORMAT_PEM;
        infile=NULL;
        outfile=NULL;
        informat=FORMAT_PEM;


@@ -131,16 +139,25 @@ int MAIN(int argc, char **argv)
                        if (--argc < 1) goto bad;
                        outfile= *(++argv);
                        }
                        if (--argc < 1) goto bad;
                        outfile= *(++argv);
                        }

+               else if(strcmp(*argv, "-engine") == 0)
+                       {
+                       if (--argc < 1) goto bad;
+                       engine = *(++argv);
+                       }

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

+                       {

                        genkey=1;
                        genkey=1;

+                       need_rand=1;
+                       }

                else if (strcmp(*argv,"-rand") == 0)
                        {
                        if (--argc < 1) goto bad;
                        inrand= *(++argv);
                else if (strcmp(*argv,"-rand") == 0)
                        {
                        if (--argc < 1) goto bad;
                        inrand= *(++argv);

+                       need_rand=1;

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


@@ -148,6 +165,7 @@ int MAIN(int argc, char **argv)
                        {
                        /* generate a key */
                        numbits=num;
                        {
                        /* generate a key */
                        numbits=num;

+                       need_rand=1;

                        }
                else
                        {
                        }
                else
                        {


@@ -164,14 +182,16 @@ int MAIN(int argc, char **argv)
 bad:
                BIO_printf(bio_err,"%s [options] [bits] <infile >outfile\n",prog);
                BIO_printf(bio_err,"where options are\n");
 bad:
                BIO_printf(bio_err,"%s [options] [bits] <infile >outfile\n",prog);
                BIO_printf(bio_err,"where options are\n");

-               BIO_printf(bio_err," -inform arg   input format - one of DER TXT PEM\n");
-               BIO_printf(bio_err," -outform arg  output format - one of DER TXT PEM\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," -in arg       input file\n");
                BIO_printf(bio_err," -out arg      output file\n");

-               BIO_printf(bio_err," -text         check the DSA parameters\n");
+               BIO_printf(bio_err," -text         print as text\n");

                BIO_printf(bio_err," -C            Output C code\n");
                BIO_printf(bio_err," -noout        no output\n");
                BIO_printf(bio_err," -C            Output C code\n");
                BIO_printf(bio_err," -noout        no output\n");

+               BIO_printf(bio_err," -genkey       generate a DSA key\n");

                BIO_printf(bio_err," -rand         files to use for random number input\n");
                BIO_printf(bio_err," -rand         files to use for random number input\n");

+               BIO_printf(bio_err," -engine e     use engine e, possibly a hardware device.\n");

                BIO_printf(bio_err," number        number of bits to use for generating private key\n");
                goto end;
                }
                BIO_printf(bio_err," number        number of bits to use for generating private key\n");
                goto end;
                }


@@ -197,7 +217,15 @@ bad:
                        }
                }
        if (outfile == NULL)
                        }
                }
        if (outfile == NULL)

+               {

                BIO_set_fp(out,stdout,BIO_NOCLOSE);
                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)
        else
                {
                if (BIO_write_filename(out,outfile) <= 0)


@@ -207,20 +235,27 @@ bad:
                        }
                }
 
                        }
                }
 

-       if (numbits > 0)
+        e = setup_engine(bio_err, engine, 0);
+
+       if (need_rand)

                {
                {

-               randfile=RAND_file_name(buffer,200);
-               RAND_load_file(randfile,1024L*1024L);
+               app_RAND_load_file(NULL, bio_err, (inrand != NULL));
+               if (inrand != NULL)
+                       BIO_printf(bio_err,"%ld semi-random bytes loaded\n",
+                               app_RAND_load_files(inrand));
+               }

 
 

+       if (numbits > 0)
+               {
+               assert(need_rand);

                BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
                BIO_printf(bio_err,"This could take some time\n");
                BIO_printf(bio_err,"Generating DSA parameters, %d bit long prime\n",num);
                BIO_printf(bio_err,"This could take some time\n");

-               dsa=DSA_generate_parameters(num,NULL,0,NULL,NULL,
-                       dsa_cb,(char *)bio_err);
+               dsa=DSA_generate_parameters(num,NULL,0,NULL,NULL, dsa_cb,bio_err);

                }
        else if (informat == FORMAT_ASN1)
                dsa=d2i_DSAparams_bio(in,NULL);
        else if (informat == FORMAT_PEM)
                }
        else if (informat == FORMAT_ASN1)
                dsa=d2i_DSAparams_bio(in,NULL);
        else if (informat == FORMAT_PEM)

-               dsa=PEM_read_bio_DSAparams(in,NULL,NULL);
+               dsa=PEM_read_bio_DSAparams(in,NULL,NULL,NULL);

        else
                {
                BIO_printf(bio_err,"bad input format specified\n");
        else
                {
                BIO_printf(bio_err,"bad input format specified\n");


@@ -247,10 +282,10 @@ bad:
                bits_p=BN_num_bits(dsa->p);
                bits_q=BN_num_bits(dsa->q);
                bits_g=BN_num_bits(dsa->g);
                bits_p=BN_num_bits(dsa->p);
                bits_q=BN_num_bits(dsa->q);
                bits_g=BN_num_bits(dsa->g);

-               data=(unsigned char *)Malloc(len+20);
+               data=(unsigned char *)OPENSSL_malloc(len+20);

                if (data == NULL)
                        {
                if (data == NULL)
                        {

-                       perror("Malloc");
+                       perror("OPENSSL_malloc");

                        goto end;
                        }
                l=BN_bn2bin(dsa->p,data);
                        goto end;
                        }
                l=BN_bn2bin(dsa->p,data);


@@ -290,7 +325,7 @@ bad:
                printf("\tdsa->g=BN_bin2bn(dsa%d_g,sizeof(dsa%d_g),NULL);\n",
                        bits_p,bits_p);
                printf("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");
                printf("\tdsa->g=BN_bin2bn(dsa%d_g,sizeof(dsa%d_g),NULL);\n",
                        bits_p,bits_p);
                printf("\tif ((dsa->p == NULL) || (dsa->q == NULL) || (dsa->g == NULL))\n");

-               printf("\t\treturn(NULL);\n");
+               printf("\t\t{ DSA_free(dsa); return(NULL); }\n");

                printf("\treturn(dsa);\n\t}\n");
                }
 
                printf("\treturn(dsa);\n\t}\n");
                }
 


@@ -307,7 +342,7 @@ bad:
                        }
                if (!i)
                        {
                        }
                if (!i)
                        {

-                       BIO_printf(bio_err,"unable to write DSA paramaters\n");
+                       BIO_printf(bio_err,"unable to write DSA parameters\n");

                        ERR_print_errors(bio_err);
                        goto end;
                        }
                        ERR_print_errors(bio_err);
                        goto end;
                        }


@@ -316,27 +351,31 @@ bad:
                {
                DSA *dsakey;
 
                {
                DSA *dsakey;
 

+               assert(need_rand);

                if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
                if (!DSA_generate_key(dsakey)) goto end;
                if      (outformat == FORMAT_ASN1)
                        i=i2d_DSAPrivateKey_bio(out,dsakey);
                else if (outformat == FORMAT_PEM)
                if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end;
                if (!DSA_generate_key(dsakey)) goto end;
                if      (outformat == FORMAT_ASN1)
                        i=i2d_DSAPrivateKey_bio(out,dsakey);
                else if (outformat == FORMAT_PEM)

-                       i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL);
+                       i=PEM_write_bio_DSAPrivateKey(out,dsakey,NULL,NULL,0,NULL,NULL);

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

+       if (need_rand)
+               app_RAND_write_file(NULL, bio_err);

        ret=0;
 end:
        if (in != NULL) BIO_free(in);
        ret=0;
 end:
        if (in != NULL) BIO_free(in);

-       if (out != NULL) BIO_free(out);
+       if (out != NULL) BIO_free_all(out);

        if (dsa != NULL) DSA_free(dsa);
        if (dsa != NULL) DSA_free(dsa);

+       apps_shutdown();

        EXIT(ret);
        }
 
        EXIT(ret);
        }
 

-static void MS_CALLBACK dsa_cb(int p, int n, char *arg)
+static void MS_CALLBACK dsa_cb(int p, int n, void *arg)

        {
        char c='*';
 
        {
        char c='*';
 


@@ -344,8 +383,8 @@ static void MS_CALLBACK dsa_cb(int p, int n, char *arg)
        if (p == 1) c='+';
        if (p == 2) c='*';
        if (p == 3) c='\n';
        if (p == 1) c='+';
        if (p == 2) c='*';
        if (p == 3) c='\n';

-       BIO_write((BIO *)arg,&c,1);
-       BIO_flush((BIO *)arg);
+       BIO_write(arg,&c,1);
+       (void)BIO_flush(arg);

 #ifdef LINT
        p=n;
 #endif
 #ifdef LINT
        p=n;
 #endif