From 11e8066ef9568bea4a07065a954104c0ab7efdea Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 17 Dec 2013 23:32:47 +0100 Subject: [PATCH] vtls: renamed sslgen.[ch] to vtls.[ch] --- lib/Makefile.inc | 4 ++-- lib/connect.c | 2 +- lib/curl_ntlm_msgs.c | 2 +- lib/curl_sasl.c | 2 +- lib/easy.c | 2 +- lib/formdata.c | 2 +- lib/ftp.c | 2 +- lib/getinfo.c | 2 +- lib/http.c | 2 +- lib/http_digest.c | 2 +- lib/imap.c | 2 +- lib/openldap.c | 2 +- lib/pingpong.c | 2 +- lib/pop3.c | 2 +- lib/sendf.c | 2 +- lib/share.c | 2 +- lib/smtp.c | 2 +- lib/ssh.c | 2 +- lib/transfer.c | 2 +- lib/url.c | 2 +- lib/version.c | 2 +- lib/vtls/openssl.c | 2 +- lib/vtls/{sslgen.c => vtls.c} | 4 ++-- lib/vtls/{sslgen.h => vtls.h} | 8 ++++---- 24 files changed, 29 insertions(+), 29 deletions(-) rename lib/vtls/{sslgen.c => vtls.c} (99%) rename lib/vtls/{sslgen.h => vtls.h} (97%) diff --git a/lib/Makefile.inc b/lib/Makefile.inc index e640ff1fd..d96293801 100644 --- 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 c85c7c783..4b6ee00a2 100644 --- 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 07c427f89..1fda1d73b 100644 --- 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 e6a528abb..4092d3eaa 100644 --- 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 0bd99ebdf..2ad42e957 100644 --- a/lib/easy.c +++ b/lib/easy.c @@ -54,7 +54,7 @@ #include "urldata.h" #include #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 4fbe92143..4cb3e7a48 100644 --- 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 07c000dbd..5d622a8eb 100644 --- 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 5db824da2..2119e064b 100644 --- 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 510f4bbc5..90d33de45 100644 --- 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 cd26d5a2b..ee5d63707 100644 --- 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 d45751b79..461494913 100644 --- 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 72e134160..2af14bab1 100644 --- a/lib/openldap.c +++ b/lib/openldap.c @@ -41,7 +41,7 @@ #include "urldata.h" #include #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 420197e69..683ae1963 100644 --- 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 diff --git a/lib/pop3.c b/lib/pop3.c index 40a2b2fdb..62c7b041c 100644 --- 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 70a65de4e..c274203bf 100644 --- 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 a71a26908..b8b6bee80 100644 --- a/lib/share.c +++ b/lib/share.c @@ -25,7 +25,7 @@ #include #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 e7e8bf1cc..4d7be482c 100644 --- 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 fb3255e9d..a4b2c673b 100644 --- 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 c199b4f67..2ce6597c3 100644 --- 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 5a70c9241..43b7840ad 100644 --- 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 e82698e4e..2c0e9b8b1 100644 --- a/lib/version.c +++ b/lib/version.c @@ -24,7 +24,7 @@ #include #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 a897f76c7..f57f3bf4f 100644 --- 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 74b1a4f05..ab7274ace 100644 --- 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 c7f5f0092..04ab60b18 100644 --- 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, , et al. + * Copyright (C) 1998 - 2013, Daniel Stenberg, , 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 */