albino
/
ngircd-tor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

SSL/TLS: remove redundant asserts/ifdefs

This commit is contained in:
Florian Westphal 2009-05-15 23:28:59 +02:00
parent 57aa64e117
commit 5196e9bcb1
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/ngircd/conn-ssl.c
View File

@ -383,7 +383,6 @@ ConnSSL_Init_SSL(CONNECTION *c)
int ret; int ret;
assert(c != NULL); assert(c != NULL);
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
assert(ssl_ctx);
if (!ssl_ctx) /* NULL when library initialization failed */ if (!ssl_ctx) /* NULL when library initialization failed */
return false; return false;
@ -433,10 +432,7 @@ ConnSSL_PrepareConnect(CONNECTION *c, UNUSED CONF_SERVER *s)
bool ret; bool ret;
#ifdef HAVE_LIBGNUTLS #ifdef HAVE_LIBGNUTLS
int err; int err;
#endif
assert(c != NULL);
assert(s != NULL);
#ifdef HAVE_LIBGNUTLS
err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_CLIENT); err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_CLIENT);
if (err) { if (err) {
Log(LOG_ERR, "gnutls_init: %s", gnutls_strerror(err)); Log(LOG_ERR, "gnutls_init: %s", gnutls_strerror(err));
@ -471,8 +467,6 @@ ConnSSL_HandleError( CONNECTION *c, const int code, const char *fname )
unsigned long sslerr; unsigned long sslerr;
int real_errno = errno; int real_errno = errno;
assert( fname );
ret = SSL_get_error(c->ssl_state.ssl, code); ret = SSL_get_error(c->ssl_state.ssl, code);
switch (ret) { switch (ret) {
case SSL_ERROR_WANT_READ: case SSL_ERROR_WANT_READ:
@ -545,8 +539,7 @@ ConnSSL_LogCertInfo( CONNECTION *c )
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
SSL *ssl = c->ssl_state.ssl; SSL *ssl = c->ssl_state.ssl;
assert( c ); assert(ssl);
assert( ssl );
Log(LOG_INFO, "New %s connection using cipher %s on socket %d.", Log(LOG_INFO, "New %s connection using cipher %s on socket %d.",
SSL_get_version(ssl), SSL_get_cipher(ssl), c->sock); SSL_get_version(ssl), SSL_get_cipher(ssl), c->sock);
@ -574,11 +567,8 @@ int
ConnSSL_Accept( CONNECTION *c ) ConnSSL_Accept( CONNECTION *c )
{ {
assert(c != NULL); assert(c != NULL);
#ifdef HAVE_LIBSSL
if (!c->ssl_state.ssl) {
#endif
#ifdef HAVE_LIBGNUTLS
if (!Conn_OPTION_ISSET(c, CONN_SSL)) { if (!Conn_OPTION_ISSET(c, CONN_SSL)) {
#ifdef HAVE_LIBGNUTLS
int err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_SERVER); int err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_SERVER);
if (err) { if (err) {
Log(LOG_ERR, "gnutls_init: %s", gnutls_strerror(err)); Log(LOG_ERR, "gnutls_init: %s", gnutls_strerror(err));
@ -600,9 +590,7 @@ ConnSSL_Connect( CONNECTION *c )
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
assert(c->ssl_state.ssl); assert(c->ssl_state.ssl);
#endif #endif
#ifdef HAVE_LIBGNUTLS
assert(Conn_OPTION_ISSET(c, CONN_SSL)); assert(Conn_OPTION_ISSET(c, CONN_SSL));
#endif
return ConnectAccept(c, true); return ConnectAccept(c, true);
} }
@ -622,7 +610,6 @@ ConnectAccept( CONNECTION *c, bool connect)
#endif #endif
#ifdef HAVE_LIBGNUTLS #ifdef HAVE_LIBGNUTLS
(void) connect; (void) connect;
assert(Conn_OPTION_ISSET(c, CONN_SSL));
ret = gnutls_handshake(c->ssl_state.gnutls_session); ret = gnutls_handshake(c->ssl_state.gnutls_session);
if (ret) if (ret)
return ConnSSL_HandleError(c, ret, "gnutls_handshake"); return ConnSSL_HandleError(c, ret, "gnutls_handshake");
@ -647,7 +634,8 @@ ConnSSL_Write(CONNECTION *c, const void *buf, size_t count)
#ifdef HAVE_LIBGNUTLS #ifdef HAVE_LIBGNUTLS
bw = gnutls_write(c->ssl_state.gnutls_session, buf, count); bw = gnutls_write(c->ssl_state.gnutls_session, buf, count);
#endif #endif
if ( bw > 0 ) return bw; if (bw > 0)
return bw;
if (ConnSSL_HandleError( c, bw, "ConnSSL_Write") == 0) if (ConnSSL_HandleError( c, bw, "ConnSSL_Write") == 0)
errno = EAGAIN; /* try again */ errno = EAGAIN; /* try again */
return -1; return -1;
@ -684,11 +672,8 @@ ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len)
{ {
#ifdef HAVE_LIBSSL #ifdef HAVE_LIBSSL
char *nl; char *nl;
SSL *ssl = c->ssl_state.ssl;
SSL *ssl;
assert(c != NULL);
assert(len >= 128);
ssl = c->ssl_state.ssl;
if (!ssl) if (!ssl)
return false; return false;
*buf = 0; *buf = 0;
@ -699,8 +684,6 @@ ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len)
return true; return true;
#endif #endif
#ifdef HAVE_LIBGNUTLS #ifdef HAVE_LIBGNUTLS
assert(c != NULL);
assert(len >= 128);
if (Conn_OPTION_ISSET(c, CONN_SSL)) { if (Conn_OPTION_ISSET(c, CONN_SSL)) {
const char *name_cipher, *name_mac, *name_proto, *name_keyexchange; const char *name_cipher, *name_mac, *name_proto, *name_keyexchange;
unsigned keysize; unsigned keysize;