diff options
| author | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2004-10-06 08:30:48 +0000 |
|---|---|---|
| committer | joe <joe@61a7d7f5-40b7-0310-9c16-bb0ea8cb1845> | 2004-10-06 08:30:48 +0000 |
| commit | 9c8647fcb6f9a5eefeecb60943b99f071f5224f8 (patch) | |
| tree | 0ddc08cdb6898e1a124547eb2619e117261f8779 /src/ne_ssl.h | |
| parent | 1b3370cb233575b93b57f5619746be6909158c2a (diff) | |
| download | neon-9c8647fcb6f9a5eefeecb60943b99f071f5224f8.tar.gz | |
Simplify and extend abstraction of SSL layer:
* src/ne_privssl.h: Make ne_ssl_socket a typedef.
[HAVE_GNUTLS]: Remove union cred, gnutls_session pointer.
(ne__sock_sslsock): Add prototype.
* src/ne_socket.h (ne_sock_accept_ssl): Replaces ne_sock_switch_ssl.
Remove ne_sock_sslsock prototype.
* src/ne_socket.c: Include ne_privssl.h later.
(readable_ossl, error_ossl, write_ossl, readable_gnutls, error_gnutls,
read_gnutls, write_gnutls, ne_sock_connect_ssl): Adjust for
ne_ssl_socket change. (ne__sock_sslsock): Rename from
ne_sock_sslsock. (ne_sock_accept_ssl): New function.
(ne_sock_switch_ssl): Remove function.
* src/ne_ssl.h (ne_ssl_context_create): Take flags argument.
(ne_ssl_context_keypair): New prototype.
(ne_ssl_context_trustcert): Renamed from ne_ssl_ctx_trustcert.
* src/ne_openssl.c (ne_ssl_context_create): Take flags.
(ne_ssl_context_keypair): Implement.
(ne__negotiate_ssl): Adjust to use ne__sock_sslsock.
* src/ne_gnutls.c (ne_ssl_context_create): Take flags, adjust
for ctx->cred change.
(ne_ssl_context_keypair): Implement.
* test/socket.c (init_ssl): Switch to use ne_ssl_context for the
server context rather than OpenSSL directly.
git-svn-id: http://svn.webdav.org/repos/projects/neon/trunk@284 61a7d7f5-40b7-0310-9c16-bb0ea8cb1845
Diffstat (limited to 'src/ne_ssl.h')
| -rw-r--r-- | src/ne_ssl.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/ne_ssl.h b/src/ne_ssl.h index bda65a3..a7df0de 100644 --- a/src/ne_ssl.h +++ b/src/ne_ssl.h @@ -137,10 +137,13 @@ void ne_ssl_clicert_free(ne_ssl_client_cert *ccert); typedef struct ne_ssl_context_s ne_ssl_context; /* Create an SSL context. */ -ne_ssl_context *ne_ssl_context_create(void); +ne_ssl_context *ne_ssl_context_create(int server); /* Trust the given certificate 'cert' in context 'ctx'. */ -void ne_ssl_ctx_trustcert(ne_ssl_context *ctx, const ne_ssl_certificate *cert); +void ne_ssl_context_trustcert(ne_ssl_context *ctx, const ne_ssl_certificate *cert); + +int ne_ssl_context_keypair(ne_ssl_context *ctx, + const char *cert, const char *key); /* Destroy an SSL context. */ void ne_ssl_context_destroy(ne_ssl_context *ctx); |