23 files changed, 17 insertions, 17 deletions
diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 3c5885d09..e18352625 100644
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -9,41 +9,41 @@
 
 CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.c	\
   cookie.c http.c sendf.c ftp.c url.c dict.c if2ip.c speedcheck.c	\
-  ldap.c ssluse.c version.c getenv.c escape.c mprintf.c telnet.c	\
+  ldap.c vtls/ssluse.c version.c getenv.c escape.c mprintf.c telnet.c	\
   netrc.c getinfo.c transfer.c strequal.c easy.c security.c      	\
   curl_fnmatch.c fileinfo.c ftplistparser.c wildcard.c krb5.c		\
   memdebug.c http_chunks.c strtok.c connect.c llist.c hash.c multi.c	\
   content_encoding.c share.c http_digest.c md4.c md5.c	\
   http_negotiate.c inet_pton.c strtoofft.c strerror.c amigaos.c		\
   hostasyn.c hostip4.c hostip6.c hostsyn.c inet_ntop.c parsedate.c	\
-  select.c gtls.c vtls/sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.c	\
-  qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c		\
+  select.c vtls/gtls.c vtls/sslgen.c tftp.c splay.c strdup.c socks.c ssh.c vtls/nss.c	\
+  vtls/qssl.c rawstr.c curl_addrinfo.c socks_gssapi.c socks_sspi.c		\
   curl_sspi.c slist.c nonblock.c curl_memrchr.c imap.c pop3.c smtp.c	\
-  pingpong.c rtsp.c curl_threads.c warnless.c hmac.c polarssl.c		\
-  polarssl_threadlock.c curl_rtmp.c openldap.c curl_gethostname.c	\
-  gopher.c axtls.c idn_win32.c http_negotiate_sspi.c cyassl.c		\
+  pingpong.c rtsp.c curl_threads.c warnless.c hmac.c vtls/polarssl.c		\
+  vtls/polarssl_threadlock.c curl_rtmp.c openldap.c curl_gethostname.c	\
+  gopher.c vtls/axtls.c idn_win32.c http_negotiate_sspi.c vtls/cyassl.c		\
   http_proxy.c non-ascii.c asyn-ares.c asyn-thread.c curl_gssapi.c	\
   curl_ntlm.c curl_ntlm_wb.c curl_ntlm_core.c curl_ntlm_msgs.c		\
-  curl_sasl.c curl_schannel.c curl_multibyte.c curl_darwinssl.c		\
+  curl_sasl.c vtls/curl_schannel.c curl_multibyte.c vtls/curl_darwinssl.c		\
   hostcheck.c bundles.c conncache.c pipeline.c dotdot.c x509asn1.c      \
-  gskit.c http2.c
+  vtls/gskit.c http2.c
 
-HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.h	\
+HHEADERS = arpa_telnet.h netrc.h file.h timeval.h vtls/qssl.h hostip.h	\
   progress.h formdata.h cookie.h http.h sendf.h ftp.h url.h dict.h	\
-  if2ip.h speedcheck.h urldata.h curl_ldap.h ssluse.h escape.h telnet.h	\
+  if2ip.h speedcheck.h urldata.h curl_ldap.h vtls/ssluse.h escape.h telnet.h	\
   getinfo.h strequal.h curl_sec.h memdebug.h http_chunks.h		\
   curl_fnmatch.h wildcard.h fileinfo.h ftplistparser.h strtok.h		\
   connect.h llist.h hash.h content_encoding.h share.h curl_md4.h	\
   curl_md5.h http_digest.h http_negotiate.h inet_pton.h amigaos.h	\
   strtoofft.h strerror.h inet_ntop.h curlx.h curl_memory.h curl_setup.h	\
-  transfer.h select.h easyif.h multiif.h parsedate.h vtls/sslgen.h gtls.h	\
-  tftp.h sockaddr.h splay.h strdup.h socks.h ssh.h nssg.h curl_base64.h	\
+  transfer.h select.h easyif.h multiif.h parsedate.h vtls/sslgen.h vtls/gtls.h	\
+  tftp.h sockaddr.h splay.h strdup.h socks.h ssh.h vtls/nssg.h curl_base64.h	\
   rawstr.h curl_addrinfo.h curl_sspi.h slist.h nonblock.h		\
   curl_memrchr.h imap.h pop3.h smtp.h pingpong.h rtsp.h curl_threads.h	\
-  warnless.h curl_hmac.h polarssl.h polarssl_threadlock.h curl_rtmp.h	\
-  curl_gethostname.h gopher.h axtls.h cyassl.h http_proxy.h non-ascii.h	\
+  warnless.h curl_hmac.h vtls/polarssl.h vtls/polarssl_threadlock.h curl_rtmp.h	\
+  curl_gethostname.h gopher.h vtls/axtls.h vtls/cyassl.h http_proxy.h non-ascii.h	\
   asyn.h curl_ntlm.h curl_gssapi.h curl_ntlm_wb.h curl_ntlm_core.h	\
-  curl_ntlm_msgs.h curl_sasl.h curl_schannel.h curl_multibyte.h		\
-  curl_darwinssl.h hostcheck.h bundles.h conncache.h curl_setup_once.h	\
-  multihandle.h setup-vms.h pipeline.h dotdot.h x509asn1.h gskit.h	\
+  curl_ntlm_msgs.h curl_sasl.h vtls/curl_schannel.h curl_multibyte.h		\
+  vtls/curl_darwinssl.h hostcheck.h bundles.h conncache.h curl_setup_once.h	\
+  multihandle.h setup-vms.h pipeline.h dotdot.h x509asn1.h vtls/gskit.h	\
   http2.h sigpipe.h
diff --git a/lib/axtls.c b/lib/vtls/axtls.c
index 8c92588f7..8c92588f7 100644
--- a/lib/axtls.c
+++ b/lib/vtls/axtls.c
diff --git a/lib/axtls.h b/lib/vtls/axtls.h
index db9136597..db9136597 100644
--- a/lib/axtls.h
+++ b/lib/vtls/axtls.h
diff --git a/lib/curl_darwinssl.c b/lib/vtls/curl_darwinssl.c
index 7022a47a4..7022a47a4 100644
--- a/lib/curl_darwinssl.c
+++ b/lib/vtls/curl_darwinssl.c
diff --git a/lib/curl_darwinssl.h b/lib/vtls/curl_darwinssl.h
index 432d3d7ce..432d3d7ce 100644
--- a/lib/curl_darwinssl.h
+++ b/lib/vtls/curl_darwinssl.h
diff --git a/lib/curl_schannel.c b/lib/vtls/curl_schannel.c
index 9a1652782..9a1652782 100644
--- a/lib/curl_schannel.c
+++ b/lib/vtls/curl_schannel.c
diff --git a/lib/curl_schannel.h b/lib/vtls/curl_schannel.h
index b82c734a0..b82c734a0 100644
--- a/lib/curl_schannel.h
+++ b/lib/vtls/curl_schannel.h
diff --git a/lib/cyassl.c b/lib/vtls/cyassl.c
index ff11bdd1a..ff11bdd1a 100644
--- a/lib/cyassl.c
+++ b/lib/vtls/cyassl.c
diff --git a/lib/cyassl.h b/lib/vtls/cyassl.h
index 7728a0cf5..7728a0cf5 100644
--- a/lib/cyassl.h
+++ b/lib/vtls/cyassl.h
diff --git a/lib/gskit.c b/lib/vtls/gskit.c
index 379f3ab5b..379f3ab5b 100644
--- a/lib/gskit.c
+++ b/lib/vtls/gskit.c
diff --git a/lib/gskit.h b/lib/vtls/gskit.h
index 0d59aa709..0d59aa709 100644
--- a/lib/gskit.h
+++ b/lib/vtls/gskit.h
diff --git a/lib/gtls.c b/lib/vtls/gtls.c
index b64dfa61c..b64dfa61c 100644
--- a/lib/gtls.c
+++ b/lib/vtls/gtls.c
diff --git a/lib/gtls.h b/lib/vtls/gtls.h
index 453542e1e..453542e1e 100644
--- a/lib/gtls.h
+++ b/lib/vtls/gtls.h
diff --git a/lib/nss.c b/lib/vtls/nss.c
index 70bff7b52..70bff7b52 100644
--- a/lib/nss.c
+++ b/lib/vtls/nss.c
diff --git a/lib/nssg.h b/lib/vtls/nssg.h
index cd32706a7..cd32706a7 100644
--- a/lib/nssg.h
+++ b/lib/vtls/nssg.h
diff --git a/lib/polarssl.c b/lib/vtls/polarssl.c
index 808f54c24..808f54c24 100644
--- a/lib/polarssl.c
+++ b/lib/vtls/polarssl.c
diff --git a/lib/polarssl.h b/lib/vtls/polarssl.h
index af3b28b89..af3b28b89 100644
--- a/lib/polarssl.h
+++ b/lib/vtls/polarssl.h
diff --git a/lib/polarssl_threadlock.c b/lib/vtls/polarssl_threadlock.c
index ad1871537..ad1871537 100644
--- a/lib/polarssl_threadlock.c
+++ b/lib/vtls/polarssl_threadlock.c
diff --git a/lib/polarssl_threadlock.h b/lib/vtls/polarssl_threadlock.h
index b67b3f9ab..b67b3f9ab 100644
--- a/lib/polarssl_threadlock.h
+++ b/lib/vtls/polarssl_threadlock.h
diff --git a/lib/qssl.c b/lib/vtls/qssl.c
index 42bf890fc..42bf890fc 100644
--- a/lib/qssl.c
+++ b/lib/vtls/qssl.c
diff --git a/lib/qssl.h b/lib/vtls/qssl.h
index 1fb47b829..1fb47b829 100644
--- a/lib/qssl.h
+++ b/lib/vtls/qssl.h
diff --git a/lib/ssluse.c b/lib/vtls/ssluse.c
index 3743170a9..3743170a9 100644
--- a/lib/ssluse.c
+++ b/lib/vtls/ssluse.c
diff --git a/lib/ssluse.h b/lib/vtls/ssluse.h
index d6efcb271..d6efcb271 100644
--- a/lib/ssluse.h
+++ b/lib/vtls/ssluse.h