Added function to copy extensions from a CRL to a certificate.

Reduced many warnings (and added more by defining gnutls_log as printf like function --gcc only)

1 files changed, 16 insertions, 0 deletions

diff --git a/src/certtool-cfg.c b/src/certtool-cfg.c
index ec9fb459ee..5634ce7f5c 100644
--- a/src/certtool-cfg.c
+++ b/src/certtool-cfg.c
@@ -74,6 +74,7 @@ typedef struct _cfg_ctx
   int time_stamping_key;
   int crl_next_update;
   int crl_number;
+  int crq_extensions;
   char *proxy_policy_language;
 } cfg_ctx;
 
@@ -135,6 +136,7 @@ template_parse (const char *template)
      (void *) &cfg.crl_number, 0},
 
     {NULL, '\0', "ca", CFG_BOOL, (void *) &cfg.ca, 0},
+    {NULL, '\0', "honor_crq_extensions", CFG_BOOL, (void *) &cfg.crq_extensions, 0},
     {NULL, '\0', "path_len", CFG_INT, (void *) &cfg.path_len, 0},
     {NULL, '\0', "tls_www_client", CFG_BOOL,
      (void *) &cfg.tls_www_client, 0},
@@ -665,6 +667,20 @@ get_ca_status (void)
 }
 
 int
+get_crq_extensions_status (void)
+{
+  if (batch)
+    {
+      return cfg.crq_extensions;
+    }
+  else
+    {
+      return
+	read_yesno ("Do you want to honour the extensions from the request? (y/N): ");
+    }
+}
+
+int
 get_crl_number (void)
 {
   if (batch)