vtls: renamed sslgen.[ch] to vtls.[ch]

diff --git a/lib/Makefile.inc b/lib/Makefile.inc
index e640ff1fd4453db78faca37dd5d37ed92d7a116d..d962938011caa574e4c3758ae1c5efaf7b95eb1d 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 vtls/gtls.c vtls/sslgen.c tftp.c splay.c strdup.c socks.c ssh.c vtls/nss.c  \
+  select.c vtls/gtls.c vtls/vtls.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 vtls/polarssl.c           \
@@ -36,7 +36,7 @@ HHEADERS = arpa_telnet.h netrc.h file.h timeval.h vtls/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 vtls/sslgen.h vtls/gtls.h \
+  transfer.h select.h easyif.h multiif.h parsedate.h vtls/vtls.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 \

diff --git a/lib/connect.c b/lib/connect.c
index c85c7c783a60a898544f0a8130a3939f3a0502d9..4b6ee00a2e884d3b00b624d34dc898ec1b638ac6 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 "vtls/sslgen.h" /* for Curl_ssl_check_cxn() */
+#include "vtls/vtls.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 07c427f89e7f1c0d73d95b47fff14958e1cf5ee1..1fda1d73bbb5f1e99803d65a4c47e748c245c0c5 100644 (file)
--- a/lib/curl_ntlm_msgs.c
+++ b/lib/curl_ntlm_msgs.c
@@ -47,7 +47,7 @@
 #  include "curl_sspi.h"
 #endif
 
-#include "vtls/sslgen.h"
+#include "vtls/vtls.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 e6a528abb2ee2d398987fec2c556bfd752479f09..4092d3eaa10ab23945ae3cbff4c6bb031540e16c 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 "vtls/sslgen.h"
+#include "vtls/vtls.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 0bd99ebdf00b1051526ea14278a6f27f3b8e95cb..2ad42e957ae0824c9169192d42013acddf17c112 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 "vtls/sslgen.h"
+#include "vtls/vtls.h"
 #include "url.h"
 #include "getinfo.h"
 #include "hostip.h"

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

diff --git a/lib/ftp.c b/lib/ftp.c
index 07c000dbd71bc93f859d26d14ebfc939d4c26d04..5d622a8eb80e15e65bbb0ebd0be917851a38c714 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 "vtls/sslgen.h"
+#include "vtls/vtls.h"
 #include "connect.h"
 #include "strerror.h"
 #include "inet_ntop.h"

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

diff --git a/lib/http.c b/lib/http.c
index 510f4bbc5d6851fbe0d9719d844c987a2752aa40..90d33de4535ece60359ad4ccca26f7b70e17f785 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 "vtls/sslgen.h"
+#include "vtls/vtls.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 cd26d5a2bce6e99cc987c15719519087117b4561..ee5d637077d6b9eb4d5abdd2ba739c1fdcef3956 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 "vtls/sslgen.h" /* for Curl_rand() */
+#include "vtls/vtls.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 d45751b79682a56d6c787e15638c464c9efdb194..4614949131800e3bceae132b9532c30a1785d3be 100644 (file)
--- a/lib/imap.c
+++ b/lib/imap.c
@@ -71,7 +71,7 @@
 
 #include "strtoofft.h"
 #include "strequal.h"
-#include "vtls/sslgen.h"
+#include "vtls/vtls.h"
 #include "connect.h"
 #include "strerror.h"
 #include "select.h"

diff --git a/lib/openldap.c b/lib/openldap.c
index 72e1341609f64486cfecb3a938972c6346762392..2af14bab1d2b7ef9b9013af32a623b68371e9c86 100644 (file)
--- a/lib/openldap.c
+++ b/lib/openldap.c
@@ -41,7 +41,7 @@
 #include "urldata.h"
 #include <curl/curl.h>
 #include "sendf.h"
-#include "vtls/sslgen.h"
+#include "vtls/vtls.h"
 #include "transfer.h"
 #include "curl_ldap.h"
 #include "curl_memory.h"

diff --git a/lib/pingpong.c b/lib/pingpong.c
index 420197e6958235f4551a853e58a78f953a6e2024..683ae1963e7d9612cf8e1329c733cc4fb4a88ba8 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 "vtls/sslgen.h"
+#include "vtls/vtls.h"
 
 #define _MPRINTF_REPLACE /* use our functions only */
 #include <curl/mprintf.h>

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

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

diff --git a/lib/share.c b/lib/share.c
index a71a26908530952e0c99a102631c580df1be3da2..b8b6bee8033c42f8a6e099f06676d4e92f263029 100644 (file)
--- a/lib/share.c
+++ b/lib/share.c
@@ -25,7 +25,7 @@
 #include <curl/curl.h>
 #include "urldata.h"
 #include "share.h"
-#include "vtls/sslgen.h"
+#include "vtls/vtls.h"
 #include "curl_memory.h"
 
 /* The last #include file should be: */

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

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

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

diff --git a/lib/url.c b/lib/url.c
index 5a70c9241d52c6a21a11964ac63a1ff54ebd36d6..43b7840adbfe71198f8cfe5c87d645af59b19cee 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 "vtls/sslgen.h"
+#include "vtls/vtls.h"
 #include "hostip.h"
 #include "transfer.h"
 #include "sendf.h"

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

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

diff --git a/lib/vtls/sslgen.c b/lib/vtls/vtls.c
similarity index 99%
rename from lib/vtls/sslgen.c
rename to lib/vtls/vtls.c
index 74b1a4f05defff737476d5d1e62f46919e407640..ab7274ace1635b0493265e1e14a498e8dee6a54d 100644 (file)
--- a/lib/vtls/sslgen.c
+++ b/lib/vtls/vtls.c
@@ -58,8 +58,8 @@
 #endif
 
 #include "urldata.h"
-#define SSLGEN_C
-#include "sslgen.h" /* generic SSL protos etc */
+
+#include "vtls.h" /* generic SSL protos etc */
 #include "openssl.h" /* OpenSSL versions */
 #include "gtls.h"   /* GnuTLS versions */
 #include "nssg.h"   /* NSS versions */

diff --git a/lib/vtls/sslgen.h b/lib/vtls/vtls.h
similarity index 97%
rename from lib/vtls/sslgen.h
rename to lib/vtls/vtls.h
index c7f5f0092d811446d8fb407b8f055a75593ae878..04ab60b1868e120c931f94018c31c54b7cf48dde 100644 (file)
--- a/lib/vtls/sslgen.h
+++ b/lib/vtls/vtls.h
@@ -1,5 +1,5 @@
-#ifndef HEADER_CURL_SSLGEN_H
-#define HEADER_CURL_SSLGEN_H
+#ifndef HEADER_CURL_VTLS_H
+#define HEADER_CURL_VTLS_H
 /***************************************************************************
  *                                  _   _ ____  _
  *  Project                     ___| | | |  _ \| |
@@ -7,7 +7,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
@@ -123,4 +123,4 @@ void Curl_ssl_md5sum(unsigned char *tmp, /* input */
 #define Curl_ssl_kill_session(x) Curl_nop_stmt
 #endif
 
-#endif /* HEADER_CURL_SSLGEN_H */
+#endif /* HEADER_CURL_VTLS_H */