From ae1912cb0d494b48d514d937826c9fe83ec96c4d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 29 Dec 1999 14:20:26 +0000 Subject: Initial revision --- lib/ssluse.h | 46 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 lib/ssluse.h (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h new file mode 100644 index 000000000..c1996b28e --- /dev/null +++ b/lib/ssluse.h @@ -0,0 +1,46 @@ +#ifndef __SSLUSE_H +#define __SSLUSE_H +/***************************************************************************** + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ + * \___|\___/|_| \_\_____| + * + * The contents of this file are subject to the Mozilla Public License + * Version 1.0 (the "License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the + * License for the specific language governing rights and limitations + * under the License. + * + * The Original Code is Curl. + * + * The Initial Developer of the Original Code is Daniel Stenberg. + * + * Portions created by the Initial Developer are Copyright (C) 1998. + * All Rights Reserved. + * + * ------------------------------------------------------------ + * Main author: + * - Daniel Stenberg + * + * http://curl.haxx.nu + * + * $Source$ + * $Revision$ + * $Date$ + * $Author$ + * $State$ + * $Locker$ + * + * ------------------------------------------------------------ + ****************************************************************************/ +int SSL_cert_stuff(struct UrlData *data, + char *cert_file, + char *key_file); +int UrgSSLConnect (struct UrlData *data); +#endif -- cgit v1.2.1 From 1ef3600a0731fef8f59563a1e49981f1b64b9746 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 20 Jun 2000 15:31:26 +0000 Subject: haxx.nu => haxx.se --- lib/ssluse.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index c1996b28e..9912779cc 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -26,9 +26,9 @@ * * ------------------------------------------------------------ * Main author: - * - Daniel Stenberg + * - Daniel Stenberg * - * http://curl.haxx.nu + * http://curl.haxx.se * * $Source$ * $Revision$ -- cgit v1.2.1 From 24dee483e9e925c2ab79dd582f70c9a55ab9ba4d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 3 Jan 2001 09:29:33 +0000 Subject: dual-license fix --- lib/ssluse.h | 39 +++++++++++---------------------------- 1 file changed, 11 insertions(+), 28 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 9912779cc..863d37a23 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -7,38 +7,21 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * The contents of this file are subject to the Mozilla Public License - * Version 1.0 (the "License"); you may not use this file except in - * compliance with the License. You may obtain a copy of the License at - * http://www.mozilla.org/MPL/ + * Copyright (C) 2000, Daniel Stenberg, , et al. * - * Software distributed under the License is distributed on an "AS IS" - * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the - * License for the specific language governing rights and limitations - * under the License. + * In order to be useful for every potential user, curl and libcurl are + * dual-licensed under the MPL and the MIT/X-derivate licenses. * - * The Original Code is Curl. + * You may opt to use, copy, modify, merge, publish, distribute and/or sell + * copies of the Software, and permit persons to whom the Software is + * furnished to do so, under the terms of the MPL or the MIT/X-derivate + * licenses. You may pick one of these licenses. * - * The Initial Developer of the Original Code is Daniel Stenberg. + * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY + * KIND, either express or implied. * - * Portions created by the Initial Developer are Copyright (C) 1998. - * All Rights Reserved. - * - * ------------------------------------------------------------ - * Main author: - * - Daniel Stenberg - * - * http://curl.haxx.se - * - * $Source$ - * $Revision$ - * $Date$ - * $Author$ - * $State$ - * $Locker$ - * - * ------------------------------------------------------------ - ****************************************************************************/ + * $Id$ + *****************************************************************************/ int SSL_cert_stuff(struct UrlData *data, char *cert_file, char *key_file); -- cgit v1.2.1 From 4031104404c6ceed5e57134125dcdb6cac51c564 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 5 Jan 2001 10:11:41 +0000 Subject: Internal symbols that aren't static are now prefixed with 'Curl_' --- lib/ssluse.h | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 863d37a23..6279c6257 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -22,8 +22,5 @@ * * $Id$ *****************************************************************************/ -int SSL_cert_stuff(struct UrlData *data, - char *cert_file, - char *key_file); -int UrgSSLConnect (struct UrlData *data); +int Curl_SSLConnect (struct UrlData *data); #endif -- cgit v1.2.1 From a1d6ad26100bc493c7b04f1301b1634b7f5aa8b4 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 20 Feb 2001 17:35:51 +0000 Subject: multiple connection support initial commit --- lib/ssluse.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 6279c6257..bb36f0e96 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -22,5 +22,6 @@ * * $Id$ *****************************************************************************/ -int Curl_SSLConnect (struct UrlData *data); +#include "urldata.h" +int Curl_SSLConnect(struct connectdata *conn); #endif -- cgit v1.2.1 From 8fd89d6b937e6fd12b43af351676dceeaaf25324 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 12 May 2001 09:29:56 +0000 Subject: fixed Curl_SSLConnect() to return CURLcode errors, including the new error code for peer certificate errors --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index bb36f0e96..d211c1cb4 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -23,5 +23,5 @@ * $Id$ *****************************************************************************/ #include "urldata.h" -int Curl_SSLConnect(struct connectdata *conn); +CURLcode Curl_SSLConnect(struct connectdata *conn); #endif -- cgit v1.2.1 From d300cf4d84182b111f6b364a89a9af00eca7f425 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 28 May 2001 14:12:43 +0000 Subject: T. Bharath's comments about SSL cleanup incorporated, and the two new curl_global_* functions --- lib/ssluse.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index d211c1cb4..645970f4b 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -24,4 +24,8 @@ *****************************************************************************/ #include "urldata.h" CURLcode Curl_SSLConnect(struct connectdata *conn); +/* Global SSL init */ +void Curl_SSL_init(void); +/* Global SSL cleanup */ +void Curl_SSL_cleanup(void); #endif -- cgit v1.2.1 From 3c52c53dddd3193d20bcb6fb335b1813eb1c07dd Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 28 Aug 2001 08:37:54 +0000 Subject: Added SSL session ID caching, moved some SSL code from url.c to ssluse.c --- lib/ssluse.h | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 645970f4b..47a1a1842 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -24,8 +24,14 @@ *****************************************************************************/ #include "urldata.h" CURLcode Curl_SSLConnect(struct connectdata *conn); -/* Global SSL init */ -void Curl_SSL_init(void); -/* Global SSL cleanup */ -void Curl_SSL_cleanup(void); +void Curl_SSL_init(void); /* Global SSL init */ +void Curl_SSL_cleanup(void); /* Global SSL cleanup */ + +/* init the SSL session ID cache */ +CURLcode Curl_SSL_InitSessions(struct UrlData *, long); +void Curl_SSL_Close(struct connectdata *conn); /* close a SSL connection */ + +/* tell the SSL stuff to close down all open information regarding + connections (and thus session ID caching etc) */ +int Curl_SSL_Close_All(struct UrlData *data); #endif -- cgit v1.2.1 From 0ece1b5c34c049a3226f7dd793cf75e470c46e4d Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 30 Aug 2001 22:48:34 +0000 Subject: Major rename and redesign of the internal "backbone" structs. Details will be posted in a minute to the libcurl list. --- lib/ssluse.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 47a1a1842..8ac4bf61b 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -28,10 +28,10 @@ void Curl_SSL_init(void); /* Global SSL init */ void Curl_SSL_cleanup(void); /* Global SSL cleanup */ /* init the SSL session ID cache */ -CURLcode Curl_SSL_InitSessions(struct UrlData *, long); +CURLcode Curl_SSL_InitSessions(struct SessionHandle *, long); void Curl_SSL_Close(struct connectdata *conn); /* close a SSL connection */ /* tell the SSL stuff to close down all open information regarding connections (and thus session ID caching etc) */ -int Curl_SSL_Close_All(struct UrlData *data); +int Curl_SSL_Close_All(struct SessionHandle *data); #endif -- cgit v1.2.1 From 46372c04ee06d75e2b7c0c60b1f80ee926a45749 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 7 Sep 2001 09:40:46 +0000 Subject: made it compile properly when not building with SSL support --- lib/ssluse.h | 1 + 1 file changed, 1 insertion(+) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 8ac4bf61b..e8115f007 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -24,6 +24,7 @@ *****************************************************************************/ #include "urldata.h" CURLcode Curl_SSLConnect(struct connectdata *conn); + void Curl_SSL_init(void); /* Global SSL init */ void Curl_SSL_cleanup(void); /* Global SSL cleanup */ -- cgit v1.2.1 From 974f314f5785156af6983675aeb28313cc8ba2ea Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 19 Mar 2002 07:54:55 +0000 Subject: copyright string (year) update --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index e8115f007..6fe9f161a 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 2000, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2002, Daniel Stenberg, , et al. * * In order to be useful for every potential user, curl and libcurl are * dual-licensed under the MPL and the MIT/X-derivate licenses. -- cgit v1.2.1 From ba4e69bebc8f7f32f3bc7faa1e13e7580754075b Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 3 Sep 2002 11:52:59 +0000 Subject: updated source code boilerplate/header --- lib/ssluse.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 6fe9f161a..b8526a303 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -1,6 +1,6 @@ #ifndef __SSLUSE_H #define __SSLUSE_H -/***************************************************************************** +/*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | * / __| | | | |_) | | @@ -9,19 +9,19 @@ * * Copyright (C) 1998 - 2002, Daniel Stenberg, , et al. * - * In order to be useful for every potential user, curl and libcurl are - * dual-licensed under the MPL and the MIT/X-derivate licenses. - * + * This software is licensed as described in the file COPYING, which + * you should have received as part of this distribution. The terms + * are also available at http://curl.haxx.se/docs/copyright.html. + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is - * furnished to do so, under the terms of the MPL or the MIT/X-derivate - * licenses. You may pick one of these licenses. + * furnished to do so, under the terms of the COPYING file. * * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * * $Id$ - *****************************************************************************/ + ***************************************************************************/ #include "urldata.h" CURLcode Curl_SSLConnect(struct connectdata *conn); -- cgit v1.2.1 From f26a338a54e04d0a6907f5d2479d8b0fa9daf297 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 16 Jan 2003 21:08:12 +0000 Subject: copyright year update in the source header --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index b8526a303..fd5e017c9 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2002, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2003, 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 -- cgit v1.2.1 From 1e98727c552ced5f8c7587f64ab69c6eaab743dd Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Mon, 24 Nov 2003 07:15:37 +0000 Subject: FTPS support added as RFC2228 and the murray-ftp-auth-ssl draft describe it --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index fd5e017c9..7a3fc3e52 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -23,7 +23,7 @@ * $Id$ ***************************************************************************/ #include "urldata.h" -CURLcode Curl_SSLConnect(struct connectdata *conn); +CURLcode Curl_SSLConnect(struct connectdata *conn, int sockfd); void Curl_SSL_init(void); /* Global SSL init */ void Curl_SSL_cleanup(void); /* Global SSL cleanup */ -- cgit v1.2.1 From 053f6c85efd0bf698f73343989474d672d0563a8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 7 Jan 2004 09:19:33 +0000 Subject: updated year in the copyright string --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 7a3fc3e52..7d1825437 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2003, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2004, 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 -- cgit v1.2.1 From ce5805a955c5a79d85792caad47594987f0e0b26 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 9 Mar 2004 22:52:50 +0000 Subject: Use curl_socket_t instead of int for holding sockets. The typedefs and defines are in setup.h. --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 7d1825437..4a34a7dd4 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -23,7 +23,7 @@ * $Id$ ***************************************************************************/ #include "urldata.h" -CURLcode Curl_SSLConnect(struct connectdata *conn, int sockfd); +CURLcode Curl_SSLConnect(struct connectdata *conn, curl_socket_t sockfd); void Curl_SSL_init(void); /* Global SSL init */ void Curl_SSL_cleanup(void); /* Global SSL cleanup */ -- cgit v1.2.1 From 7225b1400236c786add1516e38676d65a7bbd327 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 10 Mar 2004 16:01:47 +0000 Subject: curl_socket_t mistakes cleanup --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 4a34a7dd4..886d2ca13 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -23,7 +23,7 @@ * $Id$ ***************************************************************************/ #include "urldata.h" -CURLcode Curl_SSLConnect(struct connectdata *conn, curl_socket_t sockfd); +CURLcode Curl_SSLConnect(struct connectdata *conn, int sockindex); void Curl_SSL_init(void); /* Global SSL init */ void Curl_SSL_cleanup(void); /* Global SSL cleanup */ -- cgit v1.2.1 From bdb0620529ecb58b879dcf7de67885f211812aee Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Mon, 13 Dec 2004 16:43:00 +0000 Subject: Added handling of CURLINFO_SSL_ENGINES; Added Curl_SSL_engines_list(), cleanup SSL in url.c (no HAVE_OPENSSL_x etc.). --- lib/ssluse.h | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 886d2ca13..ea7a378e5 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -1,10 +1,10 @@ #ifndef __SSLUSE_H #define __SSLUSE_H /*************************************************************************** - * _ _ ____ _ - * Project ___| | | | _ \| | - * / __| | | | |_) | | - * | (__| |_| | _ <| |___ + * _ _ ____ _ + * Project ___| | | | _ \| | + * / __| | | | |_) | | + * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. @@ -12,7 +12,7 @@ * This software is licensed as described in the file COPYING, which * you should have received as part of this distribution. The terms * are also available at http://curl.haxx.se/docs/copyright.html. - * + * * You may opt to use, copy, modify, merge, publish, distribute and/or sell * copies of the Software, and permit persons to whom the Software is * furnished to do so, under the terms of the COPYING file. @@ -32,7 +32,17 @@ void Curl_SSL_cleanup(void); /* Global SSL cleanup */ CURLcode Curl_SSL_InitSessions(struct SessionHandle *, long); void Curl_SSL_Close(struct connectdata *conn); /* close a SSL connection */ -/* tell the SSL stuff to close down all open information regarding +/* tell the SSL stuff to close down all open information regarding connections (and thus session ID caching etc) */ int Curl_SSL_Close_All(struct SessionHandle *data); + +/* Sets an OpenSSL engine */ +CURLcode Curl_SSL_set_engine(struct SessionHandle *data, const char *engine); + +/* Sets above engine as default for all SSL operations */ +CURLcode Curl_SSL_set_engine_default(struct SessionHandle *data); + +/* Build list of OpenSSL engines */ +CURLcode Curl_SSL_engines_list(struct SessionHandle *data); + #endif -- cgit v1.2.1 From 7d3f5d7ac101b180aefaf2430e0ee09620883e99 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Tue, 14 Dec 2004 14:20:21 +0000 Subject: urldata.h: Removed engine_list. ssluse.*: Added SSL_strerror(). Curl_SSL_engines_list() now returns a slist which must be freed by caller. --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index ea7a378e5..81c223d20 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -43,6 +43,6 @@ CURLcode Curl_SSL_set_engine(struct SessionHandle *data, const char *engine); CURLcode Curl_SSL_set_engine_default(struct SessionHandle *data); /* Build list of OpenSSL engines */ -CURLcode Curl_SSL_engines_list(struct SessionHandle *data); +struct curl_slist *Curl_SSL_engines_list(struct SessionHandle *data); #endif -- cgit v1.2.1 From 61a1e3cd01c3b00d7a85edc775f49d9c785e1af4 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 9 Feb 2005 23:04:51 +0000 Subject: better error checking and SSL init by David Byron --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 81c223d20..f02b21257 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -25,7 +25,7 @@ #include "urldata.h" CURLcode Curl_SSLConnect(struct connectdata *conn, int sockindex); -void Curl_SSL_init(void); /* Global SSL init */ +int Curl_SSL_init(void); /* Global SSL init */ void Curl_SSL_cleanup(void); /* Global SSL cleanup */ /* init the SSL session ID cache */ -- cgit v1.2.1 From ab4086bc244bf3267976e9f0193e5ed4430190d8 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 31 Mar 2005 07:02:02 +0000 Subject: Updated the copyright year since changes have been this year. --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index f02b21257..25278eba6 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2004, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2005, 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 -- cgit v1.2.1 From 6e619393824922118317689ef59a73c556b7ef98 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Thu, 7 Apr 2005 15:27:13 +0000 Subject: GnuTLS support added. There's now a "generic" SSL layer that we use all over internally, with code provided by sslgen.c. All SSL-layer-specific code is then written in ssluse.c (for OpenSSL) and gtls.c (for GnuTLS). As far as possible, internals should not need to know what SSL layer that is in use. Building with GnuTLS currently makes two test cases fail. TODO.gnutls contains a few known outstanding issues for the GnuTLS support. GnuTLS support is enabled with configure --with-gnutls --- lib/ssluse.h | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 25278eba6..00345317d 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -22,27 +22,43 @@ * * $Id$ ***************************************************************************/ + +/* + * This header should only be needed to get included by sslgen.c and ssluse.c + */ + #include "urldata.h" -CURLcode Curl_SSLConnect(struct connectdata *conn, int sockindex); +CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex); +void Curl_ossl_close(struct connectdata *conn); /* close a SSL connection */ +/* tell OpenSSL to close down all open information regarding connections (and + thus session ID caching etc) */ +int Curl_ossl_close_all(struct SessionHandle *data); +/* Sets an OpenSSL engine */ +CURLcode Curl_ossl_set_engine(struct SessionHandle *data, const char *engine); -int Curl_SSL_init(void); /* Global SSL init */ -void Curl_SSL_cleanup(void); /* Global SSL cleanup */ +/* function provided for the generic SSL-layer, called when a session id + should be freed */ +void Curl_ossl_session_free(void *ptr); -/* init the SSL session ID cache */ -CURLcode Curl_SSL_InitSessions(struct SessionHandle *, long); -void Curl_SSL_Close(struct connectdata *conn); /* close a SSL connection */ +/* Sets engine as default for all SSL operations */ +CURLcode Curl_ossl_set_engine_default(struct SessionHandle *data); -/* tell the SSL stuff to close down all open information regarding - connections (and thus session ID caching etc) */ -int Curl_SSL_Close_All(struct SessionHandle *data); +/* Build list of OpenSSL engines */ +struct curl_slist *Curl_ossl_engines_list(struct SessionHandle *data); -/* Sets an OpenSSL engine */ -CURLcode Curl_SSL_set_engine(struct SessionHandle *data, const char *engine); +int Curl_ossl_init(void); +void Curl_ossl_cleanup(void); -/* Sets above engine as default for all SSL operations */ -CURLcode Curl_SSL_set_engine_default(struct SessionHandle *data); +int Curl_ossl_send(struct connectdata *conn, + int sockindex, + void *mem, + size_t len); +ssize_t Curl_ossl_recv(struct connectdata *conn, /* connection data */ + int num, /* socketindex */ + char *buf, /* store read data here */ + size_t buffersize, /* max amount to read */ + bool *wouldblock); -/* Build list of OpenSSL engines */ -struct curl_slist *Curl_SSL_engines_list(struct SessionHandle *data); +size_t Curl_ossl_version(char *buffer, size_t size); #endif -- cgit v1.2.1 From 83367f67de9584b91570bcb53a153b8aa496d455 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 21 Mar 2006 21:54:44 +0000 Subject: Xavier Bouchoux made the SSL connection non-blocking for the multi interface (when using OpenSSL). --- lib/ssluse.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 00345317d..1bbc2cc1c 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -29,6 +29,9 @@ #include "urldata.h" CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex); +CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn, + int sockindex, + bool *done); void Curl_ossl_close(struct connectdata *conn); /* close a SSL connection */ /* tell OpenSSL to close down all open information regarding connections (and thus session ID caching etc) */ -- cgit v1.2.1 From c9c5ce23652db79f36925c1509a15ddf4f665422 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 10 May 2006 22:17:42 +0000 Subject: David McCreedy provided a fix for CURLINFO_LASTSOCKET that does extended checks on the to-be-returned socket to make sure it truly seems to be alive and well. For SSL connection it (only) uses OpenSSL functions. --- lib/ssluse.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 1bbc2cc1c..5cc2f700e 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -64,4 +64,6 @@ ssize_t Curl_ossl_recv(struct connectdata *conn, /* connection data */ size_t Curl_ossl_version(char *buffer, size_t size); +int Curl_ossl_check_cxn(struct connectdata *cxn); + #endif -- cgit v1.2.1 From 2bd3033f681eb3cb204f285bd0b2f0b8aa176c7e Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 7 Jun 2006 14:14:04 +0000 Subject: NTLM2 session response support --- lib/ssluse.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 5cc2f700e..d33ac3878 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2005, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2006, 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 @@ -63,7 +63,7 @@ ssize_t Curl_ossl_recv(struct connectdata *conn, /* connection data */ bool *wouldblock); size_t Curl_ossl_version(char *buffer, size_t size); - int Curl_ossl_check_cxn(struct connectdata *cxn); +int Curl_ossl_seed(struct SessionHandle *data); #endif -- cgit v1.2.1 From e1ac99af1f1c2ba5fadca296df9585200951eefb Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sat, 11 Nov 2006 22:05:33 +0000 Subject: fix header to match actual proto --- lib/ssluse.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index d33ac3878..05238f0eb 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -52,10 +52,10 @@ struct curl_slist *Curl_ossl_engines_list(struct SessionHandle *data); int Curl_ossl_init(void); void Curl_ossl_cleanup(void); -int Curl_ossl_send(struct connectdata *conn, - int sockindex, - void *mem, - size_t len); +ssize_t Curl_ossl_send(struct connectdata *conn, + int sockindex, + void *mem, + size_t len); ssize_t Curl_ossl_recv(struct connectdata *conn, /* connection data */ int num, /* socketindex */ char *buf, /* store read data here */ -- cgit v1.2.1 From 4750e6f3c5fd42e19998242ddb63d7d5506b9fd9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 5 Jan 2007 23:11:14 +0000 Subject: - Linus Nielsen Feltzing introduced the --ftp-ssl-ccc command line option to curl that uses the new CURLOPT_FTP_SSL_CCC option in libcurl. If enabled, it will make libcurl shutdown SSL/TLS after the authentication is done on a FTP-SSL operation. --- lib/ssluse.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 05238f0eb..5bb7090c5 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2006, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2007, 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 @@ -29,8 +29,8 @@ #include "urldata.h" CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex); -CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn, - int sockindex, +CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn, + int sockindex, bool *done); void Curl_ossl_close(struct connectdata *conn); /* close a SSL connection */ /* tell OpenSSL to close down all open information regarding connections (and @@ -66,4 +66,6 @@ size_t Curl_ossl_version(char *buffer, size_t size); int Curl_ossl_check_cxn(struct connectdata *cxn); int Curl_ossl_seed(struct SessionHandle *data); +int Curl_ossl_shutdown(struct connectdata *conn, int sockindex); + #endif -- cgit v1.2.1 From f1fa7b8ba469d9b8681e30f107b44004695b32e9 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Sun, 29 Jul 2007 12:54:05 +0000 Subject: Bug report #1759542 (http://curl.haxx.se/bug/view.cgi?id=1759542). A bad use of a socket after it has been closed, when the FTP-SSL data connection is taken down. --- lib/ssluse.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 5bb7090c5..d5424d5a6 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -32,10 +32,14 @@ CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex); CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn, int sockindex, bool *done); -void Curl_ossl_close(struct connectdata *conn); /* close a SSL connection */ + +/* close a SSL connection */ +void Curl_ossl_close(struct connectdata *conn, int sockindex); + /* tell OpenSSL to close down all open information regarding connections (and thus session ID caching etc) */ int Curl_ossl_close_all(struct SessionHandle *data); + /* Sets an OpenSSL engine */ CURLcode Curl_ossl_set_engine(struct SessionHandle *data, const char *engine); -- cgit v1.2.1 From e2b82b4325e2726a802b6202f2d011fb4988e41d Mon Sep 17 00:00:00 2001 From: Michal Marek Date: Fri, 9 May 2008 11:27:54 +0000 Subject: - Make Curl_write and it's callees accept a const pointer, in preparation of tetetest's patch for curl_easy_send() --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index d5424d5a6..9707c0581 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -58,7 +58,7 @@ void Curl_ossl_cleanup(void); ssize_t Curl_ossl_send(struct connectdata *conn, int sockindex, - void *mem, + const void *mem, size_t len); ssize_t Curl_ossl_recv(struct connectdata *conn, /* connection data */ int num, /* socketindex */ -- cgit v1.2.1 From 04d5c8fb779afdb4f7e85a701f8b4b987a4016ee Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 11 Jun 2008 17:01:58 +0000 Subject: - I did a cleanup of the internal generic SSL layer and how the various SSL libraries are supported. Starting now, each underlying SSL library support code does a set of defines for the 16 functions the generic layer (sslgen.c) uses (all these new function defines use the prefix "curlssl_"). This greatly simplified the generic layer in readability by involving much less #ifdefs and other preprocessor stuff and should make it easier for people to make libcurl work with new SSL libraries. Hopefully I can later on document these 16 functions somewhat as well. I also made most of the internal SSL-dependent functions (using Curl_ssl_ prefix) #defined to nothing when no SSL support is requested - previously they would unnecessarily call mostly empty functions. --- lib/ssluse.h | 24 +++++++++++++++++++++++- 1 file changed, 23 insertions(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 9707c0581..851548902 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2007, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2008, 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 @@ -23,6 +23,7 @@ * $Id$ ***************************************************************************/ +#ifdef USE_SSLEAY /* * This header should only be needed to get included by sslgen.c and ssluse.c */ @@ -71,5 +72,26 @@ int Curl_ossl_check_cxn(struct connectdata *cxn); int Curl_ossl_seed(struct SessionHandle *data); int Curl_ossl_shutdown(struct connectdata *conn, int sockindex); +bool Curl_ossl_data_pending(const struct connectdata *conn, + int connindex); +/* API setup for OpenSSL */ +#define curlssl_init Curl_ossl_init +#define curlssl_cleanup Curl_ossl_cleanup +#define curlssl_connect Curl_ossl_connect +#define curlssl_connect_nonblocking Curl_ossl_connect_nonblocking +#define curlssl_session_free(x) Curl_ossl_session_free(x) +#define curlssl_close_all Curl_ossl_close_all +#define curlssl_close Curl_ossl_close +#define curlssl_shutdown(x,y) Curl_ossl_shutdown(x,y) +#define curlssl_set_engine(x,y) Curl_ossl_set_engine(x,y) +#define curlssl_set_engine_default(x) Curl_ossl_set_engine_default(x) +#define curlssl_engines_list(x) Curl_ossl_engines_list(x) +#define curlssl_send Curl_ossl_send +#define curlssl_recv Curl_ossl_recv +#define curlssl_version Curl_ossl_version +#define curlssl_check_cxn Curl_ossl_check_cxn +#define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y) + +#endif /* USE_SSLEAY */ #endif -- cgit v1.2.1 From 4c9768565ec3a9baf26ac8a547bca6e42cc64fa5 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Fri, 5 Sep 2008 14:29:21 +0000 Subject: - Introducing CURLOPT_CERTINFO and the corresponding CURLINFO_CERTINFO. By enabling this feature with CURLOPT_CERTINFO for a request using SSL (HTTPS or FTPS), libcurl will gather lots of server certificate info and that info can then get extracted by a client after the request has completed with curl_easy_getinfo()'s CURLINFO_CERTINFO option. Linus Nielsen Feltzing helped me test and smoothen out this feature. Unfortunately, this feature currently only works with libcurl built to use OpenSSL. This feature was sponsored by networking4all.com - thanks! --- lib/ssluse.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 851548902..f0dd2beb6 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -94,4 +94,4 @@ bool Curl_ossl_data_pending(const struct connectdata *conn, #define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y) #endif /* USE_SSLEAY */ -#endif +#endif /* __SSLUSE_H */ -- cgit v1.2.1 From 2309b4e330b96bc2e1f8e36b6184015e59544037 Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Wed, 24 Mar 2010 11:02:54 +0100 Subject: remove the CVSish $Id$ lines --- lib/ssluse.h | 1 - 1 file changed, 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index f0dd2beb6..9e58d204b 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -20,7 +20,6 @@ * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY * KIND, either express or implied. * - * $Id$ ***************************************************************************/ #ifdef USE_SSLEAY -- cgit v1.2.1 From ff8711135e9311d5a54c7210a5a87a86077271cb Mon Sep 17 00:00:00 2001 From: Kamil Dudka Date: Sun, 4 Apr 2010 23:37:18 +0200 Subject: refactorize interface of Curl_ssl_recv/Curl_ssl_send --- lib/ssluse.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 9e58d204b..00357afc5 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2008, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2010, 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 @@ -56,15 +56,19 @@ struct curl_slist *Curl_ossl_engines_list(struct SessionHandle *data); int Curl_ossl_init(void); void Curl_ossl_cleanup(void); +/* for documentation see Curl_ssl_send() in sslgen.h */ ssize_t Curl_ossl_send(struct connectdata *conn, int sockindex, const void *mem, - size_t len); + size_t len, + int *curlcode); + +/* for documentation see Curl_ssl_recv() in sslgen.h */ ssize_t Curl_ossl_recv(struct connectdata *conn, /* connection data */ int num, /* socketindex */ char *buf, /* store read data here */ size_t buffersize, /* max amount to read */ - bool *wouldblock); + int *curlcode); size_t Curl_ossl_version(char *buffer, size_t size); int Curl_ossl_check_cxn(struct connectdata *cxn); -- cgit v1.2.1 From d64bd82bdcb169d0647a80f00068cedd761f8163 Mon Sep 17 00:00:00 2001 From: Howard Chu Date: Fri, 7 May 2010 15:05:34 +0200 Subject: sendrecv: split the I/O handling into private handler Howard Chu brought the bulk work of this patch that properly moves out the sending and recving of data to the parts of the code that are properly responsible for the various ways of doing so. Daniel Stenberg assisted with polishing a few bits and fixed some minor flaws in the original patch. Another upside of this patch is that we now abuse CURLcodes less with the "magic" -1 return codes and instead use CURLE_AGAIN more consistently. --- lib/ssluse.h | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 00357afc5..2ac0ad2ec 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -56,20 +56,6 @@ struct curl_slist *Curl_ossl_engines_list(struct SessionHandle *data); int Curl_ossl_init(void); void Curl_ossl_cleanup(void); -/* for documentation see Curl_ssl_send() in sslgen.h */ -ssize_t Curl_ossl_send(struct connectdata *conn, - int sockindex, - const void *mem, - size_t len, - int *curlcode); - -/* for documentation see Curl_ssl_recv() in sslgen.h */ -ssize_t Curl_ossl_recv(struct connectdata *conn, /* connection data */ - int num, /* socketindex */ - char *buf, /* store read data here */ - size_t buffersize, /* max amount to read */ - int *curlcode); - size_t Curl_ossl_version(char *buffer, size_t size); int Curl_ossl_check_cxn(struct connectdata *cxn); int Curl_ossl_seed(struct SessionHandle *data); @@ -90,8 +76,6 @@ bool Curl_ossl_data_pending(const struct connectdata *conn, #define curlssl_set_engine(x,y) Curl_ossl_set_engine(x,y) #define curlssl_set_engine_default(x) Curl_ossl_set_engine_default(x) #define curlssl_engines_list(x) Curl_ossl_engines_list(x) -#define curlssl_send Curl_ossl_send -#define curlssl_recv Curl_ossl_recv #define curlssl_version Curl_ossl_version #define curlssl_check_cxn Curl_ossl_check_cxn #define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y) -- cgit v1.2.1 From 78199b6030e07112d1515272afd7017337fa79c7 Mon Sep 17 00:00:00 2001 From: Yang Tse Date: Sun, 28 Aug 2011 11:29:09 +0200 Subject: NTLM: header inclusion cleanup follow-up --- lib/ssluse.h | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 2ac0ad2ec..732ec7c72 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -1,5 +1,5 @@ -#ifndef __SSLUSE_H -#define __SSLUSE_H +#ifndef HEADER_CURL_SSLUSE_H +#define HEADER_CURL_SSLUSE_H /*************************************************************************** * _ _ ____ _ * Project ___| | | | _ \| | @@ -22,12 +22,15 @@ * ***************************************************************************/ +#include "setup.h" + #ifdef USE_SSLEAY /* * This header should only be needed to get included by sslgen.c and ssluse.c */ #include "urldata.h" + CURLcode Curl_ossl_connect(struct connectdata *conn, int sockindex); CURLcode Curl_ossl_connect_nonblocking(struct connectdata *conn, int sockindex, @@ -81,4 +84,4 @@ bool Curl_ossl_data_pending(const struct connectdata *conn, #define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y) #endif /* USE_SSLEAY */ -#endif /* __SSLUSE_H */ +#endif /* HEADER_CURL_SSLUSE_H */ -- cgit v1.2.1 From 849179ba2739ab9a0ad079384b125d9c1745db5f Mon Sep 17 00:00:00 2001 From: Daniel Stenberg Date: Tue, 26 Jun 2012 14:52:46 +0200 Subject: SSL cleanup: use crypto functions through the sslgen layer curl_ntlm_msgs.c would previously use an #ifdef maze and direct SSL-library calls instead of using the SSL layer we have for this purpose. --- lib/ssluse.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'lib/ssluse.h') diff --git a/lib/ssluse.h b/lib/ssluse.h index 732ec7c72..5375a6a65 100644 --- a/lib/ssluse.h +++ b/lib/ssluse.h @@ -7,7 +7,7 @@ * | (__| |_| | _ <| |___ * \___|\___/|_| \_\_____| * - * Copyright (C) 1998 - 2010, Daniel Stenberg, , et al. + * Copyright (C) 1998 - 2012, 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 @@ -66,6 +66,12 @@ int Curl_ossl_seed(struct SessionHandle *data); int Curl_ossl_shutdown(struct connectdata *conn, int sockindex); bool Curl_ossl_data_pending(const struct connectdata *conn, int connindex); +void Curl_ossl_random(struct SessionHandle *data, unsigned char *entropy, + size_t length); +void Curl_ossl_md5sum(unsigned char *tmp, /* input */ + size_t tmplen, + unsigned char *md5sum /* output */, + size_t unused); /* API setup for OpenSSL */ #define curlssl_init Curl_ossl_init @@ -82,6 +88,8 @@ bool Curl_ossl_data_pending(const struct connectdata *conn, #define curlssl_version Curl_ossl_version #define curlssl_check_cxn Curl_ossl_check_cxn #define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y) +#define curlssl_random(x,y,z) Curl_ossl_random(x,y,z) +#define curlssl_md5sum(a,b,c,d) Curl_ossl_md5sum(a,b,c,d) #endif /* USE_SSLEAY */ #endif /* HEADER_CURL_SSLUSE_H */ -- cgit v1.2.1