From: Nikos Mavrogiannopoulos <nmav@gnutls.org>
Date: Sun, 3 Mar 2013 08:35:59 +0000 (+0100)
Subject: more simplifications to gnutls_x509_trust_list_add_system_trust()
X-Git-Tag: gnutls_3_1_10~74
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6503046fe8e2c49a13e4f3a7916d502fe97ed512;p=thirdparty%2Fgnutls.git

more simplifications to gnutls_x509_trust_list_add_system_trust()
---

diff --git a/lib/system.c b/lib/system.c
index 5f273fd5f0..a09f1354d7 100644
--- a/lib/system.c
+++ b/lib/system.c
@@ -385,9 +385,39 @@ const char *home_dir = getenv ("HOME");
   return 0;
 }
 
-#ifdef _WIN32
+#if defined(DEFAULT_TRUST_STORE_FILE) || (defined(DEFAULT_TRUST_STORE_PKCS11) && defined(ENABLE_PKCS11))
 static
-int add_win32_system_trust(gnutls_x509_trust_list_t list, unsigned int tl_flags, unsigned int tl_vflags)
+int
+add_system_trust(gnutls_x509_trust_list_t list,
+                 unsigned int tl_flags, unsigned int tl_vflags)
+{
+  int ret, r = 0;
+  const char* crl_file = 
+# ifdef DEFAULT_CRL_FILE
+  DEFAULT_CRL_FILE;
+# else
+  NULL;
+# endif
+
+# if defined(ENABLE_PKCS11) && defined(DEFAULT_TRUST_STORE_PKCS11)
+  ret = gnutls_x509_trust_list_add_trust_file(list, DEFAULT_TRUST_STORE_PKCS11, crl_file, 
+                                              GNUTLS_X509_FMT_DER, tl_flags, tl_vflags);
+  if (ret > 0)
+    r += ret;
+# endif
+
+# ifdef DEFAULT_TRUST_STORE_FILE
+  ret = gnutls_x509_trust_list_add_trust_file(list, DEFAULT_TRUST_STORE_FILE, crl_file, 
+                                              GNUTLS_X509_FMT_PEM, tl_flags, tl_vflags);
+  if (ret > 0)
+    r += ret;
+# endif
+
+  return r;
+}
+#elif defined(_WIN32)
+static
+int add_system_trust(gnutls_x509_trust_list_t list, unsigned int tl_flags, unsigned int tl_vflags)
 {
   char path[GNUTLS_PATH_MAX];
   unsigned int i;
@@ -435,9 +465,7 @@ int add_win32_system_trust(gnutls_x509_trust_list_t list, unsigned int tl_flags,
   
   return r;
 }
-#endif
-
-#ifdef ANDROID
+#elif defined(ANDROID)
 # include <dirent.h>
 
 static int load_dir_certs(const char* dirname, gnutls_x509_trust_list_t list, unsigned int tl_flags, unsigned int tl_vflags)
@@ -471,7 +499,7 @@ char path[GNUTLS_PATH_MAX];
 /* This works on android 4.x 
  */
 static
-int add_android_system_trust(gnutls_x509_trust_list_t list, unsigned int tl_flags, unsigned int tl_vflags)
+int add_system_trust(gnutls_x509_trust_list_t list, unsigned int tl_flags, unsigned int tl_vflags)
 {
   int r = 0, ret;
 
@@ -485,6 +513,10 @@ int add_android_system_trust(gnutls_x509_trust_list_t list, unsigned int tl_flag
   
   return r;
 }
+#else
+
+#define add_android_system_trust(x,y,z) GNUTLS_E_UNIMPLEMENTED_FEATURE
+
 #endif
 
 /**
@@ -505,41 +537,7 @@ int
 gnutls_x509_trust_list_add_system_trust(gnutls_x509_trust_list_t list,
                                         unsigned int tl_flags, unsigned int tl_vflags)
 {
-  int ret, r = 0;
-  const char* crl_file = 
-# ifdef DEFAULT_CRL_FILE
-  DEFAULT_CRL_FILE;
-# else
-  NULL;
-# endif
-
-# if defined(ENABLE_PKCS11) && defined(DEFAULT_TRUST_STORE_PKCS11)
-  ret = gnutls_x509_trust_list_add_trust_file(list, DEFAULT_TRUST_STORE_PKCS11, crl_file, 
-                                              GNUTLS_X509_FMT_DER, tl_flags, tl_vflags);
-  if (ret > 0)
-    r += ret;
-# endif
-
-# ifdef DEFAULT_TRUST_STORE_FILE
-  ret = gnutls_x509_trust_list_add_trust_file(list, DEFAULT_TRUST_STORE_FILE, crl_file, 
-                                              GNUTLS_X509_FMT_PEM, tl_flags, tl_vflags);
-  if (ret > 0)
-    r += ret;
-# endif
-
-#if defined(_WIN32)
-  ret = add_win32_system_trust(list, tl_flags, tl_vflags);
-  if (ret > 0)
-    r += ret;
-#elif defined(ANDROID)
-  ret = add_android_system_trust(list, tl_flags, tl_vflags);
-  if (ret > 0)
-    r += ret;
-#elif !defined(DEFAULT_TRUST_STORE_PKCS11) && !defined(DEFAULT_TRUST_STORE_FILE)
-  r = GNUTLS_E_UNIMPLEMENTED_FEATURE;
-#endif
-
-  return r;
+  return add_system_trust(list, tl_flags, tl_vflags);
 }
 
 #if defined(HAVE_ICONV)