lib: move hostcheck and x509sn1 sources to vtls/

... since they are used strictly by TLS code.

Closes #8386

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 74e600742083576e35f9b5f6cecc5c5c0db6191c..3c9dbc8e7995362d309ef149f33f9f36da6507b9 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -44,6 +44,7 @@ LIB_VTLS_CFILES =           \
   vtls/bearssl.c            \
   vtls/gskit.c              \
   vtls/gtls.c               \
+  vtls/hostcheck.c          \
   vtls/keylog.c             \
   vtls/mbedtls.c            \
   vtls/mbedtls_threadlock.c \
@@ -54,12 +55,14 @@ LIB_VTLS_CFILES =           \
   vtls/schannel_verify.c    \
   vtls/sectransp.c          \
   vtls/vtls.c               \
-  vtls/wolfssl.c
+  vtls/wolfssl.c            \
+  vtls/x509asn1.c
 
 LIB_VTLS_HFILES =           \
   vtls/bearssl.h            \
   vtls/gskit.h              \
   vtls/gtls.h               \
+  vtls/hostcheck.h          \
   vtls/keylog.h             \
   vtls/mbedtls.h            \
   vtls/mbedtls_threadlock.h \
@@ -69,7 +72,8 @@ LIB_VTLS_HFILES =           \
   vtls/schannel.h           \
   vtls/sectransp.h          \
   vtls/vtls.h               \
-  vtls/wolfssl.h
+  vtls/wolfssl.h            \
+  vtls/x509asn1.h
 
 LIB_VQUIC_CFILES = \
   vquic/ngtcp2.c   \
@@ -138,7 +142,6 @@ LIB_CFILES =         \
   hash.c             \
   hmac.c             \
   hostasyn.c         \
-  hostcheck.c        \
   hostip.c           \
   hostip4.c          \
   hostip6.c          \
@@ -207,8 +210,7 @@ LIB_CFILES =         \
   version.c          \
   version_win32.c    \
   warnless.c         \
-  wildcard.c         \
-  x509asn1.c
+  wildcard.c
 
 LIB_HFILES =         \
   altsvc.h           \
@@ -266,7 +268,6 @@ LIB_HFILES =         \
   getinfo.h          \
   gopher.h           \
   hash.h             \
-  hostcheck.h        \
   hostip.h           \
   hsts.h             \
   http.h             \
@@ -327,8 +328,7 @@ LIB_HFILES =         \
   urldata.h          \
   version_win32.h    \
   warnless.h         \
-  wildcard.h         \
-  x509asn1.h
+  wildcard.h
 
 LIB_RCFILES = libcurl.rc
 

diff --git a/lib/hostcheck.c b/lib/vtls/hostcheck.c
similarity index 100%
rename from lib/hostcheck.c
rename to lib/vtls/hostcheck.c

diff --git a/lib/hostcheck.h b/lib/vtls/hostcheck.h
similarity index 100%
rename from lib/hostcheck.h
rename to lib/vtls/hostcheck.h

diff --git a/lib/x509asn1.c b/lib/vtls/x509asn1.c
similarity index 100%
rename from lib/x509asn1.c
rename to lib/vtls/x509asn1.c

diff --git a/lib/x509asn1.h b/lib/vtls/x509asn1.h
similarity index 100%
rename from lib/x509asn1.h
rename to lib/vtls/x509asn1.h

diff --git a/tests/unit/unit1397.c b/tests/unit/unit1397.c
index 508f41af906bb4ebe79f2b02de9c6acc6f3d6b4e..ecf4a3100a6368624e0b01049946b534d280bcc2 100644 (file)
--- a/tests/unit/unit1397.c
+++ b/tests/unit/unit1397.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2020, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "hostcheck.h" /* from the lib dir */
+#include "vtls/hostcheck.h" /* from the lib dir */
 
 static CURLcode unit_setup(void)
 {

diff --git a/tests/unit/unit1651.c b/tests/unit/unit1651.c
index 9de583930e59b7948c89536054c557e218b7a4a2..2079356d84378b778330353deb55154f96c0d770 100644 (file)
--- a/tests/unit/unit1651.c
+++ b/tests/unit/unit1651.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 2018 - 2021, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2018 - 2022, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
  * you should have received as part of this distribution. The terms
@@ -21,7 +21,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "x509asn1.h"
+#include "vtls/x509asn1.h"
 
 static CURLcode unit_setup(void)
 {
@@ -32,8 +32,8 @@ static void unit_stop(void)
 {
 
 }
-#if defined(USE_GSKIT) || defined(USE_NSS) || defined(USE_GNUTLS) || \
-    defined(USE_WOLFSSL) || defined(USE_SCHANNEL)
+#if defined(USE_GSKIT) || defined(USE_NSS) || defined(USE_GNUTLS) ||    \
+  defined(USE_SCHANNEL) || defined(USE_SECTRANSP)
 
 /* cert captured from gdb when connecting to curl.se on October 26
    2018 */