[SCM] GNU gnutls branch, master, updated. gnutls_2_9_7-5-g853ae78

[Simon Josefsson]

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=853ae78361a454db308ee602f006158863f2f6c0

The branch, master has been updated
       via  853ae78361a454db308ee602f006158863f2f6c0 (commit)
      from  9eba9e651a08dc69cafffad162d21a0ccb5c4dc3 (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 853ae78361a454db308ee602f006158863f2f6c0
Author: Simon Josefsson <address@hidden>
Date:   Wed Oct 14 17:16:08 2009 +0200

    Add self test to test PKCS#12 functions.

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

Summary of changes:
 tests/Makefile.am     |    2 +-
 tests/pkcs12_encode.c |  170 +++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 171 insertions(+), 1 deletions(-)
 create mode 100644 tests/pkcs12_encode.c

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 4779c64..1d68bdc 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -58,7 +58,7 @@ ctests = simple gc set_pkcs12_cred certder mpi                
                \
        finished hostname-check cve-2008-4989 pkcs12_s2k chainverify    \
        crq_key_id x509sign-verify cve-2009-1415 cve-2009-1416          \
        crq_apis init_roundtrip pkcs12_s2k_pem dn2 mini-eagain          \
-       nul-in-x509-names x509_altname
+       nul-in-x509-names x509_altname pkcs12_encode
 
 if ENABLE_OPENSSL
 ctests +=  openssl
diff --git a/tests/pkcs12_encode.c b/tests/pkcs12_encode.c
new file mode 100644
index 0000000..8d0b434
--- /dev/null
+++ b/tests/pkcs12_encode.c
@@ -0,0 +1,170 @@
+/*
+ * Copyright (C) 2009 Free Software Foundation
+ *
+ * Author: Simon Josefsson
+ *
+ * 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 GNUTLS; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
+ */
+
+#ifdef HAVE_CONFIG_H
+# include <config.h>
+#endif
+
+#include <gnutls/gnutls.h>
+#include <gnutls/x509.h>
+#include <gnutls/pkcs12.h>
+
+#include <error.h>
+#include <stdio.h>
+#include <stdlib.h>
+
+static char client_pem[] =
+  "-----BEGIN CERTIFICATE-----\n"
+  "MIICHjCCAYmgAwIBAgIERiYdNzALBgkqhkiG9w0BAQUwGTEXMBUGA1UEAxMOR251\n"
+  "VExTIHRlc3QgQ0EwHhcNMDcwNDE4MTMyOTI3WhcNMDgwNDE3MTMyOTI3WjAdMRsw\n"
+  "GQYDVQQDExJHbnVUTFMgdGVzdCBjbGllbnQwgZwwCwYJKoZIhvcNAQEBA4GMADCB\n"
+  "iAKBgLtmQ/Xyxde2jMzF3/WIO7HJS2oOoa0gUEAIgKFPXKPQ+GzP5jz37AR2ExeL\n"
+  "ZIkiW8DdU3w77XwEu4C5KL6Om8aOoKUSy/VXHqLnu7czSZ/ju0quak1o/8kR4jKN\n"
+  "zj2AC41179gAgY8oBAOgIo1hBAf6tjd9IQdJ0glhaZiQo1ipAgMBAAGjdjB0MAwG\n"
+  "A1UdEwEB/wQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwIwDwYDVR0PAQH/BAUDAweg\n"
+  "ADAdBgNVHQ4EFgQUTLkKm/odNON+3svSBxX+odrLaJEwHwYDVR0jBBgwFoAU6Twc\n"
+  "+62SbuYGpFYsouHAUyfI8pUwCwYJKoZIhvcNAQEFA4GBALujmBJVZnvaTXr9cFRJ\n"
+  "jpfc/3X7sLUsMvumcDE01ls/cG5mIatmiyEU9qI3jbgUf82z23ON/acwJf875D3/\n"
+  "U7jyOsBJ44SEQITbin2yUeJMIm1tievvdNXBDfW95AM507ShzP12sfiJkJfjjdhy\n"
+  "dc8Siq5JojruiMizAf0pA7in\n"
+  "-----END CERTIFICATE-----\n";
+const gnutls_datum_t client_dat = { client_pem, sizeof (client_pem) };
+
+static char ca_pem[] =
+  "-----BEGIN CERTIFICATE-----\n"
+  "MIIB5zCCAVKgAwIBAgIERiYdJzALBgkqhkiG9w0BAQUwGTEXMBUGA1UEAxMOR251\n"
+  "VExTIHRlc3QgQ0EwHhcNMDcwNDE4MTMyOTExWhcNMDgwNDE3MTMyOTExWjAZMRcw\n"
+  "FQYDVQQDEw5HbnVUTFMgdGVzdCBDQTCBnDALBgkqhkiG9w0BAQEDgYwAMIGIAoGA\n"
+  "vuyYeh1vfmslnuggeEKgZAVmQ5ltSdUY7H25WGSygKMUYZ0KT74v8C780qtcNt9T\n"
+  "7EPH/N6RvB4BprdssgcQLsthR3XKA84jbjjxNCcaGs33lvOz8A1nf8p3hD+cKfRi\n"
+  "kfYSW2JazLrtCC4yRCas/SPOUxu78of+3HiTfFm/oXUCAwEAAaNDMEEwDwYDVR0T\n"
+  "AQH/BAUwAwEB/zAPBgNVHQ8BAf8EBQMDBwQAMB0GA1UdDgQWBBTpPBz7rZJu5gak\n"
+  "Viyi4cBTJ8jylTALBgkqhkiG9w0BAQUDgYEAiaIRqGfp1jPpNeVhABK60SU0KIAy\n"
+  "njuu7kHq5peUgYn8Jd9zNzExBOEp1VOipGsf6G66oQAhDFp2o8zkz7ZH71zR4HEW\n"
+  "KoX6n5Emn6DvcEH/9pAhnGxNHJAoS7czTKv/JDZJhkqHxyrE1fuLsg5Qv25DTw7+\n"
+  "PfqUpIhz5Bbm7J4=\n"
+  "-----END CERTIFICATE-----\n";
+const gnutls_datum_t ca_dat = { ca_pem, sizeof (ca_pem) };
+
+int
+main (void)
+{
+  gnutls_pkcs12_t pkcs12;
+  gnutls_x509_crt_t client;
+  gnutls_x509_crt_t ca;
+  gnutls_pkcs12_bag_t bag;
+  char key_id_buf[20];
+  gnutls_datum_t key_id;
+  int ret, indx;
+  char outbuf[10240];
+  size_t size;
+  int i;
+
+  ret = gnutls_global_init ();
+  if (ret < 0)
+    error (EXIT_FAILURE, 0, "gnutls_global_init %d", ret);
+
+  /* Read certs. */
+  ret = gnutls_x509_crt_init (&client);
+  if (ret < 0)
+    error (EXIT_FAILURE, 0, "crt_init: %d", ret);
+
+  ret = gnutls_x509_crt_import (client, &client_dat, GNUTLS_X509_FMT_PEM);
+  if (ret < 0)
+    error (EXIT_FAILURE, 0, "crt_import: %d", ret);
+
+  ret = gnutls_x509_crt_init (&ca);
+  if (ret < 0)
+    error (EXIT_FAILURE, 0, "ca_init: %d", ret);
+
+  ret = gnutls_x509_crt_import (ca, &ca_dat, GNUTLS_X509_FMT_PEM);
+  if (ret < 0)
+    error (EXIT_FAILURE, 0, "ca_import: %d", ret);
+
+  /* Create PKCS#12 structure. */
+  ret = gnutls_pkcs12_init (&pkcs12);
+  if (ret < 0)
+    error (EXIT_FAILURE, 0, "pkcs12_init: %d", ret);
+
+  /* Generate and add PKCS#12 cert bags. */
+  for (i = 0; i < 2; i++)
+    {
+      ret = gnutls_pkcs12_bag_init (&bag);
+      if (ret < 0)
+       error (EXIT_FAILURE, 0, "bag_init: %d", ret);
+
+      ret = gnutls_pkcs12_bag_set_crt (bag, i == 0 ? client : ca);
+      if (ret < 0)
+       error (EXIT_FAILURE, 0, "set_crt: %d", ret);
+
+      indx = ret;
+
+      ret = gnutls_pkcs12_bag_set_friendly_name (bag, indx, "friendly name");
+      if (ret < 0)
+       error (EXIT_FAILURE, 0, "set_friendly_name: %d", ret);
+
+      size = sizeof (key_id_buf);
+      ret = gnutls_x509_crt_get_key_id (i == 0 ? client : ca, 0,
+                                       key_id_buf, &size);
+      if (ret < 0)
+       error (EXIT_FAILURE, 0, "get_key_id: %d", ret);
+
+      key_id.data = key_id_buf;
+      key_id.size = size;
+
+      ret = gnutls_pkcs12_bag_set_key_id (bag, indx, &key_id);
+      if (ret < 0)
+       error (EXIT_FAILURE, 0, "bag_set_key_id: %d", ret);
+
+      ret = gnutls_pkcs12_bag_encrypt (bag, "password",
+                                      i == 0 ? GNUTLS_PKCS8_USE_PKCS12_3DES
+                                      : GNUTLS_PKCS_USE_PKCS12_RC2_40);
+      if (ret < 0)
+       error (EXIT_FAILURE, 0, "bag_encrypt: %d", ret);
+
+      /* Set PKCS#12 structure. */
+      ret = gnutls_pkcs12_set_bag (pkcs12, bag);
+      if (ret < 0)
+       error (EXIT_FAILURE, 0, "set_bag: %d", ret);
+
+      gnutls_pkcs12_bag_deinit (bag);
+    }
+
+  ret = gnutls_pkcs12_generate_mac (pkcs12, "mac pass");
+  if (ret < 0)
+    error (EXIT_FAILURE, 0, "generate_mac: %d", ret);
+
+  size = sizeof (outbuf);
+  ret = gnutls_pkcs12_export (pkcs12, GNUTLS_X509_FMT_PEM, outbuf, &size);
+  if (ret < 0)
+    error (EXIT_FAILURE, 0, "pkcs12_export: %d", ret);
+
+  fwrite (outbuf, size, 1, stdout);
+
+  /* Cleanup. */
+  gnutls_pkcs12_deinit (pkcs12);
+  gnutls_x509_crt_deinit (client);
+  gnutls_x509_crt_deinit (ca);
+  gnutls_global_deinit ();
+
+  return 0;
+}


hooks/post-receive
-- 
GNU gnutls