From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 8 Mar 2013 17:53:10 +0000 (+0100)
Subject: Return proper also when loading a private key.
X-Git-Tag: gnutls_3_1_10~37
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7ca8d0be82fb8b0e280178449ed0f8edd2d8346a;p=thirdparty%2Fgnutls.git

Return proper also when loading a private key.
---

diff --git a/lib/gnutls_ui.c b/lib/gnutls_ui.c
index 5eae2c2f79..321b2f724e 100644
--- a/lib/gnutls_ui.c
+++ b/lib/gnutls_ui.c
@@ -809,32 +809,6 @@ size_t len;
   return 0;
 }
 
-/**
- * gnutls_url_is_supported:
- * @url: A PKCS 11 url
- *
- * Check whether url is supported.  Depending on the system libraries
- * GnuTLS may support pkcs11 or tpmkey URLs.
- *
- * Returns: return non-zero if the given URL is supported, and zero if
- * it is not known.
- *
- * Since: 3.1.0
- **/
-int
-gnutls_url_is_supported (const char* url)
-{
-#ifdef ENABLE_PKCS11
-  if (strstr(url, "pkcs11:") != NULL)
-    return 1;
-#endif
-#ifdef HAVE_TROUSERS
-  if (strstr(url, "tpmkey:") != NULL)
-    return 1;
-#endif
-  return 0;
-}
-
 /**
  * gnutls_ocsp_status_request_is_checked:
  * @session: is a gnutls session
diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 8a7cbbb6d6..9dbee218c7 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -919,9 +919,10 @@ read_key_file (gnutls_certificate_credentials_t res,
   char *data;
 
   if (gnutls_url_is_supported(keyfile))
-    {
-      return read_key_url (res, keyfile);
-    }
+    return read_key_url (res, keyfile);
+
+  if (_gnutls_url_is_known(keyfile))
+    return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
 
   data = read_binary_file (keyfile, &size);
 
@@ -2150,3 +2151,41 @@ void gnutls_certificate_set_pin_function (gnutls_certificate_credentials_t cred,
   cred->pin.cb = fn;
   cred->pin.data = userdata;
 }
+
+/**
+ * gnutls_url_is_supported:
+ * @url: A PKCS 11 url
+ *
+ * Check whether url is supported.  Depending on the system libraries
+ * GnuTLS may support pkcs11 or tpmkey URLs.
+ *
+ * Returns: return non-zero if the given URL is supported, and zero if
+ * it is not known.
+ *
+ * Since: 3.1.0
+ **/
+int
+gnutls_url_is_supported (const char* url)
+{
+#ifdef ENABLE_PKCS11
+  if (strstr(url, "pkcs11:") != NULL)
+    return 1;
+#endif
+#ifdef HAVE_TROUSERS
+  if (strstr(url, "tpmkey:") != NULL)
+    return 1;
+#endif
+  return 0;
+}
+
+int
+_gnutls_url_is_known (const char* url)
+{
+  if (strstr(url, "pkcs11:") != NULL)
+    return 1;
+  else if (strstr(url, "tpmkey:") != NULL)
+    return 1;
+  else
+    return 0;
+}
+
diff --git a/lib/gnutls_x509.h b/lib/gnutls_x509.h
index 8e12f3d802..b7c33debfd 100644
--- a/lib/gnutls_x509.h
+++ b/lib/gnutls_x509.h
@@ -32,8 +32,7 @@ int _gnutls_x509_cert_verify_peers (gnutls_session_t session,
 
 #define PEM_CRL_SEP "-----BEGIN X509 CRL"
 
-#define PEM_KEY_RSA_SEP "-----BEGIN RSA"
-#define PEM_KEY_DSA_SEP "-----BEGIN DSA"
+int _gnutls_url_is_known (const char* url);
 
 int _gnutls_check_key_usage (const gnutls_pcert_st* cert,
                              gnutls_kx_algorithm_t alg);