{
array *pass = password;
int passlen;
- assert(rwflag == 0); /* 0 -> callback used for decryption. See SSL_CTX_set_default_passwd_cb(3) */
+
+ (void)rwflag; /* rwflag is unused if DEBUG is not set. */
+ assert(rwflag == 0); /* 0 -> callback used for decryption.
+ * See SSL_CTX_set_default_passwd_cb(3) */
passlen = (int) array_bytes(pass);
bool ret = true;
if (!Conf_SSLOptions.DHFile) {
- Log(LOG_NOTICE, "Configuration option \"SSLDHFile\" not set");
+ Log(LOG_NOTICE, "Configuration option \"SSLDHFile\" not set!");
return false;
}
fp = fopen(Conf_SSLOptions.DHFile, "r");
}
dh_params = PEM_read_DHparams(fp, NULL, NULL, NULL);
if (!dh_params) {
- Log(LOG_ERR, "%s: PEM_read_DHparams failed", Conf_SSLOptions.DHFile);
+ Log(LOG_ERR, "%s: PEM_read_DHparams failed!",
+ Conf_SSLOptions.DHFile);
ret = false;
}
fclose(fp);
}
}
if (need_dhgenerate) {
- Log(LOG_WARNING, "SSLDHFile not set, generating %u bit DH parameters. This may take a while...", DH_BITS);
+ Log(LOG_WARNING,
+ "SSLDHFile not set, generating %u bit DH parameters. This may take a while ...",
+ DH_BITS);
err = gnutls_dh_params_generate2(tmp_dh_params, DH_BITS);
if (err < 0) {
Log(LOG_ERR, "gnutls_dh_params_generate2: %s", gnutls_strerror(err));
}
#endif
assert(Conn_OPTION_ISSET(c, CONN_SSL));
- Conn_OPTION_DEL(c, (CONN_SSL_CONNECT|CONN_SSL|CONN_SSL_WANT_WRITE));
+ /* can't just set bitmask to 0 -- there are other, non-ssl related flags, e.g. CONN_ZIP. */
+ Conn_OPTION_DEL(c, CONN_SSL_FLAGS_ALL);
}
SSL_CTX_set_mode(newctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
SSL_CTX_free(ssl_ctx);
ssl_ctx = newctx;
- Log(LOG_INFO, "%s initialized", SSLeay_version(SSLEAY_VERSION));
+ Log(LOG_INFO, "%s initialized.", SSLeay_version(SSLEAY_VERSION));
return true;
out:
SSL_CTX_free(newctx);
}
if (!ConnSSL_LoadServerKey_gnutls())
return false;
- Log(LOG_INFO, "gnutls %s initialized", gnutls_check_version(NULL));
+ Log(LOG_INFO, "gnutls %s initialized.", gnutls_check_version(NULL));
initialized = true;
return true;
#endif
cert_file = Conf_SSLOptions.CertFile ? Conf_SSLOptions.CertFile:Conf_SSLOptions.KeyFile;
if (!cert_file) {
- Log(LOG_ERR, "Neither Key nor certificate File set");
+ Log(LOG_NOTICE, "No SSL server key configured, SSL disabled.");
return false;
}
if (array_bytes(&Conf_SSLOptions.KeyFilePassword))
- Log(LOG_WARNING, "Ignoring KeyFilePassword: Not supported by GNUTLS");
+ Log(LOG_WARNING,
+ "Ignoring KeyFilePassword: Not supported by GNUTLS.");
if (!Load_DH_params())
return false;
assert(ctx);
if (!Conf_SSLOptions.KeyFile) {
- Log(LOG_NOTICE, "No SSL Server Key configured, ssl disabled");
+ Log(LOG_NOTICE, "No SSL server key configured, SSL disabled.");
return false;
}
Log(LOG_ERR, "gnutls_set_default_priority: %s", gnutls_strerror(ret));
ConnSSL_Free(c);
}
- gnutls_transport_set_ptr(c->ssl_state.gnutls_session, (gnutls_transport_ptr_t) c->sock);
+ /*
+ * The intermediate (long) cast is here to avoid a warning like:
+ * "cast to pointer from integer of different size" on 64-bit platforms.
+ * There doesn't seem to be an alternate GNUTLS API we could use instead, see e.g.
+ * http://www.mail-archive.com/help-gnutls@gnu.org/msg00286.html
+ */
+ gnutls_transport_set_ptr(c->ssl_state.gnutls_session, (gnutls_transport_ptr_t) (long) c->sock);
ret = gnutls_credentials_set(c->ssl_state.gnutls_session, GNUTLS_CRD_CERTIFICATE, x509_cred);
if (ret < 0) {
Log(LOG_ERR, "gnutls_credentials_set: %s", gnutls_strerror(ret));
Conn_OPTION_ADD(c, CONN_SSL_WANT_WRITE); /* fall through */
case SSL_ERROR_NONE:
return 0; /* try again later */
- case SSL_ERROR_ZERO_RETURN: /* TLS/SSL Connection was shut down */
- LogOpenSSLError("TLS/SSL Connection shutdown", fname);
+ case SSL_ERROR_ZERO_RETURN:
+ LogDebug("TLS/SSL connection shut down normally");
break;
/*
SSL_ERROR_WANT_CONNECT, SSL_ERROR_WANT_ACCEPT, SSL_ERROR_WANT_X509_LOOKUP
switch (code) {
case GNUTLS_E_AGAIN:
case GNUTLS_E_INTERRUPTED:
- if (gnutls_record_get_direction(c->ssl_state.gnutls_session)) { /* need write */
- io_event_del(c->sock, IO_WANTREAD);
- Conn_OPTION_ADD(c, CONN_SSL_WANT_WRITE); /* fall through */
- break;
- } else { /* need read */
- io_event_del(c->sock, IO_WANTWRITE);
- Conn_OPTION_ADD(c, CONN_SSL_WANT_READ);
+ if (gnutls_record_get_direction(c->ssl_state.gnutls_session)) {
+ Conn_OPTION_ADD(c, CONN_SSL_WANT_WRITE);
+ io_event_del(c->sock, IO_WANTREAD);
+ } else {
+ Conn_OPTION_ADD(c, CONN_SSL_WANT_READ);
+ io_event_del(c->sock, IO_WANTWRITE);
+ }
break;
- }
default:
assert(code < 0);
if (gnutls_error_is_fatal(code)) {
assert( c );
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);
#endif
#ifdef HAVE_LIBGNUTLS
- gnutls_credentials_type_t cred;
gnutls_session_t sess = c->ssl_state.gnutls_session;
gnutls_cipher_algorithm_t cipher = gnutls_cipher_get(sess);
- Log( LOG_INFO, "New %s connection using cipher %s-%s on socket %d",
- gnutls_protocol_get_name(gnutls_protocol_get_version(sess)),
- gnutls_cipher_get_name(cipher), gnutls_mac_get_name(gnutls_mac_get(sess)), c->sock);
+ Log(LOG_INFO, "New %s connection using cipher %s-%s on socket %d.",
+ gnutls_protocol_get_name(gnutls_protocol_get_version(sess)),
+ gnutls_cipher_get_name(cipher),
+ gnutls_mac_get_name(gnutls_mac_get(sess)), c->sock);
#endif
}
ConnSSL_GetCipherInfo(CONNECTION *c, char *buf, size_t len)
{
#ifdef HAVE_LIBSSL
+ char *nl;
+
SSL *ssl;
assert(c != NULL);
assert(len >= 128);
ssl = c->ssl_state.ssl;
- if (!ssl) return false;
- return SSL_CIPHER_description(SSL_get_current_cipher(ssl), buf, len) != NULL;
+ if (!ssl)
+ return false;
+ *buf = 0;
+ SSL_CIPHER_description(SSL_get_current_cipher(ssl), buf, len);
+ nl = strchr(buf, '\n');
+ if (nl)
+ *nl = 0;
+ return true;
#endif
#ifdef HAVE_LIBGNUTLS
assert(c != NULL);
name_proto = gnutls_protocol_get_name(gnutls_protocol_get_version(sess));
name_keyexchange = gnutls_kx_get_name(gnutls_kx_get(sess));
- return snprintf(buf, len, "%s-%s%15s Kx=%s Enc=%s(%u) Mac=%s\n",
+ return snprintf(buf, len, "%s-%s%15s Kx=%s Enc=%s(%u) Mac=%s",
name_cipher, name_mac, name_proto, name_keyexchange, name_cipher, keysize, name_mac) > 0;
}
return false;
projects / ngircd-alex.git / blobdiff