diff options
author | Richard Levitte <levitte@openssl.org> | 2000-06-28 16:10:56 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2000-06-28 16:10:56 +0000 |
commit | 20d242b0dee75830b104109c6fd5955a4ce35840 (patch) | |
tree | 018296e1c84d26f54c893ea16e5a531a5159c96b /apps/pkcs12.c | |
parent | dffd72f171fba5ab14ca86aafc5d5eba131206ad (diff) | |
download | openssl-20d242b0dee75830b104109c6fd5955a4ce35840.tar.gz |
Make it possible for users of the openssl applications to specify the
EGD should be used as seeding input, and where the named socket is.
Diffstat (limited to 'apps/pkcs12.c')
-rw-r--r-- | apps/pkcs12.c | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/apps/pkcs12.c b/apps/pkcs12.c index 3f958943b4..0dab7235e9 100644 --- a/apps/pkcs12.c +++ b/apps/pkcs12.c @@ -65,6 +65,7 @@ #include <openssl/crypto.h> #include <openssl/err.h> #include <openssl/pem.h> +#include <openssl/rand.h> #include <openssl/pkcs12.h> #define PROG pkcs12_main @@ -116,7 +117,7 @@ int MAIN(int argc, char **argv) char *cpass = NULL, *mpass = NULL; char *passargin = NULL, *passargout = NULL, *passarg = NULL; char *passin = NULL, *passout = NULL; - char *inrand = NULL; + char *inrand = NULL,*inegd=NULL; apps_startup(); @@ -178,6 +179,11 @@ int MAIN(int argc, char **argv) args++; inrand = *args; } else badarg = 1; + } else if (!strcmp (*args, "-egd")) { + if (args[1]) { + args++; + inegd = *args; + } else badarg = 1; } else if (!strcmp (*args, "-inkey")) { if (args[1]) { args++; @@ -269,6 +275,7 @@ int MAIN(int argc, char **argv) BIO_printf(bio_err, "-rand file%cfile%c...\n", LIST_SEPARATOR_CHAR, LIST_SEPARATOR_CHAR); 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, "-egd file load random seed from EGD socket\n"); goto end; } @@ -296,10 +303,13 @@ int MAIN(int argc, char **argv) } if(export_cert || inrand) { - app_RAND_load_file(NULL, bio_err, (inrand != NULL)); + app_RAND_load_file(NULL, bio_err, (inrand != NULL || inegd != NULL)); if (inrand != NULL) BIO_printf(bio_err,"%ld semi-random bytes loaded\n", app_RAND_load_files(inrand)); + if (inegd != NULL) + BIO_printf(bio_err,"%ld egd bytes loaded\n", + RAND_egd(inegd)); } ERR_load_crypto_strings(); |