X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=src%2Fssl.h;h=0532c4021588939df64dc4dcf0ee4feb5c1e29ba;hp=ad2b9961bbf0c0a1c5a1440c427e988dfc7642cf;hb=2f6aa1d7417df1dfc58597777686fbd77179b9fd;hpb=1c7493b83ed8cecbbf1f70ef6bf834f94c5fcd43

diff --git a/src/ssl.h b/src/ssl.h
index ad2b9961..0532c402 100644
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -1,12 +1,13 @@
 /* SSL support.
-   Copyright (C) 2000-2006 Free Software Foundation, Inc.
+   Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008,
+   2009, 2010, 2011 Free Software Foundation, Inc.
    Originally contributed by Christian Fraenkel.
 
 This file is part of GNU Wget.
 
 GNU Wget is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
+the Free Software Foundation; either version 3 of the License, or
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,
@@ -14,25 +15,25 @@ but WITHOUT ANY WARRANTY; without even the implied warranty of
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with Wget; if not, write to the Free Software
-Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+You should have received a copy of the GNU General Public License along
+with Wget.  If not, see <http://www.gnu.org/licenses/>.
 
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of its release of Wget with the
-OpenSSL project's "OpenSSL" library (or with modified versions of it
-that use the same license as the "OpenSSL" library), and distribute
-the linked executables.  You must obey the GNU General Public License
-in all respects for all of the code used other than "OpenSSL".  If you
-modify this file, you may extend this exception to your version of the
-file, but you are not obligated to do so.  If you do not wish to do
-so, delete this exception statement from your version.  */
+Additional permission under GNU GPL version 3 section 7
+
+If you modify this program, or any covered work, by linking or
+combining it with the OpenSSL project's OpenSSL library (or a
+modified version of that library), containing parts covered by the
+terms of the OpenSSL or SSLeay licenses, the Free Software Foundation
+grants you additional permission to convey the resulting work.
+Corresponding Source for a non-source form of such a combination
+shall include the source code for the parts of OpenSSL used as well
+as that of the covered work.  */
 
 #ifndef GEN_SSLFUNC_H
 #define GEN_SSLFUNC_H
 
 bool ssl_init (void);
-bool ssl_connect (int);
+bool ssl_connect_wget (int);
 bool ssl_check_certificate (int, const char *);
 
 #endif /* GEN_SSLFUNC_H */