Import PKCS #12 keys

2 files changed, 35 insertions, 2 deletions

diff --git a/tests/key-openssl.c b/tests/key-openssl.c
index 9d2ef9d460..02d174ed16 100644
--- a/tests/key-openssl.c
+++ b/tests/key-openssl.c
@@ -106,8 +106,21 @@ doit (void)
     {
       fail ("gnutls_x509_privkey_import_openssl (key2): %s\n", gnutls_strerror(ret)) ;
     }
+
   gnutls_x509_privkey_deinit (pkey);
 
+  ret = gnutls_x509_privkey_init (&pkey);
+  if (ret < 0)
+     fail ("gnutls_x509_privkey_init: %d\n", ret);
+
+  key.data = (void*)key1;
+  key.size = sizeof(key1);
+  ret = gnutls_x509_privkey_import2 (pkey, &key, GNUTLS_X509_FMT_PEM, "123456", 0);
+  if (ret < 0)
+    {
+      fail ("gnutls_x509_privkey_import2: %s\n", gnutls_strerror(ret)) ;
+    }
+  gnutls_x509_privkey_deinit (pkey);
 
   gnutls_global_deinit ();
 }
diff --git a/tests/pkcs12_simple.c b/tests/pkcs12_simple.c
index ad17c0e413..5da59ef154 100644
--- a/tests/pkcs12_simple.c
+++ b/tests/pkcs12_simple.c
@@ -30,6 +30,12 @@
 #include <gnutls/x509.h>
 #include "utils.h"
 
+static void
+tls_log_func (int level, const char *str)
+{
+  fprintf (stderr, "<%d>| %s", level, str);
+}
+
 void
 doit (void)
 {
@@ -47,6 +53,10 @@ doit (void)
   if (ret < 0)
     fail ("gnutls_global_init failed %d\n", ret);
 
+  gnutls_global_set_log_function (tls_log_func);
+  if (debug)
+    gnutls_global_set_log_level (2);
+
   ret = gnutls_pkcs12_init(&pkcs12);
   if (ret < 0)
     fail ("initialization failed: %s\n", gnutls_strerror(ret));
@@ -70,8 +80,6 @@ doit (void)
   if (ret < 0)
     fail ("pkcs12_import failed %d: %s\n", ret, gnutls_strerror (ret));
 
-  free(file_data);
-
   if (debug)
     success ("Read file OK\n");
 
@@ -116,6 +124,18 @@ doit (void)
   for (i=0;i<extras_size;i++)
     gnutls_x509_crt_deinit(extras[i]);
   gnutls_free(extras);
+  
+  /* Try gnutls_x509_privkey_import2() */
+  ret = gnutls_x509_privkey_init(&pkey);
+  if (ret < 0)
+    fail ("gnutls_x509_privkey_init failed %d: %s\n", ret, gnutls_strerror (ret));
+
+  ret = gnutls_x509_privkey_import2(pkey, &data, GNUTLS_X509_FMT_DER, password, 0);
+  if (ret < 0)
+    fail ("gnutls_x509_privkey_import2 failed %d: %s\n", ret, gnutls_strerror (ret));
+  gnutls_x509_privkey_deinit(pkey);
+
+  free(file_data);
 
   gnutls_global_deinit ();
 }