From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sat, 18 Dec 2010 10:54:55 +0000 (+0100)
Subject: The default input format for p11tool is PEM.
X-Git-Tag: gnutls_2_11_7~116
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dc6c1be344ff3641b8e5c1e301a466427bd02b49;p=thirdparty%2Fgnutls.git

The default input format for p11tool is PEM.
---

diff --git a/src/p11tool-gaa.c b/src/p11tool-gaa.c
index 99dab2faf6..83976f0b37 100644
--- a/src/p11tool-gaa.c
+++ b/src/p11tool-gaa.c
@@ -727,14 +727,14 @@ static int gaa_try(int gaa_num, int gaa_index, gaainfo *gaaval, char *opt_list)
 	case GAAOPTID_inraw:
 	OK = 0;
 #line 69 "p11tool.gaa"
-{ gaaval->incert_format=1 ;};
+{ gaaval->incert_format=GNUTLS_X509_FMT_DER ;};
 
 		return GAA_OK;
 		break;
 	case GAAOPTID_inder:
 	OK = 0;
 #line 68 "p11tool.gaa"
-{ gaaval->incert_format=1 ;};
+{ gaaval->incert_format=GNUTLS_X509_FMT_DER ;};
 
 		return GAA_OK;
 		break;
@@ -940,10 +940,11 @@ int gaa(int argc, char **argv, gaainfo *gaaval)
     {
 
 #line 85 "p11tool.gaa"
-{ 	gaaval->action = -1; gaaval->pkcs11_provider= NULL; gaaval->outfile = NULL; gaaval->pubkey = NULL; gaaval->privkey = NULL;
+{
+	gaaval->action = -1; gaaval->pkcs11_provider= NULL; gaaval->outfile = NULL; gaaval->pubkey = NULL; gaaval->privkey = NULL;
 	gaaval->pkcs11_url = NULL; gaaval->pkcs11_type = PKCS11_TYPE_PK; gaaval->pubkey=NULL; gaaval->pkcs11_label = NULL; 
 	gaaval->pkcs11_trusted=0; gaaval->pkcs11_login = 0; gaaval->pkcs11_detailed_url = GNUTLS_PKCS11_URL_LIB; 
-	gaaval->secret_key = NULL; gaaval->cert = NULL; gaaval->incert_format = 0; ;};
+	gaaval->secret_key = NULL; gaaval->cert = NULL; gaaval->incert_format = GNUTLS_X509_FMT_PEM; ;};
 
     }
     inited = 1;
diff --git a/src/p11tool.gaa b/src/p11tool.gaa
index 256aad21cd..7c2ca91dc9 100644
--- a/src/p11tool.gaa
+++ b/src/p11tool.gaa
@@ -65,8 +65,8 @@ option (load-certificate) STR "FILE" { $cert = $1 } "Certificate file to use."
 option (8, pkcs8) { $pkcs8=1 } "Use PKCS #8 format for private keys."
 
 #int incert_format;
-option (inder) { $incert_format=1 } "Use DER format for input certificates and private keys."
-option (inraw) { $incert_format=1 } "Use RAW/DER format for input certificates and private keys."
+option (inder) { $incert_format=GNUTLS_X509_FMT_DER } "Use DER format for input certificates and private keys."
+option (inraw) { $incert_format=GNUTLS_X509_FMT_DER } "Use RAW/DER format for input certificates and private keys."
 
 #char* pkcs11_provider;
 #int action;
@@ -86,4 +86,4 @@ init {
 	$action = -1; $pkcs11_provider= NULL; $outfile = NULL; $pubkey = NULL; $privkey = NULL;
 	$pkcs11_url = NULL; $pkcs11_type = PKCS11_TYPE_PK; $pubkey=NULL; $pkcs11_label = NULL; 
 	$pkcs11_trusted=0; $pkcs11_login = 0; $pkcs11_detailed_url = GNUTLS_PKCS11_URL_LIB; 
-	$secret_key = NULL; $cert = NULL; $incert_format = 0; }
+	$secret_key = NULL; $cert = NULL; $incert_format = GNUTLS_X509_FMT_PEM; }