[SCM] GNU gnutls branch, master, updated. gnutls_3_0_18-164-gc83354f

[Nikos Mavrogiannopoulos]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU gnutls".

http://git.savannah.gnu.org/cgit/gnutls.git/commit/?id=c83354f4c329e685c43c1d28a1b2bcc988886b99

The branch, master has been updated
       via  c83354f4c329e685c43c1d28a1b2bcc988886b99 (commit)
      from  8db3a62d989479d9d2d52423724886185f2d708c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c83354f4c329e685c43c1d28a1b2bcc988886b99
Author: Nikos Mavrogiannopoulos <address@hidden>
Date:   Tue Jun 26 00:11:05 2012 +0200

    added missing file

-----------------------------------------------------------------------

Summary of changes:
 src/certtool-extras.c |  111 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 files changed, 111 insertions(+), 0 deletions(-)
 create mode 100644 src/certtool-extras.c

diff --git a/src/certtool-extras.c b/src/certtool-extras.c
new file mode 100644
index 0000000..8ea890e
--- /dev/null
+++ b/src/certtool-extras.c
@@ -0,0 +1,111 @@
+/*
+ * Copyright (C) 2012 Lucas Fisher *lucas.fisher [at] gmail.com*
+ * Copyright (C) 2012 Free Software Foundation, Inc.
+ *
+ * This file is part of GnuTLS.
+ *
+ * GnuTLS is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * GnuTLS is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see
+ * <http://www.gnu.org/licenses/>.
+ */
+
+#include <config.h>
+
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+#include <gnutls/openpgp.h>
+#include <gnutls/pkcs12.h>
+#include <gnutls/pkcs11.h>
+#include <gnutls/abstract.h>
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <ctype.h>
+#include <time.h>
+#include <unistd.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <error.h>
+#include "certtool-common.h"
+#include "certtool-cfg.h"
+
+
+#define MAX_KEYS 256
+
+/* Loads a x509 private key list
+ */
+gnutls_x509_privkey_t *
+load_privkey_list (int mand, size_t * privkey_size, common_info_st * info)
+{
+  static gnutls_x509_privkey_t key[MAX_KEYS];
+  char *ptr;
+  int ret, i;
+  gnutls_datum_t dat, file_data;
+  int ptr_size;
+
+  *privkey_size = 0;
+  fprintf (stderr, "Loading private key list...\n");
+
+  if (info->privkey == NULL)
+    {
+      if (mand)
+        error (EXIT_FAILURE, 0, "missing --load-privkey");
+      else
+        return NULL;
+    }
+
+  ret = gnutls_load_file(info->privkey, &file_data);
+  if (ret < 0)
+    error (EXIT_FAILURE, errno, "%s", info->privkey);
+
+  ptr = (void*)file_data.data;
+  ptr_size = file_data.size;
+
+  for (i = 0; i < MAX_KEYS; i++)
+    {
+      ret = gnutls_x509_privkey_init (&key[i]);
+      if (ret < 0)
+        error (EXIT_FAILURE, 0, "privkey_init: %s", gnutls_strerror (ret));
+
+      dat.data = (void*)ptr;
+      dat.size = ptr_size;
+
+      ret = gnutls_x509_privkey_import (key[i], &dat, info->incert_format);
+      if (ret < 0 && *privkey_size > 0)
+        break;
+      if (ret < 0)
+        error (EXIT_FAILURE, 0, "privkey_import: %s", gnutls_strerror (ret));
+
+      ptr = strstr (ptr, "---END");
+      if (ptr == NULL)
+        break;
+      ptr++;
+
+      ptr_size = file_data.size;
+      ptr_size -=
+        (unsigned int) ((unsigned char *) ptr - (unsigned char *) buffer);
+
+      if (ptr_size < 0)
+        break;
+
+      (*privkey_size)++;
+    }
+  
+  gnutls_free(file_data.data);
+  fprintf (stderr, "Loaded %d private keys.\n", (int) *privkey_size);
+
+  return key;
+}


hooks/post-receive
-- 
GNU gnutls