vtls: created subdir, moved sslgen.[ch] there, updated all include lines

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 4477cc25f80be09a6f8c6e2f5f933f7636407599..6dffbd9c920f88e2fc58d15200149f5a219314b7 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -60,20 +60,15 @@ CFLAGS += @CURL_CFLAG_EXTRAS@
 # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file
 # $(top_srcdir)/ares is for in-tree c-ares's external include files
 
-if USE_EMBEDDED_ARES
-AM_CPPFLAGS = -I$(top_builddir)/include/curl \
-              -I$(top_builddir)/include      \
-              -I$(top_srcdir)/include        \
-              -I$(top_builddir)/lib          \
-              -I$(top_srcdir)/lib            \
-              -I$(top_builddir)/ares         \
-              -I$(top_srcdir)/ares
-else
 AM_CPPFLAGS = -I$(top_builddir)/include/curl \
               -I$(top_builddir)/include      \
               -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib
+
+if USE_EMBEDDED_ARES
+AM_CPPFLAGS += -I$(top_builddir)/ares        \
+               -I$(top_srcdir)/ares
 endif
 
 # Prevent LIBS from being used for all link targets

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index 62bc0b3d56110db17529ce90b6480cf518829e0f..3c5885d092294b889d6aded5e05b2d50316e16ec 100644 (file)
--- a/lib/Makefile.inc
+++ b/lib/Makefile.inc
@@ -16,7 +16,7 @@ CSOURCES = file.c timeval.c base64.c hostip.c progress.c formdata.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 sslgen.c tftp.c splay.c strdup.c socks.c ssh.c nss.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          \
   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                \
@@ -36,7 +36,7 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h qssl.h hostip.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 sslgen.h gtls.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        \
   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 \

diff --git a/lib/connect.c b/lib/connect.c
index a39699ba79de2e83422ade52a5721dc00e722f1b..c85c7c783a60a898544f0a8130a3939f3a0502d9 100644 (file)
--- a/lib/connect.c
+++ b/lib/connect.c
@@ -71,7 +71,7 @@
 #include "sockaddr.h" /* required for Curl_sockaddr_storage */
 #include "inet_ntop.h"
 #include "inet_pton.h"
-#include "sslgen.h" /* for Curl_ssl_check_cxn() */
+#include "vtls/sslgen.h" /* for Curl_ssl_check_cxn() */
 #include "progress.h"
 #include "warnless.h"
 #include "conncache.h"

diff --git a/lib/curl_ntlm_msgs.c b/lib/curl_ntlm_msgs.c
index 125ce6e496dd09f4a5bb6ba6ceea69d153ac6f90..07c427f89e7f1c0d73d95b47fff14958e1cf5ee1 100644 (file)
--- a/lib/curl_ntlm_msgs.c
+++ b/lib/curl_ntlm_msgs.c
@@ -47,7 +47,7 @@
 #  include "curl_sspi.h"
 #endif
 
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 
 #define BUILDING_CURL_NTLM_MSGS_C
 #include "curl_ntlm_msgs.h"

diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c
index 240537283234c49c2393951e719649a46dc739a2..e6a528abb2ee2d398987fec2c556bfd752479f09 100644 (file)
--- a/lib/curl_sasl.c
+++ b/lib/curl_sasl.c
@@ -34,7 +34,7 @@
 
 #include "curl_base64.h"
 #include "curl_md5.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "curl_hmac.h"
 #include "curl_ntlm_msgs.h"
 #include "curl_sasl.h"

diff --git a/lib/easy.c b/lib/easy.c
index 1dbdcb76880b0ab71cca02acbed6dbe3cfade2fe..0bd99ebdf00b1051526ea14278a6f27f3b8e95cb 100644 (file)
--- a/lib/easy.c
+++ b/lib/easy.c
@@ -54,7 +54,7 @@
 #include "urldata.h"
 #include <curl/curl.h>
 #include "transfer.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "url.h"
 #include "getinfo.h"
 #include "hostip.h"

diff --git a/lib/formdata.c b/lib/formdata.c
index f718a3e4e9c070cd1b337203ed086c9a38998de0..4fbe92143299f10a3aba10fa9957720d12227f44 100644 (file)
--- a/lib/formdata.c
+++ b/lib/formdata.c
@@ -32,7 +32,7 @@
 
 #include "urldata.h" /* for struct SessionHandle */
 #include "formdata.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "strequal.h"
 #include "curl_memory.h"
 #include "sendf.h"

diff --git a/lib/ftp.c b/lib/ftp.c
index abd70e070e8542192d45fa168689d9974f7d4a5e..07c000dbd71bc93f859d26d14ebfc939d4c26d04 100644 (file)
--- a/lib/ftp.c
+++ b/lib/ftp.c
@@ -62,7 +62,7 @@
 #include "curl_sec.h"
 #include "strtoofft.h"
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h"
 #include "strerror.h"
 #include "inet_ntop.h"

diff --git a/lib/getinfo.c b/lib/getinfo.c
index c5c00e048df812198609e98c76526c6969338c8b..5db824da26a4b5a7d8ab80851b42ee0d7e99d633 100644 (file)
--- a/lib/getinfo.c
+++ b/lib/getinfo.c
@@ -28,7 +28,7 @@
 #include "getinfo.h"
 
 #include "curl_memory.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h" /* Curl_getconnectinfo() */
 #include "progress.h"
 

diff --git a/lib/http.c b/lib/http.c
index 459b98bca692414f3eec9b54645260b8cc1a6668..510f4bbc5d6851fbe0d9719d844c987a2752aa40 100644 (file)
--- a/lib/http.c
+++ b/lib/http.c
@@ -54,7 +54,7 @@
 #include "curl_base64.h"
 #include "cookie.h"
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "http_digest.h"
 #include "curl_ntlm.h"
 #include "curl_ntlm_wb.h"

diff --git a/lib/http_digest.c b/lib/http_digest.c
index 581049dd33a36897c6cd2fc309338e06558e317d..cd26d5a2bce6e99cc987c15719519087117b4561 100644 (file)
--- a/lib/http_digest.c
+++ b/lib/http_digest.c
@@ -31,7 +31,7 @@
 #include "http_digest.h"
 #include "strtok.h"
 #include "curl_memory.h"
-#include "sslgen.h" /* for Curl_rand() */
+#include "vtls/sslgen.h" /* for Curl_rand() */
 #include "non-ascii.h" /* included for Curl_convert_... prototypes */
 #include "warnless.h"
 

diff --git a/lib/imap.c b/lib/imap.c
index bd03c76cde4be7b8f7d017767c322fb3f8138d7e..d45751b79682a56d6c787e15638c464c9efdb194 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -71,7 +71,7 @@
 
 #include "strtoofft.h"
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h"
 #include "strerror.h"
 #include "select.h"

diff --git a/lib/openldap.c b/lib/openldap.c
index 98793b3067705c7e0878280ca53674e92517139b..72e1341609f64486cfecb3a938972c6346762392 100644 (file)
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -5,7 +5,7 @@
  *                | (__| |_| |  _ <| |___
  *                 \___|\___/|_| \_\_____|
  *
- * Copyright (C) 2010, Howard Chu, <hyc@openldap.org>
+ * Copyright (C) 2010, 2013, Howard Chu, <hyc@openldap.org>
  * Copyright (C) 2011 - 2013, Daniel Stenberg, <daniel@haxx.se>, et al.
  *
  * This software is licensed as described in the file COPYING, which
@@ -41,7 +41,7 @@
 #include "urldata.h"
 #include <curl/curl.h>
 #include "sendf.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "transfer.h"
 #include "curl_ldap.h"
 #include "curl_memory.h"

diff --git a/lib/pingpong.c b/lib/pingpong.c
index 3ebeabe53729afb5b3908b0a342141808819328a..420197e6958235f4551a853e58a78f953a6e2024 100644 (file)
--- a/lib/pingpong.c
+++ b/lib/pingpong.c
@@ -33,7 +33,7 @@
 #include "pingpong.h"
 #include "multiif.h"
 #include "non-ascii.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>

diff --git a/lib/pop3.c b/lib/pop3.c
index eb0164862df91baf152212c5d2e36252c162dc48..40a2b2fdbd6cd52c898f0d2fa395234a0e507032 100644 (file)
--- a/lib/pop3.c
+++ b/lib/pop3.c
@@ -73,7 +73,7 @@
 
 #include "strtoofft.h"
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h"
 #include "strerror.h"
 #include "select.h"

diff --git a/lib/sendf.c b/lib/sendf.c
index 7b6fca61086b29d6edb889e284eec106d618f9b8..70a65de4e4387213b284f8e4c6c40fe435ab52ca 100644 (file)
--- a/lib/sendf.c
+++ b/lib/sendf.c
@@ -27,7 +27,7 @@
 #include "urldata.h"
 #include "sendf.h"
 #include "connect.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "ssh.h"
 #include "multiif.h"
 #include "non-ascii.h"

diff --git a/lib/share.c b/lib/share.c
index b21c9f68521e00aac21984733d33fe5084b390bd..a71a26908530952e0c99a102631c580df1be3da2 100644 (file)
--- a/lib/share.c
+++ b/lib/share.c
@@ -5,7 +5,7 @@
  *                            | (__| |_| |  _ <| |___
  *                             \___|\___/|_| \_\_____|
  *
- * Copyright (C) 1998 - 2012, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 1998 - 2013, 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
@@ -25,7 +25,7 @@
 #include <curl/curl.h>
 #include "urldata.h"
 #include "share.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "curl_memory.h"
 
 /* The last #include file should be: */

diff --git a/lib/smtp.c b/lib/smtp.c
index f35f7537ecd9f5a4c627c4de0e119b8585017114..e7e8bf1ccc5a50d3fcaf66fc1dd0b5dd0a247f46 100644 (file)
--- a/lib/smtp.c
+++ b/lib/smtp.c
@@ -72,7 +72,7 @@
 
 #include "strtoofft.h"
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h"
 #include "strerror.h"
 #include "select.h"

diff --git a/lib/ssh.c b/lib/ssh.c
index 35cb20193c2711ecbfe7115bc043a80d4c427b95..fb3255e9da03d4b3ede24163d005902eafaa29e0 100644 (file)
--- a/lib/ssh.c
+++ b/lib/ssh.c
@@ -73,7 +73,7 @@
 #include "getinfo.h"
 
 #include "strequal.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "connect.h"
 #include "strerror.h"
 #include "inet_ntop.h"

diff --git a/lib/ssluse.c b/lib/ssluse.c
index d0a83f740d19b6a9e75ba804f5545cc7064ec20e..3743170a9873068d6bfe5339aabf0708d759d22a 100644 (file)
--- a/lib/ssluse.c
+++ b/lib/ssluse.c
@@ -46,7 +46,7 @@
 #include "slist.h"
 #include "strequal.h"
 #include "select.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "rawstr.h"
 #include "hostcheck.h"
 

diff --git a/lib/transfer.c b/lib/transfer.c
index e3194415b7bcbf7cdf7fe761ded7d8ef04c14637..c199b4f6765f96478a6d64b75104ccfebef1fd84 100644 (file)
--- a/lib/transfer.c
+++ b/lib/transfer.c
@@ -70,7 +70,7 @@
 #include "http.h"
 #include "url.h"
 #include "getinfo.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "http_digest.h"
 #include "curl_ntlm.h"
 #include "http_negotiate.h"

diff --git a/lib/url.c b/lib/url.c
index 5903628c9dcd94be02506de05fe7fbbeeb423679..5a70c9241d52c6a21a11964ac63a1ff54ebd36d6 100644 (file)
--- a/lib/url.c
+++ b/lib/url.c
@@ -78,7 +78,7 @@ int curl_win32_idn_to_ascii(const char *in, char **out);
 #include "netrc.h"
 
 #include "formdata.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "hostip.h"
 #include "transfer.h"
 #include "sendf.h"

diff --git a/lib/version.c b/lib/version.c
index 1f62131ebad928fd21c260d48c31186431098d36..e82698e4ea1d36ea1de41cf573f44623f4c85d89 100644 (file)
--- a/lib/version.c
+++ b/lib/version.c
@@ -24,7 +24,7 @@
 
 #include <curl/curl.h>
 #include "urldata.h"
-#include "sslgen.h"
+#include "vtls/sslgen.h"
 #include "http2.h"
 
 #define _MPRINTF_REPLACE /* use the internal *printf() functions */

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

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