aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2013-12-25 10:30:51 +0000
committerSteve Holme <steve_holme@hotmail.com>2013-12-26 21:42:22 +0000
commitf88f9bed008b15d488810cd5e6bea2e5efcaff6b (patch)
tree1c0692973ef23c73a9bc6d32808ad7330254a2ee
parent9aa6e4357a9e9257a56808ac407639cfeaf11ac9 (diff)
vtls: Updated comments referencing sslgen.c and ssluse.c
-rw-r--r--lib/vtls/axtls.c16
-rw-r--r--lib/vtls/curl_darwinssl.c6
-rw-r--r--lib/vtls/curl_schannel.c2
-rw-r--r--lib/vtls/cyassl.c2
-rw-r--r--lib/vtls/gskit.h2
-rw-r--r--lib/vtls/gtls.c2
-rw-r--r--lib/vtls/nss.c2
-rw-r--r--lib/vtls/nssg.h2
-rw-r--r--lib/vtls/openssl.c2
-rw-r--r--lib/vtls/openssl.h2
-rw-r--r--lib/vtls/polarssl.c2
-rw-r--r--lib/vtls/qssl.h4
12 files changed, 22 insertions, 22 deletions
diff --git a/lib/vtls/axtls.c b/lib/vtls/axtls.c
index 181347404..7db7eb1af 100644
--- a/lib/vtls/axtls.c
+++ b/lib/vtls/axtls.c
@@ -5,8 +5,8 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2010, DirecTV
- * contact: Eric Hu <ehu@directv.com>
+ * Copyright (C) 2010, DirecTV, Contact: Eric Hu, <ehu@directv.com>.
+ * Copyright (C) 2010 - 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
@@ -23,7 +23,7 @@
/*
* Source file for all axTLS-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but vtls.c should ever call or use these functions.
*/
#include "curl_setup.h"
@@ -522,10 +522,10 @@ void Curl_axtls_close(struct connectdata *conn, int sockindex)
infof(conn->data, " Curl_axtls_close\n");
- /* line from ssluse.c: (void)SSL_shutdown(connssl->ssl);
+ /* line from openssl.c: (void)SSL_shutdown(connssl->ssl);
axTLS compat layer does nothing for SSL_shutdown */
- /* The following line is from ssluse.c. There seems to be no axTLS
+ /* The following line is from openssl.c. There seems to be no axTLS
equivalent. ssl_free and ssl_ctx_free close things.
SSL_set_connect_state(connssl->handle); */
@@ -538,7 +538,7 @@ void Curl_axtls_close(struct connectdata *conn, int sockindex)
*/
int Curl_axtls_shutdown(struct connectdata *conn, int sockindex)
{
- /* Outline taken from ssluse.c since functions are in axTLS compat layer.
+ /* Outline taken from openssl.c since functions are in axTLS compat layer.
axTLS's error set is much smaller, so a lot of error-handling was removed.
*/
int retval = 0;
@@ -638,7 +638,7 @@ static ssize_t axtls_recv(struct connectdata *conn, /* connection data */
*/
int Curl_axtls_check_cxn(struct connectdata *conn)
{
- /* ssluse.c line: rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
+ /* openssl.c line: rc = SSL_peek(conn->ssl[FIRSTSOCKET].ssl, (void*)&buf, 1);
axTLS compat layer always returns the last argument, so connection is
always alive? */
@@ -650,7 +650,7 @@ void Curl_axtls_session_free(void *ptr)
{
(void)ptr;
/* free the ID */
- /* both ssluse.c and gtls.c do something here, but axTLS's OpenSSL
+ /* both openssl.c and gtls.c do something here, but axTLS's OpenSSL
compatibility layer does nothing, so we do nothing too. */
}
diff --git a/lib/vtls/curl_darwinssl.c b/lib/vtls/curl_darwinssl.c
index bba39f8dd..22514b6c7 100644
--- a/lib/vtls/curl_darwinssl.c
+++ b/lib/vtls/curl_darwinssl.c
@@ -5,8 +5,8 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 2012-2013, Nick Zitzmann, <nickzman@gmail.com>.
- * Copyright (C) 2012-2013, Daniel Stenberg, <daniel@haxx.se>, et al.
+ * Copyright (C) 2012 - 2013, Nick Zitzmann, <nickzman@gmail.com>.
+ * Copyright (C) 2012 - 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
@@ -23,7 +23,7 @@
/*
* Source file for all iOS and Mac OS X SecureTransport-specific code for the
- * TLS/SSL layer. No code but sslgen.c should ever call or use these functions.
+ * TLS/SSL layer. No code but vtls.c should ever call or use these functions.
*/
#include "curl_setup.h"
diff --git a/lib/vtls/curl_schannel.c b/lib/vtls/curl_schannel.c
index 342056031..f932b8039 100644
--- a/lib/vtls/curl_schannel.c
+++ b/lib/vtls/curl_schannel.c
@@ -24,7 +24,7 @@
/*
* Source file for all SChannel-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but vtls.c should ever call or use these functions.
*
*/
diff --git a/lib/vtls/cyassl.c b/lib/vtls/cyassl.c
index 4ec26cf57..6f1cea233 100644
--- a/lib/vtls/cyassl.c
+++ b/lib/vtls/cyassl.c
@@ -22,7 +22,7 @@
/*
* Source file for all CyaSSL-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but vtls.c should ever call or use these functions.
*
*/
diff --git a/lib/vtls/gskit.h b/lib/vtls/gskit.h
index 0d59aa709..7c50452ad 100644
--- a/lib/vtls/gskit.h
+++ b/lib/vtls/gskit.h
@@ -24,7 +24,7 @@
#include "curl_setup.h"
/*
- * This header should only be needed to get included by sslgen.c and gskit.c
+ * This header should only be needed to get included by vtls.c and gskit.c
*/
#include "urldata.h"
diff --git a/lib/vtls/gtls.c b/lib/vtls/gtls.c
index c3a23e50d..72a681af1 100644
--- a/lib/vtls/gtls.c
+++ b/lib/vtls/gtls.c
@@ -22,7 +22,7 @@
/*
* Source file for all GnuTLS-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but vtls.c should ever call or use these functions.
*
* Note: don't use the GnuTLS' *_t variable type names in this source code,
* since they were not present in 1.0.X.
diff --git a/lib/vtls/nss.c b/lib/vtls/nss.c
index dfd01ad0d..cd4bf1b82 100644
--- a/lib/vtls/nss.c
+++ b/lib/vtls/nss.c
@@ -22,7 +22,7 @@
/*
* Source file for all NSS-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but vtls.c should ever call or use these functions.
*/
#include "curl_setup.h"
diff --git a/lib/vtls/nssg.h b/lib/vtls/nssg.h
index cd32706a7..38181a958 100644
--- a/lib/vtls/nssg.h
+++ b/lib/vtls/nssg.h
@@ -25,7 +25,7 @@
#ifdef USE_NSS
/*
- * This header should only be needed to get included by sslgen.c and nss.c
+ * This header should only be needed to get included by vtls.c and nss.c
*/
#include "urldata.h"
diff --git a/lib/vtls/openssl.c b/lib/vtls/openssl.c
index 2d26d1ba5..7a21c737a 100644
--- a/lib/vtls/openssl.c
+++ b/lib/vtls/openssl.c
@@ -22,7 +22,7 @@
/*
* Source file for all OpenSSL-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but vtls.c should ever call or use these functions.
*/
/*
diff --git a/lib/vtls/openssl.h b/lib/vtls/openssl.h
index d6efcb271..f3b0f967c 100644
--- a/lib/vtls/openssl.h
+++ b/lib/vtls/openssl.h
@@ -26,7 +26,7 @@
#ifdef USE_SSLEAY
/*
- * This header should only be needed to get included by sslgen.c and ssluse.c
+ * This header should only be needed to get included by vtls.c and openssl.c
*/
#include "urldata.h"
diff --git a/lib/vtls/polarssl.c b/lib/vtls/polarssl.c
index 206c1e1b4..3623bc37f 100644
--- a/lib/vtls/polarssl.c
+++ b/lib/vtls/polarssl.c
@@ -23,7 +23,7 @@
/*
* Source file for all PolarSSL-specific code for the TLS/SSL layer. No code
- * but sslgen.c should ever call or use these functions.
+ * but vtls.c should ever call or use these functions.
*
*/
diff --git a/lib/vtls/qssl.h b/lib/vtls/qssl.h
index 1fb47b829..c0ce15508 100644
--- a/lib/vtls/qssl.h
+++ b/lib/vtls/qssl.h
@@ -7,7 +7,7 @@
* | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____|
*
- * Copyright (C) 1998 - 2011, 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
@@ -24,7 +24,7 @@
#include "curl_setup.h"
/*
- * This header should only be needed to get included by sslgen.c and qssl.c
+ * This header should only be needed to get included by vtls.c and qssl.c
*/
#include "urldata.h"