vtls: Updated comments referencing sslgen.c and ssluse.c

diff --git a/lib/vtls/axtls.c b/lib/vtls/axtls.c
index 18134740466c29df90eb986e244cede74933c5fd..7db7eb1afb26785a68268bb077045bd5c792326e 100644 (file)
--- 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 bba39f8dd6a300bc06440b53f19f6b9874eac6aa..22514b6c72583db81c174f14fadf0bb8436a4e43 100644 (file)
--- 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 34205603153fb046313ad537aa08f952fedf0cc5..f932b8039688381e10fa49da973e20a81c96bd80 100644 (file)
--- 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 4ec26cf57094ae302b89025f03b6722cadc4f0a6..6f1cea233dca5ba59ad881266339b6a8ce2b6481 100644 (file)
--- 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 0d59aa70967fc5f8098d26a3e83d2f70dfe06ee7..7c50452ad8311710d7cb59716a78164af657c623 100644 (file)
--- 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 c3a23e50d9c82f99767112b0dd0053ba3cf7be45..72a681af12252a36cb9f7d38c71dfab4587c6f6f 100644 (file)
--- 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 dfd01ad0dc34acd4aed90c293c907be3203c311b..cd4bf1b82fac050b418a79a185b354801b1d883a 100644 (file)
--- 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 cd32706a717c1c65b6c13089fe5d2e8569977e09..38181a958dcacc4db1e65ae40cc4e22db3bea353 100644 (file)
--- 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 2d26d1ba501ec4732709b4347c8a2914cc8ae3d6..7a21c737a06cda2f12733360f77836d1b022e308 100644 (file)
--- 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 d6efcb2717cc027535db922c66ffaae5c4e7ee08..f3b0f967c2c9092583aa7e28c574febbc13485d6 100644 (file)
--- 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 206c1e1b4d2952151c6227d61c5a09d2c8e0d2ff..3623bc37f2c93cded7aaeb2832365e978e238858 100644 (file)
--- 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 1fb47b82995f2e4f15fd94003f7e4981a2a65889..c0ce15508b208dcb143f008304cde253db4491e5 100644 (file)
--- 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"