summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNikos Mavrogiannopoulos <nmav@gnutls.org>2003-10-27 09:58:28 +0000
committerNikos Mavrogiannopoulos <nmav@gnutls.org>2003-10-27 09:58:28 +0000
commit41592a9ff38906855ed2e0ea2ce325671db8cfa3 (patch)
treed7c091c789e5b69bdb3c31212066ac00ee50fa60
parentc6efe30c16a6a0035e3e4bbf57971d96afa9944b (diff)
downloadgnutls-41592a9ff38906855ed2e0ea2ce325671db8cfa3.tar.gz
*** empty log message ***
-rw-r--r--src/certtool-gaa.c2
-rw-r--r--src/certtool.c10
-rw-r--r--src/certtool.gaa2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/certtool-gaa.c b/src/certtool-gaa.c
index 7097d78bbb..5a86602411 100644
--- a/src/certtool-gaa.c
+++ b/src/certtool-gaa.c
@@ -122,7 +122,7 @@ void gaa_help(void)
__gaa_helpsingle('u', "update-certificate", "", "Update a signed certificate.");
__gaa_helpsingle('p', "generate-privkey", "", "Generate a private key.");
__gaa_helpsingle('q', "generate-request", "", "Generate a PKCS #10 certificate request.");
- __gaa_helpsingle('e', "verify-chain", "", "Verify a certificate chain. The last certificate in the chain must be a self signed one.");
+ __gaa_helpsingle('e', "verify-chain", "", "Verify a PEM encoded certificate chain. The last certificate in the chain must be a self signed one.");
__gaa_helpsingle(0, "load-privkey", "FILE ", "Private key file to use.");
__gaa_helpsingle(0, "load-request", "FILE ", "Certificate request file to use.");
__gaa_helpsingle(0, "load-certificate", "FILE ", "Certificate file to use.");
diff --git a/src/certtool.c b/src/certtool.c
index 303022e1cb..7004cb34e8 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -46,7 +46,7 @@ char input[128];
int ret;
fputs( input_str, stderr);
- fgets( input, sizeof(input), infile);
+ fgets( input, sizeof(input), stdin);
if (strlen(input)==1) /* only newline */ return;
@@ -63,7 +63,7 @@ char input[128];
int ret;
fputs( input_str, stderr);
- fgets( input, sizeof(input), infile);
+ fgets( input, sizeof(input), stdin);
if (strlen(input)==1) /* only newline */ return;
@@ -79,7 +79,7 @@ static int read_int( const char* input_str)
char input[128];
fputs( input_str, stderr);
- fgets( input, sizeof(input), infile);
+ fgets( input, sizeof(input), stdin);
if (strlen(input)==1) /* only newline */ return 0;
@@ -91,7 +91,7 @@ static const char* read_str( const char* input_str)
static char input[128];
fputs( input_str, stderr);
- fgets( input, sizeof(input), infile);
+ fgets( input, sizeof(input), stdin);
input[strlen(input)-1] = 0;
@@ -105,7 +105,7 @@ static int read_yesno( const char* input_str)
char input[128];
fputs( input_str, stderr);
- fgets( input, sizeof(input), infile);
+ fgets( input, sizeof(input), stdin);
if (strlen(input)==1) /* only newline */ return 0;
diff --git a/src/certtool.gaa b/src/certtool.gaa
index 9185d5f4b4..5f07db911c 100644
--- a/src/certtool.gaa
+++ b/src/certtool.gaa
@@ -11,7 +11,7 @@ option (p, generate-privkey) { $action=1; } "Generate a private key."
option (q, generate-request) { $action=3; } "Generate a PKCS #10 certificate request."
-option (e, verify-chain) { $action=5; } "Verify a certificate chain. The last certificate in the chain must be a self signed one."
+option (e, verify-chain) { $action=5; } "Verify a PEM encoded certificate chain. The last certificate in the chain must be a self signed one."
#char *privkey;
option (load-privkey) STR "FILE" { $privkey = $1 } "Private key file to use."