Mercurial > pidgin
comparison libpurple/sslconn.h @ 21088:fc80a99f6f40
propagate from branch 'im.pidgin.pidgin' (head ef97aa9259d77504bb07c2dff5ec0750d498e847)
to branch 'org.maemo.garage.pidgin.pidgin.dialog-transience' (head 0e5385979f58d6ee74f668bb9b5dfd1ae3b6043f)
author | Gabriel Schulhof <nix@go-nix.ca> |
---|---|
date | Wed, 10 Oct 2007 23:19:58 +0000 |
parents | 4511d15a8f80 |
children | bbcc9e206c43 d604027959a5 |
comparison
equal
deleted
inserted
replaced
21086:8c9aad9479c0 | 21088:fc80a99f6f40 |
---|---|
202 PurpleSslInputFunction func, | 202 PurpleSslInputFunction func, |
203 PurpleSslErrorFunction error_func, | 203 PurpleSslErrorFunction error_func, |
204 void *data); | 204 void *data); |
205 | 205 |
206 /** | 206 /** |
207 * Makes a SSL connection using an already open file descriptor. | 207 * Makes a SSL connection using an already open file descriptor. |
208 * | 208 * |
209 * @param account The account making the connection. | 209 * @param account The account making the connection. |
210 * @param fd The file descriptor. | 210 * @param fd The file descriptor. |
211 * @param func The SSL input handler function. | 211 * @param func The SSL input handler function. |
212 * @param error_func The SSL error handler function. | 212 * @param error_func The SSL error handler function. |
213 * @param host The hostname of the other peer (to verify the CN) | 213 * @param host The hostname of the other peer (to verify the CN) |
214 * @param data User-defined data. | 214 * @param data User-defined data. |
215 * | 215 * |
216 * @return The SSL connection handle. | 216 * @return The SSL connection handle. |
217 */ | 217 * |
218 * @since 2.2.0 | |
219 */ | |
218 PurpleSslConnection *purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd, | 220 PurpleSslConnection *purple_ssl_connect_with_host_fd(PurpleAccount *account, int fd, |
219 PurpleSslInputFunction func, | 221 PurpleSslInputFunction func, |
220 PurpleSslErrorFunction error_func, | 222 PurpleSslErrorFunction error_func, |
221 const char *host, | 223 const char *host, |
222 void *data); | 224 void *data); |
266 * | 268 * |
267 * @param gsc The SSL connection handle | 269 * @param gsc The SSL connection handle |
268 * | 270 * |
269 * @return The peer certificate chain, in the order of certificate, issuer, | 271 * @return The peer certificate chain, in the order of certificate, issuer, |
270 * issuer's issuer, etc. @a NULL if no certificates have been provided, | 272 * issuer's issuer, etc. @a NULL if no certificates have been provided, |
273 * | |
274 * @since 2.2.0 | |
271 */ | 275 */ |
272 GList * purple_ssl_get_peer_certificates(PurpleSslConnection *gsc); | 276 GList * purple_ssl_get_peer_certificates(PurpleSslConnection *gsc); |
273 | 277 |
274 /*@}*/ | 278 /*@}*/ |
275 | 279 |