Revert "verify-high2: Fix cert dir iteration on Win32"

This was failing CI (x509cert-tl) but was not detected due to
a bug.

This reverts commit 362a0c30b79ccede7e5bc3a7747c3e7f1d30889a.

Signed-off-by: Nikos Mavrogiannopoulos <nmav@redhat.com>

diff --git a/lib/x509/verify-high2.c b/lib/x509/verify-high2.c
index 6c7cf9901274a98e0c9f40e5b098cc2fbe9f5150..f4a580bb056bbff40af8ef17328b4a0374b248dd 100644 (file)
--- a/lib/x509/verify-high2.c
+++ b/lib/x509/verify-high2.c
@@ -45,10 +45,6 @@
 # endif
 #endif
 
-#ifdef _WIN32
-# include <tchar.h>
-#endif
-
 /* Convenience functions for verify-high functionality 
  */
 
@@ -390,14 +386,12 @@ int load_dir_certs(const char *dirname,
                          unsigned int tl_flags, unsigned int tl_vflags,
                          unsigned type, unsigned crl)
 {
+       DIR *dirp;
+       struct dirent *d;
        int ret;
        int r = 0;
        char path[GNUTLS_PATH_MAX];
 
-#if !defined(_WIN32) || !defined(_UNICODE)
-       DIR *dirp;
-       struct dirent *d;
-
        dirp = opendir(dirname);
        if (dirp != NULL) {
                do {
@@ -428,47 +422,7 @@ int load_dir_certs(const char *dirname,
                while (d != NULL);
                closedir(dirp);
        }
-#else /* _WIN32 */
 
-       _TDIR *dirp;
-       struct _tdirent *d;
-       gnutls_datum_t utf16 = {NULL, 0};
-
-       r = _gnutls_utf8_to_ucs2(dirname, strlen(dirname), &utf16);
-       if (r < 0)
-               return gnutls_assert_val(r);
-       dirp = _topendir((_TCHAR*)utf16.data);
-       gnutls_free(utf16.data);
-       if (dirp != NULL) {
-               do {
-                       d = _treaddir(dirp);
-                       if (d != NULL
-#ifdef _DIRENT_HAVE_D_TYPE
-                               && (d->d_type == DT_REG || d->d_type == DT_LNK || d->d_type == DT_UNKNOWN)
-#endif
-                       ) {
-                               snprintf(path, sizeof(path), "%s/%S",
-                                       dirname, d->d_name);
-
-                               if (crl != 0) {
-                                       ret =
-                                           gnutls_x509_trust_list_add_trust_file
-                                           (list, NULL, path, type, tl_flags,
-                                            tl_vflags);
-                               } else {
-                                       ret =
-                                           gnutls_x509_trust_list_add_trust_file
-                                           (list, path, NULL, type, tl_flags,
-                                            tl_vflags);
-                               }
-                               if (ret >= 0)
-                                       r += ret;
-                       }
-               }
-               while (d != NULL);
-               _tclosedir(dirp);
-       }
-#endif /* _WIN32 */
        return r;
 }