/*
* ngIRCd -- The Next Generation IRC Daemon
- * Copyright (c) 2005-2008 Florian Westphal <fw@strlen.de>
+ * Copyright (c)2005-2008 Florian Westphal (fw@strlen.de).
+ * Copyright (c)2008-2014 Alexander Barton (alex@barton.de) and Contributors.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * Please read the file COPYING, README and AUTHORS for more information.
*/
#include "portab.h"
* SSL wrapper functions
*/
-#include "imp.h"
#include "conf-ssl.h"
#ifdef SSL_SUPPORT
#include "conn-ssl.h"
#include "log.h"
-#include "exp.h"
#include "defines.h"
extern struct SSLOptions Conf_SSLOptions;
static gnutls_certificate_credentials_t x509_cred;
static gnutls_dh_params_t dh_params;
+static gnutls_priority_t priorities_cache;
static bool ConnSSL_LoadServerKey_gnutls PARAMS(( void ));
#endif
-#define SHA1_STRING_LEN (20 * 2 + 1)
+#define SHA256_STRING_LEN (32 * 2 + 1)
static bool ConnSSL_Init_SSL PARAMS(( CONNECTION *c ));
static int ConnectAccept PARAMS(( CONNECTION *c, bool connect ));
if (!ConnSSL_LoadServerKey_openssl(newctx))
goto out;
+ if (SSL_CTX_set_cipher_list(newctx, Conf_SSLOptions.CipherList) == 0) {
+ Log(LOG_ERR, "Failed to apply OpenSSL cipher list \"%s\"!",
+ Conf_SSLOptions.CipherList);
+ goto out;
+ }
+
SSL_CTX_set_options(newctx, SSL_OP_SINGLE_DH_USE|SSL_OP_NO_SSLv2);
SSL_CTX_set_mode(newctx, SSL_MODE_ENABLE_PARTIAL_WRITE);
SSL_CTX_set_verify(newctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
if (err) {
Log(LOG_ERR, "Failed to initialize GnuTLS: %s",
gnutls_strerror(err));
- array_free(&Conf_SSLOptions.ListenPorts);
- return false;
+ goto out;
}
- if (!ConnSSL_LoadServerKey_gnutls()) {
- array_free(&Conf_SSLOptions.ListenPorts);
- return false;
+
+ if (!ConnSSL_LoadServerKey_gnutls())
+ goto out;
+
+ if (gnutls_priority_init(&priorities_cache, Conf_SSLOptions.CipherList,
+ NULL) != GNUTLS_E_SUCCESS) {
+ Log(LOG_ERR,
+ "Failed to apply GnuTLS cipher list \"%s\"!",
+ Conf_SSLOptions.CipherList);
+ goto out;
}
+
Log(LOG_INFO, "GnuTLS %s initialized.", gnutls_check_version(NULL));
initialized = true;
return true;
+out:
+ array_free(&Conf_SSLOptions.ListenPorts);
+ return false;
#endif
}
if (array_bytes(&Conf_SSLOptions.KeyFilePassword))
Log(LOG_WARNING,
- "Ignoring KeyFilePassword: Not supported by GnuTLS.");
+ "Ignoring SSL \"KeyFilePassword\": Not supported by GnuTLS.");
if (!Load_DH_params())
return false;
ConnSSL_Init_SSL(CONNECTION *c)
{
int ret;
+
+ LogDebug("Initializing SSL ...");
assert(c != NULL);
+
#ifdef HAVE_LIBSSL
if (!ssl_ctx) {
Log(LOG_ERR,
LogOpenSSLError("Failed to create SSL structure", NULL);
return false;
}
+ Conn_OPTION_ADD(c, CONN_SSL);
ret = SSL_set_fd(c->ssl_state.ssl, c->sock);
if (ret != 1) {
}
#endif
#ifdef HAVE_LIBGNUTLS
- ret = gnutls_set_default_priority(c->ssl_state.gnutls_session);
- if (ret < 0) {
- Log(LOG_ERR, "Failed to set GnuTLS default priority: %s",
+ Conn_OPTION_ADD(c, CONN_SSL);
+ ret = gnutls_priority_set(c->ssl_state.gnutls_session, priorities_cache);
+ if (ret != GNUTLS_E_SUCCESS) {
+ Log(LOG_ERR, "Failed to set GnuTLS session priorities: %s",
gnutls_strerror(ret));
ConnSSL_Free(c);
return false;
* 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);
- gnutls_certificate_server_set_request(c->ssl_state.gnutls_session, GNUTLS_CERT_REQUEST);
- ret = gnutls_credentials_set(c->ssl_state.gnutls_session, GNUTLS_CRD_CERTIFICATE, x509_cred);
- if (ret < 0) {
- Log(LOG_ERR, "Failed to set SSL credentials: %s", gnutls_strerror(ret));
+ gnutls_transport_set_ptr(c->ssl_state.gnutls_session,
+ (gnutls_transport_ptr_t) (long) c->sock);
+ gnutls_certificate_server_set_request(c->ssl_state.gnutls_session,
+ GNUTLS_CERT_REQUEST);
+ ret = gnutls_credentials_set(c->ssl_state.gnutls_session,
+ GNUTLS_CRD_CERTIFICATE, x509_cred);
+ if (ret != 0) {
+ Log(LOG_ERR, "Failed to set SSL credentials: %s",
+ gnutls_strerror(ret));
ConnSSL_Free(c);
return false;
}
gnutls_dh_set_prime_bits(c->ssl_state.gnutls_session, DH_BITS_MIN);
#endif
- Conn_OPTION_ADD(c, CONN_SSL);
return true;
}
return false;
}
#endif
- LogDebug("Initializing SSL data ...");
if (!ConnSSL_Init_SSL(c))
return -1;
}
if (!cert)
return 0;
- if (!X509_digest(cert, EVP_sha1(), digest, &digest_size)) {
+ if (!X509_digest(cert, EVP_sha256(), digest, &digest_size)) {
X509_free(cert);
return 0;
}
unsigned char digest[MAX_HASH_SIZE];
size_t digest_size;
- if (gnutls_certificate_type_get(c->ssl_state.gnutls_session) != GNUTLS_CRT_X509)
+ if (gnutls_certificate_type_get(c->ssl_state.gnutls_session) !=
+ GNUTLS_CRT_X509)
return 0;
if (gnutls_x509_crt_init(&cert) != GNUTLS_E_SUCCESS)
return 0;
}
- if (gnutls_x509_crt_import(cert, &cert_list[0], GNUTLS_X509_FMT_DER) != GNUTLS_E_SUCCESS) {
+ if (gnutls_x509_crt_import(cert, &cert_list[0],
+ GNUTLS_X509_FMT_DER) != GNUTLS_E_SUCCESS) {
gnutls_x509_crt_deinit(cert);
return 0;
}
digest_size = sizeof(digest);
- if (gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA1, digest, &digest_size)) {
+ if (gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA256, digest,
+ &digest_size)) {
gnutls_x509_crt_deinit(cert);
return 0;
}
assert(c->ssl_state.fingerprint == NULL);
- c->ssl_state.fingerprint = malloc(SHA1_STRING_LEN);
+ c->ssl_state.fingerprint = malloc(SHA256_STRING_LEN);
if (!c->ssl_state.fingerprint)
return 0;
ConnSSL_SetCertFp(CONNECTION *c, const char *fingerprint)
{
assert (c != NULL);
- c->ssl_state.fingerprint = strndup(fingerprint, SHA1_STRING_LEN - 1);
+ c->ssl_state.fingerprint = strndup(fingerprint, SHA256_STRING_LEN - 1);
return c->ssl_state.fingerprint != NULL;
}
#else