diff options
author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2007-10-27 10:27:31 +0300 |
---|---|---|
committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2007-10-27 10:27:31 +0300 |
commit | e188ad5c26777938ebbff589e54a8cdcef548d71 (patch) | |
tree | dc1df715824fcc1d9311245cce9bfcf36dca1c8b | |
parent | a8a824ef559f751f3ac166244d603fe83de45f60 (diff) | |
download | gnutls-e188ad5c26777938ebbff589e54a8cdcef548d71.tar.gz |
quick-random option was removed since it is now the default.
-rw-r--r-- | src/certtool-gaa.c | 103 | ||||
-rw-r--r-- | src/certtool-gaa.h | 8 | ||||
-rw-r--r-- | src/certtool.c | 2 | ||||
-rw-r--r-- | src/certtool.gaa | 1 |
4 files changed, 51 insertions, 63 deletions
diff --git a/src/certtool-gaa.c b/src/certtool-gaa.c index bcec8806c3..e84706a098 100644 --- a/src/certtool-gaa.c +++ b/src/certtool-gaa.c @@ -162,7 +162,6 @@ void gaa_help(void) __gaa_helpsingle(0, "inder", "", "Use DER format for input certificates and private keys."); __gaa_helpsingle(0, "outder", "", "Use DER format for output certificates and private keys."); __gaa_helpsingle(0, "bits", "BITS ", "specify the number of bits for key generation."); - __gaa_helpsingle(0, "quick-random", "", "Use /dev/urandom for all operation, reducing the quality of randomness used."); __gaa_helpsingle(0, "disable-quick-random", "", "Use /dev/random for key generationg, thus increasing the quality of randomness used."); __gaa_helpsingle(0, "outfile", "FILE ", "Output file."); __gaa_helpsingle(0, "infile", "FILE ", "Input file."); @@ -184,13 +183,13 @@ typedef struct _gaainfo gaainfo; struct _gaainfo { -#line 111 "certtool.gaa" +#line 110 "certtool.gaa" int debug; -#line 107 "certtool.gaa" +#line 106 "certtool.gaa" char *template; -#line 104 "certtool.gaa" +#line 103 "certtool.gaa" char *infile; -#line 101 "certtool.gaa" +#line 100 "certtool.gaa" char *outfile; #line 97 "certtool.gaa" int quick_random; @@ -280,7 +279,7 @@ static int gaa_error = 0; #define GAA_MULTIPLE_OPTION 3 #define GAA_REST 0 -#define GAA_NB_OPTION 41 +#define GAA_NB_OPTION 40 #define GAAOPTID_version 1 #define GAAOPTID_help 2 #define GAAOPTID_debug 3 @@ -288,40 +287,39 @@ static int gaa_error = 0; #define GAAOPTID_infile 5 #define GAAOPTID_outfile 6 #define GAAOPTID_disable_quick_random 7 -#define GAAOPTID_quick_random 8 -#define GAAOPTID_bits 9 -#define GAAOPTID_outder 10 -#define GAAOPTID_inder 11 -#define GAAOPTID_export_ciphers 12 -#define GAAOPTID_hash 13 -#define GAAOPTID_dsa 14 -#define GAAOPTID_pkcs8 15 -#define GAAOPTID_to_p12 16 -#define GAAOPTID_v1 17 -#define GAAOPTID_fix_key 18 -#define GAAOPTID_key_info 19 -#define GAAOPTID_smime_to_p7 20 -#define GAAOPTID_p7_info 21 -#define GAAOPTID_p12_info 22 -#define GAAOPTID_crl_info 23 -#define GAAOPTID_certificate_info 24 -#define GAAOPTID_password 25 -#define GAAOPTID_load_ca_certificate 26 -#define GAAOPTID_load_ca_privkey 27 -#define GAAOPTID_load_certificate 28 -#define GAAOPTID_load_request 29 -#define GAAOPTID_load_privkey 30 -#define GAAOPTID_get_dh_params 31 -#define GAAOPTID_generate_dh_params 32 -#define GAAOPTID_verify_crl 33 -#define GAAOPTID_verify_chain 34 -#define GAAOPTID_generate_request 35 -#define GAAOPTID_generate_privkey 36 -#define GAAOPTID_update_certificate 37 -#define GAAOPTID_generate_crl 38 -#define GAAOPTID_generate_proxy 39 -#define GAAOPTID_generate_certificate 40 -#define GAAOPTID_generate_self_signed 41 +#define GAAOPTID_bits 8 +#define GAAOPTID_outder 9 +#define GAAOPTID_inder 10 +#define GAAOPTID_export_ciphers 11 +#define GAAOPTID_hash 12 +#define GAAOPTID_dsa 13 +#define GAAOPTID_pkcs8 14 +#define GAAOPTID_to_p12 15 +#define GAAOPTID_v1 16 +#define GAAOPTID_fix_key 17 +#define GAAOPTID_key_info 18 +#define GAAOPTID_smime_to_p7 19 +#define GAAOPTID_p7_info 20 +#define GAAOPTID_p12_info 21 +#define GAAOPTID_crl_info 22 +#define GAAOPTID_certificate_info 23 +#define GAAOPTID_password 24 +#define GAAOPTID_load_ca_certificate 25 +#define GAAOPTID_load_ca_privkey 26 +#define GAAOPTID_load_certificate 27 +#define GAAOPTID_load_request 28 +#define GAAOPTID_load_privkey 29 +#define GAAOPTID_get_dh_params 30 +#define GAAOPTID_generate_dh_params 31 +#define GAAOPTID_verify_crl 32 +#define GAAOPTID_verify_chain 33 +#define GAAOPTID_generate_request 34 +#define GAAOPTID_generate_privkey 35 +#define GAAOPTID_update_certificate 36 +#define GAAOPTID_generate_crl 37 +#define GAAOPTID_generate_proxy 38 +#define GAAOPTID_generate_certificate 39 +#define GAAOPTID_generate_self_signed 40 #line 168 "gaa.skel" @@ -626,7 +624,6 @@ static int gaa_get_option_num(char *str, int status) GAA_CHECK1STR("v", GAAOPTID_version); GAA_CHECK1STR("h", GAAOPTID_help); GAA_CHECK1STR("", GAAOPTID_disable_quick_random); - GAA_CHECK1STR("", GAAOPTID_quick_random); GAA_CHECK1STR("", GAAOPTID_outder); GAA_CHECK1STR("", GAAOPTID_inder); GAA_CHECK1STR("", GAAOPTID_export_ciphers); @@ -663,7 +660,6 @@ static int gaa_get_option_num(char *str, int status) GAA_CHECKSTR("infile", GAAOPTID_infile); GAA_CHECKSTR("outfile", GAAOPTID_outfile); GAA_CHECKSTR("disable-quick-random", GAAOPTID_disable_quick_random); - GAA_CHECKSTR("quick-random", GAAOPTID_quick_random); GAA_CHECKSTR("bits", GAAOPTID_bits); GAA_CHECKSTR("outder", GAAOPTID_outder); GAA_CHECKSTR("inder", GAAOPTID_inder); @@ -743,14 +739,14 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) { case GAAOPTID_version: OK = 0; -#line 116 "certtool.gaa" +#line 115 "certtool.gaa" { certtool_version(); exit(0); ;}; return GAA_OK; break; case GAAOPTID_help: OK = 0; -#line 114 "certtool.gaa" +#line 113 "certtool.gaa" { gaa_help(); exit(0); ;}; return GAA_OK; @@ -760,7 +756,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_debug.arg1, gaa_getint, GAATMP_debug.size1); gaa_index++; -#line 112 "certtool.gaa" +#line 111 "certtool.gaa" { gaaval->debug = GAATMP_debug.arg1 ;}; return GAA_OK; @@ -770,7 +766,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_template.arg1, gaa_getstr, GAATMP_template.size1); gaa_index++; -#line 108 "certtool.gaa" +#line 107 "certtool.gaa" { gaaval->template = GAATMP_template.arg1 ;}; return GAA_OK; @@ -780,7 +776,7 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_infile.arg1, gaa_getstr, GAATMP_infile.size1); gaa_index++; -#line 105 "certtool.gaa" +#line 104 "certtool.gaa" { gaaval->infile = GAATMP_infile.arg1 ;}; return GAA_OK; @@ -790,22 +786,15 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list) GAA_TESTMOREARGS; GAA_FILL(GAATMP_outfile.arg1, gaa_getstr, GAATMP_outfile.size1); gaa_index++; -#line 102 "certtool.gaa" +#line 101 "certtool.gaa" { gaaval->outfile = GAATMP_outfile.arg1 ;}; return GAA_OK; break; case GAAOPTID_disable_quick_random: OK = 0; -#line 99 "certtool.gaa" -{ gaaval->quick_random = 0; ;}; - - return GAA_OK; - break; - case GAAOPTID_quick_random: - OK = 0; #line 98 "certtool.gaa" -{ gaaval->quick_random = 1; ;}; +{ gaaval->quick_random = 0; ;}; return GAA_OK; break; @@ -1088,7 +1077,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval) if(inited == 0) { -#line 118 "certtool.gaa" +#line 117 "certtool.gaa" { gaaval->bits = 2048; gaaval->pkcs8 = 0; gaaval->privkey = NULL; gaaval->ca=NULL; gaaval->ca_privkey = NULL; gaaval->debug=1; gaaval->request = NULL; gaaval->infile = NULL; gaaval->outfile = NULL; gaaval->cert = NULL; gaaval->incert_format = 0; gaaval->outcert_format = 0; gaaval->action=-1; gaaval->pass = NULL; gaaval->v1_cert = 0; diff --git a/src/certtool-gaa.h b/src/certtool-gaa.h index 88a9b35b96..abda1a0c17 100644 --- a/src/certtool-gaa.h +++ b/src/certtool-gaa.h @@ -8,13 +8,13 @@ typedef struct _gaainfo gaainfo; struct _gaainfo { -#line 111 "certtool.gaa" +#line 110 "certtool.gaa" int debug; -#line 107 "certtool.gaa" +#line 106 "certtool.gaa" char *template; -#line 104 "certtool.gaa" +#line 103 "certtool.gaa" char *infile; -#line 101 "certtool.gaa" +#line 100 "certtool.gaa" char *outfile; #line 97 "certtool.gaa" int quick_random; diff --git a/src/certtool.c b/src/certtool.c index b653ef05a1..8a3e18f305 100644 --- a/src/certtool.c +++ b/src/certtool.c @@ -136,7 +136,7 @@ generate_private_key_int (void) if (info.quick_random == 0) fprintf (stderr, "This might take several minutes depending on availability of randomness" - " in /dev/random. You can consider using --quick-random option but this reduces the quality of randomness used.\n"); + " in /dev/random.\n"); ret = gnutls_x509_privkey_generate (key, key_type, info.bits, 0); if (ret < 0) diff --git a/src/certtool.gaa b/src/certtool.gaa index ae114be09c..c9cf6ac75c 100644 --- a/src/certtool.gaa +++ b/src/certtool.gaa @@ -95,7 +95,6 @@ option (outder) { $outcert_format=1 } "Use DER format for output certificates an option (bits) INT "BITS" { $bits = $1 } "specify the number of bits for key generation." #int quick_random; -option (quick-random) { $quick_random = 1; } "Use /dev/urandom for all operation, reducing the quality of randomness used." option (disable-quick-random) { $quick_random = 0; } "Use /dev/random for key generationg, thus increasing the quality of randomness used." #char *outfile; |