Mercurial > pidgin
comparison libpurple/sslconn.h @ 32672:3828a61c44da
A boring and large patch so I can merge heads.
author | Elliott Sales de Andrade <qulogic@pidgin.im> |
---|---|
date | Fri, 23 Dec 2011 08:21:58 +0000 |
parents | 12f5a7916131 |
children |
comparison
equal
deleted
inserted
replaced
32671:0e69949b3e61 | 32672:3828a61c44da |
---|---|
201 * destroyed for you. | 201 * destroyed for you. |
202 * @param ssl_host The hostname of the other peer (to verify the CN) | 202 * @param ssl_host The hostname of the other peer (to verify the CN) |
203 * @param data User-defined data. | 203 * @param data User-defined data. |
204 * | 204 * |
205 * @return The SSL connection handle. | 205 * @return The SSL connection handle. |
206 * @since 2.6.0 | |
207 */ | 206 */ |
208 PurpleSslConnection *purple_ssl_connect_with_ssl_cn(PurpleAccount *account, const char *host, | 207 PurpleSslConnection *purple_ssl_connect_with_ssl_cn(PurpleAccount *account, const char *host, |
209 int port, PurpleSslInputFunction func, | 208 int port, PurpleSslInputFunction func, |
210 PurpleSslErrorFunction error_func, | 209 PurpleSslErrorFunction error_func, |
211 const char *ssl_host, | 210 const char *ssl_host, |
212 void *data); | 211 void *data); |
213 | |
214 #if !(defined PURPLE_DISABLE_DEPRECATED) || (defined _PURPLE_SSLCONN_C_) | |
215 /** | |
216 * Makes a SSL connection using an already open file descriptor. | |
217 * | |
218 * @deprecated Use purple_ssl_connect_with_host_fd() instead. | |
219 * | |
220 * @param account The account making the connection. | |
221 * @param fd The file descriptor. | |
222 * @param func The SSL input handler function. | |
223 * @param error_func The SSL error handler function. | |
224 * @param data User-defined data. | |
225 * | |
226 * @return The SSL connection handle. | |
227 */ | |
228 PurpleSslConnection *purple_ssl_connect_fd(PurpleAccount *account, int fd, | |
229 PurpleSslInputFunction func, | |
230 PurpleSslErrorFunction error_func, | |
231 void *data); | |
232 #endif | |
233 | 212 |
234 /** | 213 /** |
235 * Makes a SSL connection using an already open file descriptor. | 214 * Makes a SSL connection using an already open file descriptor. |
236 * | 215 * |
237 * @param account The account making the connection. | 216 * @param account The account making the connection. |
240 * @param error_func The SSL error handler function. | 219 * @param error_func The SSL error handler function. |
241 * @param host The hostname of the other peer (to verify the CN) | 220 * @param host The hostname of the other peer (to verify the CN) |
242 * @param data User-defined data. | 221 * @param data User-defined data. |
243 * | 222 * |
244 * @return The SSL connection handle. | 223 * @return The SSL connection handle. |
245 * | |
246 * @since 2.2.0 | |
247 */ | 224 */ |
248 PurpleSslConnection *purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd, | 225 PurpleSslConnection *purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd, |
249 PurpleSslInputFunction func, | 226 PurpleSslInputFunction func, |
250 PurpleSslErrorFunction error_func, | 227 PurpleSslErrorFunction error_func, |
251 const char *host, | 228 const char *host, |
296 * | 273 * |
297 * @param gsc The SSL connection handle | 274 * @param gsc The SSL connection handle |
298 * | 275 * |
299 * @return The peer certificate chain, in the order of certificate, issuer, | 276 * @return The peer certificate chain, in the order of certificate, issuer, |
300 * issuer's issuer, etc. @a NULL if no certificates have been provided, | 277 * issuer's issuer, etc. @a NULL if no certificates have been provided, |
301 * | |
302 * @since 2.2.0 | |
303 */ | 278 */ |
304 GList * purple_ssl_get_peer_certificates(PurpleSslConnection *gsc); | 279 GList * purple_ssl_get_peer_certificates(PurpleSslConnection *gsc); |
305 | 280 |
306 /*@}*/ | 281 /*@}*/ |
307 | 282 |