From da2100919c081204ae2fe48e8e3c156bf717d353 Mon Sep 17 00:00:00 2001 From: Linus Nordberg Date: Tue, 1 Mar 2011 13:51:35 +0100 Subject: Error handling cleanup Remove RSE_SOME_ERROR. rs_tls_init: Push SSL error stack on libradsec error stack. --- lib/tls.c | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) (limited to 'lib/tls.c') diff --git a/lib/tls.c b/lib/tls.c index d9eb801..f57c027 100644 --- a/lib/tls.c +++ b/lib/tls.c @@ -6,6 +6,7 @@ #include #include +#include #include #include @@ -42,10 +43,12 @@ _get_tlsconf (struct rs_connection *conn, const struct rs_realm *realm) int rs_tls_init (struct rs_connection *conn) { - struct rs_context *ctx; - struct tls *tlsconf; - SSL_CTX *ssl_ctx; - SSL *ssl; + struct rs_context *ctx = NULL; + struct tls *tlsconf = NULL; + SSL_CTX *ssl_ctx = NULL; + SSL *ssl = NULL; + unsigned long sslerr = 0; + assert (conn->ctx); ctx = conn->ctx; @@ -55,18 +58,18 @@ rs_tls_init (struct rs_connection *conn) ssl_ctx = tlsgetctx (RADPROT_TLS, tlsconf); if (!ssl_ctx) { - /* TODO: check radsecproxy error */ - return rs_err_conn_push_fl (conn, RSE_SOME_ERROR, __FILE__, __LINE__, - NULL); + for (sslerr = ERR_get_error (); sslerr; sslerr = ERR_get_error ()) + rs_err_conn_push_fl (conn, RSE_SSLERR, __FILE__, __LINE__, + ERR_error_string (sslerr, NULL)); + return -1; } - ssl = SSL_new (ssl_ctx); if (!ssl) { - /* TODO: check and report SSL error */ - /* TODO: free ssl_ctx */ - return rs_err_conn_push_fl (conn, RSE_SOME_ERROR, __FILE__, __LINE__, - NULL); + for (sslerr = ERR_get_error (); sslerr; sslerr = ERR_get_error ()) + rs_err_conn_push_fl (conn, RSE_SSLERR, __FILE__, __LINE__, + ERR_error_string (sslerr, NULL)); + return -1; } conn->tls_ctx = ssl_ctx; -- cgit v1.1