~ubuntu-branches/ubuntu/lucid/curl/lucid-security

« back to all changes in this revision

Viewing changes to lib/ssluse.h

  • Committer: Bazaar Package Importer
  • Author(s): Michael Vogt
  • Date: 2009-04-29 11:10:29 UTC
  • mfrom: (3.2.3 sid)
  • Revision ID: james.westby@ubuntu.com-20090429111029-2j5eiyokfw2bw049
Tags: 7.19.4-1ubuntu1
* Merge from debian unstable, remaining changes:
  - Drop build dependencies: stunnel, libdb4.6-dev, libssh2-1-dev
  - Add build-dependency on openssh-server
  - Drop libssh2-1-dev from libcurl4-openssl-dev's Depends.
  - Call automake-1.9 with --add-missing --copy --force
* drop debian/patches/security_CVE-2009-0037.patch 
  - this patch is part of 7.19.4

Show diffs side-by-side

added added

removed removed

Lines of Context:
7
7
 *                            | (__| |_| |  _ <| |___
8
8
 *                             \___|\___/|_| \_\_____|
9
9
 *
10
 
 * Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al.
 
10
 * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
11
11
 *
12
12
 * This software is licensed as described in the file COPYING, which
13
13
 * you should have received as part of this distribution. The terms
20
20
 * This software is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY
21
21
 * KIND, either express or implied.
22
22
 *
23
 
 * $Id: ssluse.h,v 1.30 2008-05-09 11:27:55 mmarek Exp $
 
23
 * $Id: ssluse.h,v 1.32 2008-09-05 14:29:21 bagder Exp $
24
24
 ***************************************************************************/
25
25
 
 
26
#ifdef USE_SSLEAY
26
27
/*
27
28
 * This header should only be needed to get included by sslgen.c and ssluse.c
28
29
 */
71
72
int Curl_ossl_seed(struct SessionHandle *data);
72
73
 
73
74
int Curl_ossl_shutdown(struct connectdata *conn, int sockindex);
74
 
 
75
 
#endif
 
75
bool Curl_ossl_data_pending(const struct connectdata *conn,
 
76
                            int connindex);
 
77
 
 
78
/* API setup for OpenSSL */
 
79
#define curlssl_init Curl_ossl_init
 
80
#define curlssl_cleanup Curl_ossl_cleanup
 
81
#define curlssl_connect Curl_ossl_connect
 
82
#define curlssl_connect_nonblocking Curl_ossl_connect_nonblocking
 
83
#define curlssl_session_free(x) Curl_ossl_session_free(x)
 
84
#define curlssl_close_all Curl_ossl_close_all
 
85
#define curlssl_close Curl_ossl_close
 
86
#define curlssl_shutdown(x,y) Curl_ossl_shutdown(x,y)
 
87
#define curlssl_set_engine(x,y) Curl_ossl_set_engine(x,y)
 
88
#define curlssl_set_engine_default(x) Curl_ossl_set_engine_default(x)
 
89
#define curlssl_engines_list(x) Curl_ossl_engines_list(x)
 
90
#define curlssl_send Curl_ossl_send
 
91
#define curlssl_recv Curl_ossl_recv
 
92
#define curlssl_version Curl_ossl_version
 
93
#define curlssl_check_cxn Curl_ossl_check_cxn
 
94
#define curlssl_data_pending(x,y) Curl_ossl_data_pending(x,y)
 
95
 
 
96
#endif /* USE_SSLEAY */
 
97
#endif /* __SSLUSE_H */