From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Fri, 8 Mar 2013 17:56:18 +0000 (+0100)
Subject: simplified
X-Git-Tag: gnutls_3_1_10~36
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=49ee637f9909c16c4f03be3a6d0f017bf6f9ff30;p=thirdparty%2Fgnutls.git

simplified
---

diff --git a/lib/gnutls_x509.c b/lib/gnutls_x509.c
index 9dbee218c7..bbcd84a532 100644
--- a/lib/gnutls_x509.c
+++ b/lib/gnutls_x509.c
@@ -918,11 +918,13 @@ read_key_file (gnutls_certificate_credentials_t res,
   size_t size;
   char *data;
 
-  if (gnutls_url_is_supported(keyfile))
-    return read_key_url (res, keyfile);
-
-  if (_gnutls_url_is_known(keyfile))
-    return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
+  if (_gnutls_url_is_known(keyfile)) 
+    {
+      if (gnutls_url_is_supported(keyfile))
+        return read_key_url (res, keyfile);
+      else
+        return gnutls_assert_val(GNUTLS_E_UNIMPLEMENTED_FEATURE);
+  }
 
   data = read_binary_file (keyfile, &size);