*** empty log message ***

4 files changed, 32 insertions, 31 deletions

diff --git a/src/certtool-gaa.c b/src/certtool-gaa.c
index 5a86602411..b481c601e1 100644
--- a/src/certtool-gaa.c
+++ b/src/certtool-gaa.c
@@ -131,7 +131,7 @@ void gaa_help(void)
 	__gaa_helpsingle('i', "certificate-info", "", "Print information on a certificate.");
 	__gaa_helpsingle('k', "key-info", "", "Print information on a private key.");
 	__gaa_helpsingle('8', "pkcs8", "", "Use PKCS #8 format for private keys.");
-	__gaa_helpsingle(0, "der", "", "Use DER format for certificates and private keys.");
+	__gaa_helpsingle(0, "inder", "", "Use DER format for input certificates and private keys.");
 	__gaa_helpsingle(0, "bits", "BITS ", "specify the number of bits for key generation.");
 	__gaa_helpsingle(0, "outfile", "FILE ", "Output file.");
 	__gaa_helpsingle(0, "infile", "FILE ", "Output file.");
@@ -161,7 +161,7 @@ struct _gaainfo
 #line 42 "certtool.gaa"
 	int bits;
 #line 39 "certtool.gaa"
-	int cert_format;
+	int incert_format;
 #line 36 "certtool.gaa"
 	int pkcs8;
 #line 28 "certtool.gaa"
@@ -237,7 +237,7 @@ int gaa_error = 0;
 #define GAAOPTID_infile	4
 #define GAAOPTID_outfile	5
 #define GAAOPTID_bits	6
-#define GAAOPTID_der	7
+#define GAAOPTID_inder	7
 #define GAAOPTID_pkcs8	8
 #define GAAOPTID_key_info	9
 #define GAAOPTID_certificate_info	10
@@ -534,7 +534,7 @@ int gaa_get_option_num(char *str, int status)
 #line 375 "gaa.skel"
 			GAA_CHECK1STR("v", GAAOPTID_version);
 			GAA_CHECK1STR("h", GAAOPTID_help);
-			GAA_CHECK1STR("", GAAOPTID_der);
+			GAA_CHECK1STR("", GAAOPTID_inder);
 			GAA_CHECK1STR("8", GAAOPTID_pkcs8);
 			GAA_CHECK1STR("k", GAAOPTID_key_info);
 			GAA_CHECK1STR("i", GAAOPTID_certificate_info);
@@ -554,7 +554,7 @@ int gaa_get_option_num(char *str, int status)
 			GAA_CHECKSTR("infile", GAAOPTID_infile);
 			GAA_CHECKSTR("outfile", GAAOPTID_outfile);
 			GAA_CHECKSTR("bits", GAAOPTID_bits);
-			GAA_CHECKSTR("der", GAAOPTID_der);
+			GAA_CHECKSTR("inder", GAAOPTID_inder);
 			GAA_CHECKSTR("pkcs8", GAAOPTID_pkcs8);
 			GAA_CHECKSTR("key-info", GAAOPTID_key_info);
 			GAA_CHECKSTR("certificate-info", GAAOPTID_certificate_info);
@@ -664,10 +664,10 @@ int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 
 		return GAA_OK;
 		break;
-	case GAAOPTID_der:
+	case GAAOPTID_inder:
 	OK = 0;
 #line 40 "certtool.gaa"
-{ gaaval->cert_format=1 ;};
+{ gaaval->incert_format=1 ;};
 
 		return GAA_OK;
 		break;
@@ -811,7 +811,7 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
 #line 58 "certtool.gaa"
 { gaaval->bits = 1024; 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->cert_format = 0; ;};
+	gaaval->incert_format = 0; ;};
 
     }
     inited = 1;
diff --git a/src/certtool-gaa.h b/src/certtool-gaa.h
index 5b28a139b1..06645ecb30 100644
--- a/src/certtool-gaa.h
+++ b/src/certtool-gaa.h
@@ -17,7 +17,7 @@ struct _gaainfo
 #line 42 "certtool.gaa"
 	int bits;
 #line 39 "certtool.gaa"
-	int cert_format;
+	int incert_format;
 #line 36 "certtool.gaa"
 	int pkcs8;
 #line 28 "certtool.gaa"
diff --git a/src/certtool.c b/src/certtool.c
index 7004cb34e8..a8fef86a65 100644
--- a/src/certtool.c
+++ b/src/certtool.c
@@ -21,7 +21,8 @@ void generate_request(void);
 static gaainfo info;
 FILE* outfile;
 FILE* infile;
-int cert_format;
+int in_cert_format;
+int out_cert_format = GNUTLS_X509_FMT_PEM;
 
 static unsigned char buffer[40*1024];
 static const int buffer_size = sizeof(buffer);
@@ -168,14 +169,14 @@ int size, ret;
 
 	if (!info.pkcs8) {
 		size = sizeof(buffer);
-		ret = gnutls_x509_privkey_export( key, cert_format, buffer, &size);	
+		ret = gnutls_x509_privkey_export( key, out_cert_format, buffer, &size);	
 		if (ret < 0) {
 			fprintf(stderr, "privkey_export: %s\n", gnutls_strerror(ret));
 			exit(1);
 		}
 	} else {
 		size = sizeof(buffer);
-		ret = gnutls_x509_privkey_export_pkcs8( key, cert_format, NULL, GNUTLS_PKCS8_PLAIN, buffer, &size);
+		ret = gnutls_x509_privkey_export_pkcs8( key, out_cert_format, NULL, GNUTLS_PKCS8_PLAIN, buffer, &size);
 		if (ret < 0) {
 			fprintf(stderr, "privkey_export_pkcs8: %s\n", gnutls_strerror(ret));
 			exit(1);
@@ -371,7 +372,7 @@ void generate_self_signed( void)
 	print_private_key( key);
 
 	size = sizeof(buffer);
-	result = gnutls_x509_crt_export( crt, cert_format, buffer, &size);	
+	result = gnutls_x509_crt_export( crt, out_cert_format, buffer, &size);	
 	if (result < 0) {
 		fprintf(stderr, "crt_export: %s\n", gnutls_strerror(result));
 		exit(1);
@@ -411,7 +412,7 @@ void generate_signed_certificate( void)
 	print_private_key( key);
 
 	size = sizeof(buffer);
-	result = gnutls_x509_crt_export( crt, cert_format, buffer, &size);	
+	result = gnutls_x509_crt_export( crt, out_cert_format, buffer, &size);	
 	if (result < 0) {
 		fprintf(stderr, "crt_export: %s\n", gnutls_strerror(result));
 		exit(1);
@@ -446,7 +447,7 @@ void update_signed_certificate( void)
 	}
 
 	size = sizeof(buffer);
-	result = gnutls_x509_crt_export( crt, cert_format, buffer, &size);	
+	result = gnutls_x509_crt_export( crt, out_cert_format, buffer, &size);	
 	if (result < 0) {
 		fprintf(stderr, "crt_export: %s\n", gnutls_strerror(result));
 		exit(1);
@@ -481,8 +482,8 @@ void gaa_parser(int argc, char **argv)
 		}
 	} else infile = stdin;
 	
-	if (info.cert_format) cert_format = GNUTLS_X509_FMT_DER;
-	else cert_format = GNUTLS_X509_FMT_PEM;
+	if (info.incert_format) in_cert_format = GNUTLS_X509_FMT_DER;
+	else in_cert_format = GNUTLS_X509_FMT_PEM;
 
 	gnutls_global_init();
 	gnutls_global_set_log_function( tls_log_func);
@@ -559,7 +560,7 @@ void certificate_info( void)
 	pem.data = buffer;
 	pem.size = size;
 	
-	ret = gnutls_x509_crt_import(crt, &pem, cert_format);
+	ret = gnutls_x509_crt_import(crt, &pem, in_cert_format);
 	if (ret < 0) {
 		fprintf(stderr, "Decoding error: %s\n", gnutls_strerror(ret));
 		exit(1);
@@ -732,9 +733,9 @@ void privkey_info( void)
 	pem.size = size;
 	
 	if (!info.pkcs8) {
-		ret = gnutls_x509_privkey_import(key, &pem, cert_format);
+		ret = gnutls_x509_privkey_import(key, &pem, in_cert_format);
 	} else {
-		ret = gnutls_x509_privkey_import_pkcs8(key, &pem, cert_format, NULL, GNUTLS_PKCS8_PLAIN);
+		ret = gnutls_x509_privkey_import_pkcs8(key, &pem, in_cert_format, NULL, GNUTLS_PKCS8_PLAIN);
 	}
 
 	if (ret < 0) {
@@ -800,9 +801,9 @@ size_t size;
 	dat.size = size;
 	
 	if (!info.pkcs8)
-		ret = gnutls_x509_privkey_import( key, &dat, cert_format);
+		ret = gnutls_x509_privkey_import( key, &dat, in_cert_format);
 	else
-		ret = gnutls_x509_privkey_import_pkcs8( key, &dat, cert_format,
+		ret = gnutls_x509_privkey_import_pkcs8( key, &dat, in_cert_format,
 			NULL, 0);
 	
 	if (ret < 0) {
@@ -843,7 +844,7 @@ size_t size;
 	dat.data = buffer;
 	dat.size = size;
 	
-	ret = gnutls_x509_crq_import( crq, &dat, cert_format);
+	ret = gnutls_x509_crq_import( crq, &dat, in_cert_format);
 	
 	if (ret < 0) {
 		fprintf(stderr, "crq_import: %s\n", gnutls_strerror(ret));
@@ -889,9 +890,9 @@ size_t size;
 	dat.size = size;
 	
 	if (!info.pkcs8)
-		ret = gnutls_x509_privkey_import( key, &dat, cert_format);
+		ret = gnutls_x509_privkey_import( key, &dat, in_cert_format);
 	else
-		ret = gnutls_x509_privkey_import_pkcs8( key, &dat, cert_format,
+		ret = gnutls_x509_privkey_import_pkcs8( key, &dat, in_cert_format,
 			NULL, 0);
 	
 	if (ret < 0) {
@@ -939,7 +940,7 @@ size_t size;
 	dat.data = buffer;
 	dat.size = size;
 	
-	ret = gnutls_x509_crt_import( crt, &dat, cert_format);
+	ret = gnutls_x509_crt_import( crt, &dat, in_cert_format);
 	if (ret < 0) {
 		fprintf(stderr, "crt_import: %s\n", gnutls_strerror(ret));
 		exit(1);
@@ -985,7 +986,7 @@ size_t size;
 	dat.data = buffer;
 	dat.size = size;
 	
-	ret = gnutls_x509_crt_import( crt, &dat, cert_format);
+	ret = gnutls_x509_crt_import( crt, &dat, in_cert_format);
 	if (ret < 0) {
 		fprintf(stderr, "crt_import: %s\n", gnutls_strerror(ret));
 		exit(1);
@@ -1056,7 +1057,7 @@ void generate_request(void)
 	print_private_key( key);
 
 	size = sizeof(buffer);	
-	ret = gnutls_x509_crq_export( crq, cert_format, buffer, &size);	
+	ret = gnutls_x509_crq_export( crq, out_cert_format, buffer, &size);	
 	if (ret < 0) {
 		fprintf(stderr, "export: %s\n", gnutls_strerror(ret));
 		exit(1);
diff --git a/src/certtool.gaa b/src/certtool.gaa
index 5f07db911c..ee69759fe9 100644
--- a/src/certtool.gaa
+++ b/src/certtool.gaa
@@ -36,8 +36,8 @@ option (k, key-info) { $action = 6; } "Print information on a private key."
 #int pkcs8;
 option (8, pkcs8) { $pkcs8=1 } "Use PKCS #8 format for private keys."
 
-#int cert_format;
-option (der) { $cert_format=1 } "Use DER format for certificates and private keys."
+#int incert_format;
+option (inder) { $incert_format=1 } "Use DER format for input certificates and private keys."
 
 #int bits;
 option (bits) INT "BITS" { $bits = $1 } "specify the number of bits for key generation."
@@ -57,5 +57,5 @@ option (v, version) { certtool_version(); exit(0); } "shows the program version"
 
 init { $bits = 1024; $pkcs8 = 0; $privkey = NULL; $ca=NULL; $ca_privkey = NULL; 
 	$debug=1; $request = NULL; $infile = NULL; $outfile = NULL; $cert = NULL; 
-	$cert_format = 0; }
+	$incert_format = 0; }