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

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

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	\

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"

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"

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"

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"

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"

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"

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"
 

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"

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"
 

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"

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"

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>

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"

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"

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: */

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"

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"

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"
 

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"

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"

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 */