X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=apps%2Fgenrsa.c;h=dc63ff02bd85633a7b6907d683d1ebf71fc76681;hp=f83bafc7f1ab54682cd5ef0c23fa743babf6690d;hb=ae1bb4e572e02ce73d54c05ce18e872c36da2d35;hpb=6b691a5c85ddc4e407e32781841fee5c029506cd diff --git a/apps/genrsa.c b/apps/genrsa.c index f83bafc7f1..dc63ff02bd 100644 --- a/apps/genrsa.c +++ b/apps/genrsa.c @@ -56,43 +56,39 @@ * [including the GNU Public Licence.] */ +#ifndef NO_RSA #include #include #include #include #include "apps.h" -#include "bio.h" -#include "rand.h" -#include "err.h" -#include "bn.h" -#include "rsa.h" -#include "evp.h" -#include "x509.h" -#include "pem.h" +#include +#include +#include +#include +#include +#include +#include #define DEFBITS 512 #undef PROG #define PROG genrsa_main -#ifndef NOPROTO -static void MS_CALLBACK genrsa_cb(int p, int n, char *arg); -static long gr_load_rand(char *names); -#else -static void MS_CALLBACK genrsa_cb(); -static long gr_load_rand(); -#endif +static void MS_CALLBACK genrsa_cb(int p, int n, void *arg); + +int MAIN(int, char **); int MAIN(int argc, char **argv) { int ret=1; - char buffer[200]; RSA *rsa=NULL; int i,num=DEFBITS; - long rnum=0,l; + long l; EVP_CIPHER *enc=NULL; unsigned long f4=RSA_F4; char *outfile=NULL; - char *inrand=NULL,*randfile; + char *passargout = NULL, *passout = NULL; + char *inrand=NULL; BIO *out=NULL; apps_startup(); @@ -102,7 +98,7 @@ int MAIN(int argc, char **argv) BIO_set_fp(bio_err,stderr,BIO_NOCLOSE|BIO_FP_TEXT); if ((out=BIO_new(BIO_s_file())) == NULL) { - BIO_printf(bio_err,"unable to creat BIO for output\n"); + BIO_printf(bio_err,"unable to create BIO for output\n"); goto err; } @@ -135,6 +131,11 @@ int MAIN(int argc, char **argv) else if (strcmp(*argv,"-idea") == 0) enc=EVP_idea_cbc(); #endif + else if (strcmp(*argv,"-passout") == 0) + { + if (--argc < 1) goto bad; + passargout= *(++argv); + } else break; argv++; @@ -144,21 +145,28 @@ int MAIN(int argc, char **argv) { bad: BIO_printf(bio_err,"usage: genrsa [args] [numbits]\n"); - BIO_printf(bio_err," -des - encrypt the generated key with DES in cbc mode\n"); - BIO_printf(bio_err," -des3 - encrypt the generated key with DES in ede cbc mode (168 bit key)\n"); + BIO_printf(bio_err," -des encrypt the generated key with DES in cbc mode\n"); + BIO_printf(bio_err," -des3 encrypt the generated key with DES in ede cbc mode (168 bit key)\n"); #ifndef NO_IDEA - BIO_printf(bio_err," -idea - encrypt the generated key with IDEA in cbc mode\n"); + BIO_printf(bio_err," -idea encrypt the generated key with IDEA in cbc mode\n"); #endif - BIO_printf(bio_err," -out file - output the key to 'file\n"); - BIO_printf(bio_err," -f4 - use F4 (0x10001) for the E value\n"); - BIO_printf(bio_err," -3 - use 3 for the E value\n"); + BIO_printf(bio_err," -out file output the key to 'file\n"); + BIO_printf(bio_err," -passout arg output file pass phrase source\n"); + BIO_printf(bio_err," -f4 use F4 (0x10001) for the E value\n"); + BIO_printf(bio_err," -3 use 3 for the E value\n"); BIO_printf(bio_err," -rand file:file:...\n"); - BIO_printf(bio_err," - load the file (or the files in the directory) into\n"); - BIO_printf(bio_err," the random number generator\n"); + BIO_printf(bio_err," load the file (or the files in the directory) into\n"); + BIO_printf(bio_err," the random number generator\n"); goto err; } ERR_load_crypto_strings(); + + if(!app_passwd(bio_err, NULL, passargout, NULL, &passout)) { + BIO_printf(bio_err, "Error getting password\n"); + goto err; + } + if (outfile == NULL) BIO_set_fp(out,stdout,BIO_NOCLOSE); else @@ -170,45 +178,23 @@ bad: } } -#ifdef WINDOWS - BIO_printf(bio_err,"Loading 'screen' into random state -"); - BIO_flush(bio_err); - RAND_screen(); - BIO_printf(bio_err," done\n"); -#endif - randfile=RAND_file_name(buffer,200); - if ((randfile == NULL) || - !(rnum=(long)RAND_load_file(randfile,1024L*1024L))) - { - BIO_printf(bio_err,"unable to load 'random state'\n"); - } - - if (inrand == NULL) - { - if (rnum == 0) - { - BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n"); - } - } - else + if (!app_RAND_load_file(NULL, bio_err, 1) && inrand == NULL) { - rnum+=gr_load_rand(inrand); + BIO_printf(bio_err,"warning, not much extra random data, consider using the -rand option\n"); } - if (rnum != 0) - BIO_printf(bio_err,"%ld semi-random bytes loaded\n",rnum); + if (inrand != NULL) + BIO_printf(bio_err,"%ld semi-random bytes loaded\n", + app_RAND_load_files(inrand)); BIO_printf(bio_err,"Generating RSA private key, %d bit long modulus\n", num); - rsa=RSA_generate_key(num,f4,genrsa_cb,(char *)bio_err); + rsa=RSA_generate_key(num,f4,genrsa_cb,bio_err); - if (randfile == NULL) - BIO_printf(bio_err,"unable to write 'random state'\n"); - else - RAND_write_file(randfile); + app_RAND_write_file(NULL, bio_err); if (rsa == NULL) goto err; - /* We need to do the folloing for when the base number size is < + /* We need to do the following for when the base number size is < * long, esp windows 3.1 :-(. */ l=0L; for (i=0; ie->top; i++) @@ -220,19 +206,20 @@ bad: l+=rsa->e->d[i]; } BIO_printf(bio_err,"e is %ld (0x%lX)\n",l,l); - if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,NULL)) + if (!PEM_write_bio_RSAPrivateKey(out,rsa,enc,NULL,0,NULL, passout)) goto err; ret=0; err: if (rsa != NULL) RSA_free(rsa); if (out != NULL) BIO_free(out); + if(passout) Free(passout); if (ret != 0) ERR_print_errors(bio_err); EXIT(ret); } -static void MS_CALLBACK genrsa_cb(int p, int n, char *arg) +static void MS_CALLBACK genrsa_cb(int p, int n, void *arg) { char c='*'; @@ -241,32 +228,15 @@ static void MS_CALLBACK genrsa_cb(int p, int n, char *arg) if (p == 2) c='*'; if (p == 3) c='\n'; BIO_write((BIO *)arg,&c,1); - BIO_flush((BIO *)arg); + (void)BIO_flush((BIO *)arg); #ifdef LINT p=n; #endif } +#else /* !NO_RSA */ -static long gr_load_rand(char *name) - { - char *p,*n; - int last; - long tot=0; - - for (;;) - { - last=0; - for (p=name; ((*p != '\0') && (*p != LIST_SEPARATOR_CHAR)); p++); - if (*p == '\0') last=1; - *p='\0'; - n=name; - name=p+1; - if (*n == '\0') break; - - tot+=RAND_load_file(n,1024L*1024L); - if (last) break; - } - return(tot); - } - +# if PEDANTIC +static void *dummy=&dummy; +# endif +#endif