From bc9c7b0ebb9f880015622e978c5df681cc6bf139 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 30 Jan 2015 14:33:50 +0100 Subject: [PATCH] moved code to right place --- src/ssli_gnutls.c | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/src/ssli_gnutls.c b/src/ssli_gnutls.c index 1d2a153..dde1909 100644 --- a/src/ssli_gnutls.c +++ b/src/ssli_gnutls.c @@ -70,6 +70,19 @@ SSL_handle_t * SSLi_newconnection( int * fileDescriptor, bool_t * isSSLReady ) gnutls_transport_set_int(*session, *fileDescriptor); + *isSSLReady = true; + + return session; + } + +bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash) + { + *hash = 0; + return true; + } + +int SSLi_nonblockaccept( SSL_handle_t *session, bool_t * isSSLReady ) + { int error; do { gnutls_handshake(*session); @@ -79,13 +92,7 @@ SSL_handle_t * SSLi_newconnection( int * fileDescriptor, bool_t * isSSLReady ) Log_fatal("TLS handshake failed with error %i (%s).", error, gnutls_strerror(error)); } - *isSSLReady = true; - - return session; + return error; } -bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash) - { - *hash = 0; - return true; - } + -- 2.30.2