[svn] Merge of fix for bugs 20341 and 20410.

[wget] / src / ssl.h

diff --git a/src/ssl.h b/src/ssl.h
index 14e65f05cedc8da0d644b2648904f56e91d67251..27c249463f1eff62f47b7559faf75f751e9cce6b 100644 (file)
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -1,12 +1,12 @@
 /* SSL support.
 /* SSL support.

-   Copyright (C) 2000 Free Software Foundation, Inc.
-   Contributed by Christian Fraenkel.
+   Copyright (C) 2000-2006 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
 
 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,
 (at your option) any later version.
 
 GNU Wget is distributed in the hope that it will be useful,


@@ -14,9 +14,8 @@ 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.
 
 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
 
 In addition, as a special exception, the Free Software Foundation
 gives permission to link the code of its release of Wget with the


@@ -31,7 +30,8 @@ so, delete this exception statement from your version.  */
 #ifndef GEN_SSLFUNC_H
 #define GEN_SSLFUNC_H
 
 #ifndef GEN_SSLFUNC_H
 #define GEN_SSLFUNC_H
 

-uerr_t ssl_init PARAMS ((void));
-int ssl_connect PARAMS ((int));
+bool ssl_init (void);
+bool ssl_connect (int);
+bool ssl_check_certificate (int, const char *);

 
 #endif /* GEN_SSLFUNC_H */
 
 #endif /* GEN_SSLFUNC_H */