diff options
Diffstat (limited to 'crypto/openssl/apps/dsaparam.c')
| -rw-r--r-- | crypto/openssl/apps/dsaparam.c | 48 |
1 files changed, 32 insertions, 16 deletions
diff --git a/crypto/openssl/apps/dsaparam.c b/crypto/openssl/apps/dsaparam.c index fb8d471..4d4e1ad 100644 --- a/crypto/openssl/apps/dsaparam.c +++ b/crypto/openssl/apps/dsaparam.c @@ -57,6 +57,7 @@ */ #ifndef NO_DSA +#include <assert.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/rand.h> #include <openssl/dsa.h> #include <openssl/x509.h> #include <openssl/pem.h> @@ -73,7 +73,7 @@ #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 @@ -84,7 +84,10 @@ * -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) { DSA *dsa=NULL; @@ -93,7 +96,7 @@ int MAIN(int argc, char **argv) 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; apps_startup(); @@ -136,11 +139,15 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv,"-C") == 0) C=1; else if (strcmp(*argv,"-genkey") == 0) + { genkey=1; + need_rand=1; + } else if (strcmp(*argv,"-rand") == 0) { if (--argc < 1) goto bad; inrand= *(++argv); + need_rand=1; } else if (strcmp(*argv,"-noout") == 0) noout=1; @@ -148,6 +155,7 @@ int MAIN(int argc, char **argv) { /* generate a key */ numbits=num; + need_rand=1; } else { @@ -164,11 +172,11 @@ 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"); - 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," -text check the DSA parameters\n"); + BIO_printf(bio_err," -text print the key in text\n"); BIO_printf(bio_err," -C Output C code\n"); BIO_printf(bio_err," -noout no output\n"); BIO_printf(bio_err," -rand files to use for random number input\n"); @@ -207,15 +215,20 @@ bad: } } - if (numbits > 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"); - 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); @@ -307,7 +320,7 @@ bad: } 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; } @@ -316,6 +329,7 @@ bad: { DSA *dsakey; + assert(need_rand); if ((dsakey=DSAparams_dup(dsa)) == NULL) goto end; if (!DSA_generate_key(dsakey)) goto end; if (outformat == FORMAT_ASN1) @@ -328,6 +342,8 @@ bad: } DSA_free(dsakey); } + if (need_rand) + app_RAND_write_file(NULL, bio_err); ret=0; end: if (in != NULL) BIO_free(in); @@ -336,7 +352,7 @@ end: 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='*'; @@ -344,8 +360,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'; - BIO_write((BIO *)arg,&c,1); - (void)BIO_flush((BIO *)arg); + BIO_write(arg,&c,1); + (void)BIO_flush(arg); #ifdef LINT p=n; #endif |
