/*
* 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;
#ifdef HAVE_LIBSSL
#include <openssl/err.h>
#include <openssl/rand.h>
+#include <openssl/dh.h>
+#include <openssl/x509v3.h>
+
+#define MAX_CERT_CHAIN_LENGTH 10 /* XXX: do not hardcode */
static SSL_CTX * ssl_ctx;
static DH *dh_params;
static bool ConnSSL_LoadServerKey_openssl PARAMS(( SSL_CTX *c ));
+static bool ConnSSL_SetVerifyProperties_openssl PARAMS((SSL_CTX * c));
#endif
#ifdef HAVE_LIBGNUTLS
#define DH_BITS 2048
#define DH_BITS_MIN 1024
-static gnutls_certificate_credentials_t x509_cred;
+#define MAX_HASH_SIZE 64 /* from gnutls-int.h */
+
+typedef struct {
+ int refcnt;
+ gnutls_certificate_credentials_t x509_cred;
+ gnutls_dh_params_t dh_params;
+} x509_cred_slot;
+
+static array x509_creds = INIT_ARRAY;
+static size_t x509_cred_idx;
+
static gnutls_dh_params_t dh_params;
+static gnutls_priority_t priorities_cache = NULL;
static bool ConnSSL_LoadServerKey_gnutls PARAMS(( void ));
+static bool ConnSSL_SetVerifyProperties_gnutls PARAMS((void));
#endif
+#define SHA256_STRING_LEN (32 * 2 + 1)
+
static bool ConnSSL_Init_SSL PARAMS(( CONNECTION *c ));
static int ConnectAccept PARAMS(( CONNECTION *c, bool connect ));
static int ConnSSL_HandleError PARAMS(( CONNECTION *c, const int code, const char *fname ));
#ifdef HAVE_LIBSSL
+/**
+ * Log OpenSSL error message.
+ *
+ * @param level The log level
+ * @param msg The error message.
+ * @param info Additional information text or NULL.
+ */
static void
-LogOpenSSLError( const char *msg, const char *msg2 )
+LogOpenSSL_CertInfo(int level, X509 * cert, const char *msg)
+{
+ BIO *mem;
+ char *memptr;
+ long len;
+
+ assert(cert);
+ assert(msg);
+
+ if (!cert)
+ return;
+ mem = BIO_new(BIO_s_mem());
+ if (!mem)
+ return;
+ X509_NAME_print_ex(mem, X509_get_subject_name(cert), 0,
+ XN_FLAG_ONELINE);
+ X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_ONELINE);
+ if (BIO_write(mem, "", 1) == 1) {
+ len = BIO_get_mem_data(mem, &memptr);
+ if (memptr && len > 0)
+ Log(level, "%s: \"%s\".", msg, memptr);
+ }
+ (void)BIO_set_close(mem, BIO_CLOSE);
+ BIO_free(mem);
+}
+
+static void
+LogOpenSSLError(const char *error, const char *info)
{
unsigned long err = ERR_get_error();
- char * errmsg = err ? ERR_error_string(err, NULL) : "Unable to determine error";
+ char * errmsg = err
+ ? ERR_error_string(err, NULL)
+ : "Unable to determine error";
+
+ assert(error != NULL);
- if (!msg) msg = "SSL Error";
- if (msg2)
- Log( LOG_ERR, "%s: %s: %s", msg, msg2, errmsg);
+ if (info)
+ Log(LOG_ERR, "%s: %s (%s)", error, info, errmsg);
else
- Log( LOG_ERR, "%s: %s", msg, errmsg);
+ Log(LOG_ERR, "%s: %s", error, errmsg);
}
LogDebug("pem_passwd_cb buf size %d, array size %d", size, passlen);
assert(passlen >= 0);
if (passlen <= 0) {
- Log(LOG_ERR, "pem_passwd_cb: password required, but not set");
+ Log(LOG_ERR, "PEM password required but not set [in pem_passwd_cb()]!");
return 0;
}
size = passlen > size ? size : passlen;
memcpy(buf, (char *)(array_start(pass)), size);
return size;
}
+
+
+static int
+Verify_openssl(int preverify_ok, X509_STORE_CTX * ctx)
+{
+#ifdef DEBUG
+ if (!preverify_ok) {
+ int err = X509_STORE_CTX_get_error(ctx);
+ LogDebug("Certificate validation failed: %s",
+ X509_verify_cert_error_string(err));
+ }
+#else
+ (void)preverify_ok;
+ (void)ctx;
+#endif
+
+ /* Always(!) return success as we have to deal with invalid
+ * (self-signed, expired, ...) client certificates and with invalid
+ * server certificates when "SSLVerify" is disabled, which we don't
+ * know at this stage. Therefore we postpone this check, it will be
+ * (and has to be!) handled in cb_connserver_login_ssl(). */
+ return 1;
+}
#endif
}
dh_params = PEM_read_DHparams(fp, NULL, NULL, NULL);
if (!dh_params) {
- Log(LOG_ERR, "%s: PEM_read_DHparams failed!",
+ Log(LOG_ERR, "%s: Failed to read SSL DH parameters!",
Conf_SSLOptions.DHFile);
ret = false;
}
err = gnutls_dh_params_init(&tmp_dh_params);
if (err < 0) {
- Log(LOG_ERR, "gnutls_dh_params_init: %s", gnutls_strerror(err));
+ Log(LOG_ERR, "Failed to initialize SSL DH parameters: %s",
+ gnutls_strerror(err));
return false;
}
if (Conf_SSLOptions.DHFile) {
if (err == 0)
need_dhgenerate = false;
else
- Log(LOG_ERR, "gnutls_dh_params_init: %s", gnutls_strerror(err));
+ Log(LOG_ERR,
+ "Failed to initialize SSL DH parameters: %s",
+ gnutls_strerror(err));
memset(dhparms.data, 0, size);
free(dhparms.data);
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));
+ Log(LOG_ERR, "Failed to generate SSL DH parameters: %s",
+ gnutls_strerror(err));
return false;
}
}
SSL_shutdown(ssl);
SSL_free(ssl);
c->ssl_state.ssl = NULL;
+ if (c->ssl_state.fingerprint) {
+ free(c->ssl_state.fingerprint);
+ c->ssl_state.fingerprint = NULL;
+ }
}
#endif
#ifdef HAVE_LIBGNUTLS
gnutls_bye(sess, GNUTLS_SHUT_RDWR);
gnutls_deinit(sess);
}
+ x509_cred_slot *slot = array_get(&x509_creds, sizeof(x509_cred_slot), c->ssl_state.x509_cred_idx);
+ assert(slot != NULL);
+ assert(slot->refcnt > 0);
+ assert(slot->x509_cred != NULL);
+ slot->refcnt--;
+ if ((c->ssl_state.x509_cred_idx != x509_cred_idx) && (slot->refcnt <= 0)) {
+ LogDebug("Discarding X509 certificate credentials from slot %zd.",
+ c->ssl_state.x509_cred_idx);
+ gnutls_certificate_free_keys(slot->x509_cred);
+ gnutls_certificate_free_credentials(slot->x509_cred);
+ slot->x509_cred = NULL;
+ gnutls_dh_params_deinit(slot->dh_params);
+ slot->dh_params = NULL;
+ slot->refcnt = 0;
+ }
#endif
assert(Conn_OPTION_ISSET(c, CONN_SSL));
/* can't just set bitmask to 0 -- there are other, non-ssl related flags, e.g. CONN_ZIP. */
bool
ConnSSL_InitLibrary( void )
{
- if (!array_bytes(&Conf_SSLOptions.ListenPorts))
+ if (!Conf_SSLInUse()) {
+ LogDebug("SSL not in use, skipping initialization.");
return true;
+ }
#ifdef HAVE_LIBSSL
SSL_CTX *newctx;
+#if OPENSSL_API_COMPAT < 0x10100000L
if (!ssl_ctx) {
SSL_library_init();
SSL_load_error_strings();
}
+#endif
if (!RAND_status()) {
Log(LOG_ERR, "OpenSSL PRNG not seeded: /dev/urandom missing?");
/*
- * it is probably best to fail and let the user install EGD or a similar program if no kernel random device is available.
- * According to OpenSSL RAND_egd(3): "The automatic query of /var/run/egd-pool et al was added in OpenSSL 0.9.7";
+ * it is probably best to fail and let the user install EGD or
+ * a similar program if no kernel random device is available.
+ * According to OpenSSL RAND_egd(3): "The automatic query of
+ * /var/run/egd-pool et al was added in OpenSSL 0.9.7";
* so it makes little sense to deal with PRNGD seeding ourselves.
*/
array_free(&Conf_SSLOptions.ListenPorts);
newctx = SSL_CTX_new(SSLv23_method());
if (!newctx) {
- LogOpenSSLError("SSL_CTX_new()", NULL);
+ LogOpenSSLError("Failed to create SSL context", NULL);
array_free(&Conf_SSLOptions.ListenPorts);
return false;
}
- if (!ConnSSL_LoadServerKey_openssl(newctx))
+ if (!ConnSSL_LoadServerKey_openssl(newctx)) {
+ /* Failed to read new key but an old ssl context
+ * already exists -> reuse old context */
+ if (ssl_ctx) {
+ SSL_CTX_free(newctx);
+ Log(LOG_WARNING,
+ "Re-Initializing of SSL failed, using old keys!");
+ return true;
+ }
+ /* No preexisting old context -> error. */
goto out;
+ }
- SSL_CTX_set_options(newctx, SSL_OP_SINGLE_DH_USE|SSL_OP_NO_SSLv2);
+ 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_session_id_context(newctx, (unsigned char *)"ngircd", 6);
+ if (!ConnSSL_SetVerifyProperties_openssl(newctx))
+ goto out;
+ SSL_CTX_set_options(newctx,
+ SSL_OP_SINGLE_DH_USE | SSL_OP_NO_SSLv2 |
+ SSL_OP_NO_SSLv3 | SSL_OP_NO_TLSv1 | SSL_OP_NO_TLSv1_1 |
+ SSL_OP_NO_COMPRESSION);
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.", OpenSSL_version(OPENSSL_VERSION));
return true;
out:
SSL_CTX_free(newctx);
#ifdef HAVE_LIBGNUTLS
int err;
static bool initialized;
- if (initialized) /* TODO: cannot reload gnutls keys: can't simply free x509 context -- it may still be in use */
- return false;
- err = gnutls_global_init();
- if (err) {
- Log(LOG_ERR, "gnutls_global_init(): %s", gnutls_strerror(err));
- array_free(&Conf_SSLOptions.ListenPorts);
- return false;
+ if (!initialized) {
+ err = gnutls_global_init();
+ if (err) {
+ Log(LOG_ERR, "Failed to initialize GnuTLS: %s",
+ gnutls_strerror(err));
+ goto out;
+ }
}
- if (!ConnSSL_LoadServerKey_gnutls()) {
- array_free(&Conf_SSLOptions.ListenPorts);
- return false;
+
+ if (!ConnSSL_LoadServerKey_gnutls())
+ goto out;
+
+ if (priorities_cache != NULL) {
+ gnutls_priority_deinit(priorities_cache);
+ }
+ 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));
+
+ if (!ConnSSL_SetVerifyProperties_gnutls())
+ 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
}
#ifdef HAVE_LIBGNUTLS
static bool
-ConnSSL_LoadServerKey_gnutls(void)
+ConnSSL_SetVerifyProperties_gnutls(void)
{
int err;
- const char *cert_file;
- err = gnutls_certificate_allocate_credentials(&x509_cred);
+ if (!Conf_SSLOptions.CAFile)
+ return true;
+
+ x509_cred_slot *slot = array_get(&x509_creds, sizeof(x509_cred_slot), x509_cred_idx);
+ gnutls_certificate_credentials_t x509_cred = slot->x509_cred;
+
+ err = gnutls_certificate_set_x509_trust_file(x509_cred,
+ Conf_SSLOptions.CAFile,
+ GNUTLS_X509_FMT_PEM);
if (err < 0) {
- Log(LOG_ERR, "gnutls_certificate_allocate_credentials: %s", gnutls_strerror(err));
+ Log(LOG_ERR, "Failed to load x509 trust file %s: %s",
+ Conf_SSLOptions.CAFile, gnutls_strerror(err));
return false;
}
+ if (Conf_SSLOptions.CRLFile) {
+ err =
+ gnutls_certificate_set_x509_crl_file(x509_cred,
+ Conf_SSLOptions.CRLFile,
+ GNUTLS_X509_FMT_PEM);
+ if (err < 0) {
+ Log(LOG_ERR, "Failed to load x509 crl file %s: %s",
+ Conf_SSLOptions.CRLFile, gnutls_strerror(err));
+ return false;
+ }
+ }
+ return true;
+}
+
- cert_file = Conf_SSLOptions.CertFile ? Conf_SSLOptions.CertFile:Conf_SSLOptions.KeyFile;
- if (!cert_file) {
- Log(LOG_ERR, "No SSL server key configured!");
+static bool
+ConnSSL_LoadServerKey_gnutls(void)
+{
+ int err;
+ const char *cert_file;
+
+ x509_cred_slot *slot = NULL;
+ gnutls_certificate_credentials_t x509_cred;
+
+ err = gnutls_certificate_allocate_credentials(&x509_cred);
+ if (err < 0) {
+ Log(LOG_ERR, "Failed to allocate certificate credentials: %s",
+ gnutls_strerror(err));
return false;
}
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;
gnutls_certificate_set_dh_params(x509_cred, dh_params);
- err = gnutls_certificate_set_x509_key_file(x509_cred, cert_file, Conf_SSLOptions.KeyFile, GNUTLS_X509_FMT_PEM);
- if (err < 0) {
- Log(LOG_ERR, "gnutls_certificate_set_x509_key_file (cert %s, key %s): %s",
- cert_file, Conf_SSLOptions.KeyFile ? Conf_SSLOptions.KeyFile : "(NULL)", gnutls_strerror(err));
- return false;
+
+ cert_file = Conf_SSLOptions.CertFile ?
+ Conf_SSLOptions.CertFile : Conf_SSLOptions.KeyFile;
+ if (Conf_SSLOptions.KeyFile) {
+ err = gnutls_certificate_set_x509_key_file(x509_cred, cert_file,
+ Conf_SSLOptions.KeyFile,
+ GNUTLS_X509_FMT_PEM);
+ if (err < 0) {
+ Log(LOG_ERR,
+ "Failed to set certificate key file (cert %s, key %s): %s",
+ cert_file,
+ Conf_SSLOptions.KeyFile ? Conf_SSLOptions.KeyFile : "(NULL)",
+ gnutls_strerror(err));
+ return false;
+ }
+ }
+
+ /* Free currently active x509 context (if any) unless it is still in use */
+ slot = array_get(&x509_creds, sizeof(x509_cred_slot), x509_cred_idx);
+ if ((slot != NULL) && (slot->refcnt <= 0) && (slot->x509_cred != NULL)) {
+ LogDebug("Discarding X509 certificate credentials from slot %zd.",
+ x509_cred_idx);
+ gnutls_certificate_free_keys(slot->x509_cred);
+ gnutls_certificate_free_credentials(slot->x509_cred);
+ slot->x509_cred = NULL;
+ gnutls_dh_params_deinit(slot->dh_params);
+ slot->dh_params = NULL;
+ slot->refcnt = 0;
+ }
+
+ /* Find free slot */
+ x509_cred_idx = (size_t) -1;
+ size_t i;
+ for (slot = array_start(&x509_creds), i = 0;
+ i < array_length(&x509_creds, sizeof(x509_cred_slot));
+ slot++, i++) {
+ if (slot->refcnt <= 0) {
+ x509_cred_idx = i;
+ break;
+ }
}
+ /* ... allocate new slot otherwise. */
+ if (x509_cred_idx == (size_t) -1) {
+ x509_cred_idx = array_length(&x509_creds, sizeof(x509_cred_slot));
+ slot = array_alloc(&x509_creds, sizeof(x509_cred_slot), x509_cred_idx);
+ if (slot == NULL) {
+ Log(LOG_ERR, "Failed to allocate new slot for certificate credentials");
+ return false;
+ }
+ }
+ Log(LOG_INFO, "Storing new X509 certificate credentials in slot %zd.", x509_cred_idx);
+ slot->x509_cred = x509_cred;
+ slot->refcnt = 0;
+
return true;
}
#endif
char *cert_key;
assert(ctx);
- if (!Conf_SSLOptions.KeyFile) {
- Log(LOG_ERR, "No SSL server key configured!");
- return false;
- }
-
SSL_CTX_set_default_passwd_cb(ctx, pem_passwd_cb);
SSL_CTX_set_default_passwd_cb_userdata(ctx, &Conf_SSLOptions.KeyFilePassword);
+ if (!Conf_SSLOptions.KeyFile)
+ return true;
+
if (SSL_CTX_use_PrivateKey_file(ctx, Conf_SSLOptions.KeyFile, SSL_FILETYPE_PEM) != 1) {
array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
- LogOpenSSLError("SSL_CTX_use_PrivateKey_file", Conf_SSLOptions.KeyFile);
+ LogOpenSSLError("Failed to add private key", Conf_SSLOptions.KeyFile);
return false;
}
cert_key = Conf_SSLOptions.CertFile ? Conf_SSLOptions.CertFile:Conf_SSLOptions.KeyFile;
if (SSL_CTX_use_certificate_chain_file(ctx, cert_key) != 1) {
array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
- LogOpenSSLError("SSL_CTX_use_certificate_file", cert_key);
+ LogOpenSSLError("Failed to load certificate chain", cert_key);
return false;
}
array_free_wipe(&Conf_SSLOptions.KeyFilePassword);
if (!SSL_CTX_check_private_key(ctx)) {
- LogOpenSSLError("Server Private Key does not match certificate", NULL);
+ LogOpenSSLError("Server private key does not match certificate", NULL);
return false;
}
if (Load_DH_params()) {
if (SSL_CTX_set_tmp_dh(ctx, dh_params) != 1)
- LogOpenSSLError("Error setting DH Parameters", Conf_SSLOptions.DHFile);
+ LogOpenSSLError("Error setting DH parameters", Conf_SSLOptions.DHFile);
/* don't return false here: the non-DH modes will still work */
DH_free(dh_params);
dh_params = NULL;
}
+static bool
+ConnSSL_SetVerifyProperties_openssl(SSL_CTX * ctx)
+{
+ X509_STORE *store = NULL;
+ X509_LOOKUP *lookup;
+ bool ret = false;
+
+ if (!Conf_SSLOptions.CAFile)
+ return true;
+
+ if (SSL_CTX_load_verify_locations(ctx, Conf_SSLOptions.CAFile, NULL) !=
+ 1) {
+ LogOpenSSLError("SSL_CTX_load_verify_locations", NULL);
+ goto out;
+ }
+
+ if (Conf_SSLOptions.CRLFile) {
+ X509_VERIFY_PARAM *param = X509_VERIFY_PARAM_new();
+ X509_VERIFY_PARAM_set_flags(param, X509_V_FLAG_CRL_CHECK);
+ SSL_CTX_set1_param(ctx, param);
+
+ store = SSL_CTX_get_cert_store(ctx);
+ assert(store);
+ lookup = X509_STORE_add_lookup(store, X509_LOOKUP_file());
+ if (!lookup) {
+ LogOpenSSLError("X509_STORE_add_lookup",
+ Conf_SSLOptions.CRLFile);
+ goto out;
+ }
+
+ if (X509_load_crl_file
+ (lookup, Conf_SSLOptions.CRLFile, X509_FILETYPE_PEM) != 1) {
+ LogOpenSSLError("X509_load_crl_file",
+ Conf_SSLOptions.CRLFile);
+ goto out;
+ }
+ }
+
+ SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
+ Verify_openssl);
+ SSL_CTX_set_verify_depth(ctx, MAX_CERT_CHAIN_LENGTH);
+ ret = true;
+out:
+ if (Conf_SSLOptions.CRLFile)
+ free(Conf_SSLOptions.CRLFile);
+ Conf_SSLOptions.CRLFile = NULL;
+ return ret;
+}
+
+
#endif
static bool
ConnSSL_Init_SSL(CONNECTION *c)
{
int ret;
+
+ LogDebug("Initializing SSL ...");
assert(c != NULL);
+
#ifdef HAVE_LIBSSL
if (!ssl_ctx) {
- Log(LOG_ERR, "Cannot init ssl_ctx: OpenSSL initialization failed at startup");
+ Log(LOG_ERR,
+ "Can't initialize SSL context, OpenSSL initialization failed at startup!");
return false;
}
assert(c->ssl_state.ssl == NULL);
+ assert(c->ssl_state.fingerprint == NULL);
c->ssl_state.ssl = SSL_new(ssl_ctx);
if (!c->ssl_state.ssl) {
- LogOpenSSLError("SSL_new()", NULL);
+ 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) {
- LogOpenSSLError("SSL_set_fd()", NULL);
+ LogOpenSSLError("Failed to set SSL file descriptor", NULL);
ConnSSL_Free(c);
return false;
}
#endif
#ifdef HAVE_LIBGNUTLS
- ret = gnutls_set_default_priority(c->ssl_state.gnutls_session);
- if (ret < 0) {
- Log(LOG_ERR, "gnutls_set_default_priority: %s", gnutls_strerror(ret));
+ 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);
- 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));
+ 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);
+
+ LogDebug("Using X509 credentials from slot %zd.", x509_cred_idx);
+ c->ssl_state.x509_cred_idx = x509_cred_idx;
+ x509_cred_slot *slot = array_get(&x509_creds, sizeof(x509_cred_slot), x509_cred_idx);
+ slot->refcnt++;
+ ret = gnutls_credentials_set(c->ssl_state.gnutls_session,
+ GNUTLS_CRD_CERTIFICATE, slot->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;
}
bool
-ConnSSL_PrepareConnect(CONNECTION *c, UNUSED CONF_SERVER *s)
+ConnSSL_PrepareConnect(CONNECTION * c, CONF_SERVER * s)
{
bool ret;
#ifdef HAVE_LIBGNUTLS
int err;
+ (void)s;
err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_CLIENT);
if (err) {
- Log(LOG_ERR, "gnutls_init: %s", gnutls_strerror(err));
+ Log(LOG_ERR, "Failed to initialize new SSL session: %s",
+ gnutls_strerror(err));
return false;
- }
+ }
#endif
ret = ConnSSL_Init_SSL(c);
if (!ret)
return false;
Conn_OPTION_ADD(c, CONN_SSL_CONNECT);
+
#ifdef HAVE_LIBSSL
assert(c->ssl_state.ssl);
- SSL_set_verify(c->ssl_state.ssl, SSL_VERIFY_NONE, NULL);
+
+ X509_VERIFY_PARAM *param = SSL_get0_param(c->ssl_state.ssl);
+ X509_VERIFY_PARAM_set_hostflags(param, X509_CHECK_FLAG_NO_PARTIAL_WILDCARDS);
+ int err = X509_VERIFY_PARAM_set1_host(param, s->host, 0);
+ if (err != 1) {
+ Log(LOG_ERR,
+ "Cannot set up hostname verification for '%s': %u",
+ s->host, err);
+ return false;
+ }
+
+ if (s->SSLVerify)
+ SSL_set_verify(c->ssl_state.ssl, SSL_VERIFY_PEER,
+ Verify_openssl);
+ else
+ SSL_set_verify(c->ssl_state.ssl, SSL_VERIFY_NONE, NULL);
#endif
+
return true;
}
-/*
- Check an Handle Error return code after failed calls to ssl/tls functions.
- OpenSSL:
- SSL_connect(), SSL_accept(), SSL_do_handshake(), SSL_read(), SSL_peek(), or SSL_write() on ssl.
- GNUTLS:
- gnutlsssl_read(), gnutls_write() or gnutls_handshake().
- Return: -1 on fatal error, 0 if we can try again later.
+/**
+ * Check and handle error return codes after failed calls to SSL functions.
+ *
+ * OpenSSL:
+ * SSL_connect(), SSL_accept(), SSL_do_handshake(), SSL_read(), SSL_peek(), or
+ * SSL_write() on ssl.
+ *
+ * GnuTLS:
+ * gnutlsssl_read(), gnutls_write() or gnutls_handshake().
+ *
+ * @param c The connection handle.
+ * @prarm code The return code.
+ * @param fname The name of the function in which the error occurred.
+ * @return -1 on fatal errors, 0 if we can try again later.
*/
static int
-ConnSSL_HandleError( CONNECTION *c, const int code, const char *fname )
+ConnSSL_HandleError(CONNECTION * c, const int code, const char *fname)
{
#ifdef HAVE_LIBSSL
int ret = SSL_ERROR_SYSCALL;
int real_errno = errno;
ret = SSL_get_error(c->ssl_state.ssl, code);
+
switch (ret) {
case SSL_ERROR_WANT_READ:
io_event_del(c->sock, IO_WANTWRITE);
case SSL_ERROR_NONE:
return 0; /* try again later */
case SSL_ERROR_ZERO_RETURN:
- LogDebug("TLS/SSL connection shut down normally");
+ LogDebug("SSL connection shut down normally.");
break;
- /*
- SSL_ERROR_WANT_CONNECT, SSL_ERROR_WANT_ACCEPT, SSL_ERROR_WANT_X509_LOOKUP
- */
case SSL_ERROR_SYSCALL:
+ /* SSL_ERROR_WANT_CONNECT, SSL_ERROR_WANT_ACCEPT,
+ * and SSL_ERROR_WANT_X509_LOOKUP */
sslerr = ERR_get_error();
if (sslerr) {
- Log( LOG_ERR, "%s: %s", fname, ERR_error_string(sslerr, NULL ));
+ Log(LOG_ERR, "SSL error: %s [in %s()]!",
+ ERR_error_string(sslerr, NULL), fname);
} else {
-
switch (code) { /* EOF that violated protocol */
case 0:
- Log(LOG_ERR, "%s: Client Disconnected", fname );
+ Log(LOG_ERR,
+ "SSL error, client disconnected [in %s()]!",
+ fname);
break;
- case -1: /* low level socket I/O error, check errno */
- Log(LOG_ERR, "%s: %s", fname, strerror(real_errno));
+ case -1:
+ /* Low level socket I/O error, check errno. But
+ * we don't need to log this here, the generic
+ * connection layer will take care of it. */
+ LogDebug("SSL error: %s [in %s()]!",
+ strerror(real_errno), fname);
}
}
break;
case SSL_ERROR_SSL:
- LogOpenSSLError("TLS/SSL Protocol Error", fname);
+ LogOpenSSLError("SSL protocol error", fname);
break;
default:
- Log( LOG_ERR, "%s: Unknown error %d!", fname, ret);
+ Log(LOG_ERR, "Unknown SSL error %d [in %s()]!", ret, fname);
}
ConnSSL_Free(c);
return -1;
default:
assert(code < 0);
if (gnutls_error_is_fatal(code)) {
- Log(LOG_ERR, "%s: %s", fname, gnutls_strerror(code));
+ /* We don't need to log this here, the generic
+ * connection layer will take care of it. */
+ LogDebug("SSL error: %s [%s].",
+ gnutls_strerror(code), fname);
ConnSSL_Free(c);
return -1;
}
}
+#ifdef HAVE_LIBGNUTLS
+static void *
+LogMalloc(size_t s)
+{
+ void *mem = malloc(s);
+ if (!mem)
+ Log(LOG_ERR, "Out of memory: Could not allocate %lu byte",
+ (unsigned long)s);
+ return mem;
+}
+
+
+static void
+LogGnuTLS_CertInfo(int level, gnutls_x509_crt_t cert, const char *msg)
+{
+ char *dn, *issuer_dn;
+ size_t size = 0;
+ int err = gnutls_x509_crt_get_dn(cert, NULL, &size);
+ if (size == 0) {
+ Log(LOG_ERR, "gnutls_x509_crt_get_dn: size == 0");
+ return;
+ }
+ if (err && err != GNUTLS_E_SHORT_MEMORY_BUFFER)
+ goto err_crt_get;
+ dn = LogMalloc(size);
+ if (!dn)
+ return;
+ err = gnutls_x509_crt_get_dn(cert, dn, &size);
+ if (err)
+ goto err_crt_get;
+ gnutls_x509_crt_get_issuer_dn(cert, NULL, &size);
+ assert(size);
+ issuer_dn = LogMalloc(size);
+ if (!issuer_dn) {
+ Log(level, "%s: Distinguished Name \"%s\".", msg, dn);
+ free(dn);
+ return;
+ }
+ gnutls_x509_crt_get_issuer_dn(cert, issuer_dn, &size);
+ Log(level, "%s: Distinguished Name \"%s\", Issuer \"%s\".", msg, dn,
+ issuer_dn);
+ free(dn);
+ free(issuer_dn);
+ return;
+
+ err_crt_get:
+ Log(LOG_ERR, "gnutls_x509_crt_get_dn: %s", gnutls_strerror(err));
+ return;
+}
+#endif
+
+
static void
-ConnSSL_LogCertInfo( CONNECTION *c )
+ConnSSL_LogCertInfo( CONNECTION * c, bool connect)
{
+ bool cert_seen = false, cert_ok = false;
+ char msg[128];
#ifdef HAVE_LIBSSL
+ const char *comp_alg = "no compression";
+ const void *comp;
+ X509 *peer_cert = NULL;
SSL *ssl = c->ssl_state.ssl;
assert(ssl);
- Log(LOG_INFO, "Connection %d: initialized %s using cipher %s.",
- c->sock, SSL_get_version(ssl), SSL_get_cipher(ssl));
+ comp = SSL_get_current_compression(ssl);
+ if (comp)
+ comp_alg = SSL_COMP_get_name(comp);
+ Log(LOG_INFO, "Connection %d: initialized %s using cipher %s, %s.",
+ c->sock, SSL_get_version(ssl), SSL_get_cipher(ssl), comp_alg);
+ peer_cert = SSL_get_peer_certificate(ssl);
+ if (peer_cert) {
+ cert_seen = true;
+
+ if (connect) {
+ /* Outgoing connection. Verify the remote server! */
+ int err = SSL_get_verify_result(ssl);
+ if (err == X509_V_OK) {
+ const char *peername = SSL_get0_peername(ssl);
+ if (peername != NULL)
+ cert_ok = true;
+ LogDebug("X509_V_OK, peername = '%s'", peername);
+ } else
+ Log(LOG_WARNING, "Certificate validation failed: %s!",
+ X509_verify_cert_error_string(err));
+
+ snprintf(msg, sizeof(msg), "Got %svalid server certificate",
+ cert_ok ? "" : "in");
+ LogOpenSSL_CertInfo(LOG_INFO, peer_cert, msg);
+ } else {
+ /* Incoming connection.
+ * Accept all certificates, don't depend on their
+ * validity: for example, we don't know the hostname
+ * to check, because we not yet even know if this is a
+ * server connection at all and if so, which one, so we
+ * don't know a host name to look for. On the other
+ * hand we want client certificates, for example for
+ * "CertFP" authentication with services ... */
+ LogOpenSSL_CertInfo(LOG_INFO, peer_cert,
+ "Got unchecked peer certificate");
+ }
+
+ X509_free(peer_cert);
+ }
#endif
#ifdef HAVE_LIBGNUTLS
+ unsigned int status;
+ gnutls_credentials_type_t cred;
gnutls_session_t sess = c->ssl_state.gnutls_session;
gnutls_cipher_algorithm_t cipher = gnutls_cipher_get(sess);
gnutls_protocol_get_name(gnutls_protocol_get_version(sess)),
gnutls_cipher_get_name(cipher),
gnutls_mac_get_name(gnutls_mac_get(sess)));
+ cred = gnutls_auth_get_type(c->ssl_state.gnutls_session);
+ if (cred == GNUTLS_CRD_CERTIFICATE) {
+ cert_seen = true;
+
+ gnutls_x509_crt_t cert;
+ unsigned cert_list_size;
+ const gnutls_datum_t *cert_list =
+ gnutls_certificate_get_peers(sess, &cert_list_size);
+ if (!cert_list || cert_list_size == 0) {
+ Log(LOG_ERR, "No certificates found");
+ goto done_cn_validation;
+ }
+ int err = gnutls_x509_crt_init(&cert);
+ if (err < 0) {
+ Log(LOG_ERR,
+ "Failed to initialize x509 certificate: %s",
+ gnutls_strerror(err));
+ goto done_cn_validation;
+ }
+ err = gnutls_x509_crt_import(cert, cert_list,
+ GNUTLS_X509_FMT_DER);
+ if (err < 0) {
+ Log(LOG_ERR, "Failed to parse the certificate: %s",
+ gnutls_strerror(err));
+ goto done_cn_validation;
+ }
+
+ if (connect) {
+ int verify =
+ gnutls_certificate_verify_peers2(c->
+ ssl_state.gnutls_session,
+ &status);
+ if (verify < 0) {
+ Log(LOG_ERR,
+ "gnutls_certificate_verify_peers2 failed: %s",
+ gnutls_strerror(verify));
+ goto done_cn_validation;
+ } else if (status) {
+ gnutls_datum_t out;
+
+ if (gnutls_certificate_verification_status_print
+ (status, gnutls_certificate_type_get(sess), &out,
+ 0) == GNUTLS_E_SUCCESS) {
+ Log(LOG_ERR,
+ "Certificate validation failed: %s",
+ out.data);
+ gnutls_free(out.data);
+ }
+ }
+
+ err = gnutls_x509_crt_check_hostname(cert, c->host);
+ if (err == 0)
+ Log(LOG_ERR,
+ "Failed to verify the hostname, expected \"%s\"",
+ c->host);
+ else
+ cert_ok = verify == 0 && status == 0;
+
+ snprintf(msg, sizeof(msg), "Got %svalid server certificate",
+ cert_ok ? "" : "in");
+ LogGnuTLS_CertInfo(LOG_INFO, cert, msg);
+ } else {
+ /* Incoming connection. Please see comments for OpenSSL! */
+ LogGnuTLS_CertInfo(LOG_INFO, cert,
+ "Got unchecked peer certificate");
+ }
+
+ gnutls_x509_crt_deinit(cert);
+done_cn_validation:
+ ;
+ }
#endif
+ /*
+ * can be used later to check if connection was authenticated, e.g.
+ * if inbound connection tries to register itself as server.
+ * Could also restrict /OPER to authenticated connections, etc.
+ */
+ if (cert_ok)
+ Conn_OPTION_ADD(c, CONN_SSL_PEERCERT_OK);
+ if (!cert_seen)
+ Log(LOG_INFO, "Peer did not present a certificate.");
}
#ifdef HAVE_LIBGNUTLS
int err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_SERVER);
if (err) {
- Log(LOG_ERR, "gnutls_init: %s", gnutls_strerror(err));
+ Log(LOG_ERR, "Failed to initialize new SSL session: %s",
+ gnutls_strerror(err));
return false;
}
#endif
- LogDebug("ConnSSL_Accept: Initializing SSL data");
if (!ConnSSL_Init_SSL(c))
return -1;
}
return ConnectAccept(c, true);
}
+static int
+ConnSSL_InitCertFp( CONNECTION *c )
+{
+ const char hex[] = "0123456789abcdef";
+ int i;
+
+#ifdef HAVE_LIBSSL
+ unsigned char digest[EVP_MAX_MD_SIZE];
+ unsigned int digest_size;
+ X509 *cert;
+
+ cert = SSL_get_peer_certificate(c->ssl_state.ssl);
+ if (!cert)
+ return 0;
+
+ if (!X509_digest(cert, EVP_sha256(), digest, &digest_size)) {
+ X509_free(cert);
+ return 0;
+ }
+
+ X509_free(cert);
+#endif /* HAVE_LIBSSL */
+#ifdef HAVE_LIBGNUTLS
+ gnutls_x509_crt_t cert;
+ unsigned int cert_list_size;
+ const gnutls_datum_t *cert_list;
+ unsigned char digest[MAX_HASH_SIZE];
+ size_t digest_size;
+
+ 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;
+
+ cert_list_size = 0;
+ cert_list = gnutls_certificate_get_peers(c->ssl_state.gnutls_session,
+ &cert_list_size);
+ if (!cert_list) {
+ gnutls_x509_crt_deinit(cert);
+ return 0;
+ }
+
+ 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_SHA256, digest,
+ &digest_size)) {
+ gnutls_x509_crt_deinit(cert);
+ return 0;
+ }
+
+ gnutls_x509_crt_deinit(cert);
+#endif /* HAVE_LIBGNUTLS */
+
+ assert(c->ssl_state.fingerprint == NULL);
+
+ c->ssl_state.fingerprint = malloc(SHA256_STRING_LEN);
+ if (!c->ssl_state.fingerprint)
+ return 0;
+
+ for (i = 0; i < (int)digest_size; i++) {
+ c->ssl_state.fingerprint[i * 2] = hex[digest[i] / 16];
+ c->ssl_state.fingerprint[i * 2 + 1] = hex[digest[i] % 16];
+ }
+ c->ssl_state.fingerprint[i * 2] = '\0';
+
+ return 1;
+}
/* accept/connect wrapper. if connect is true, connect to peer, otherwise wait for incoming connection */
static int
if (ret)
return ConnSSL_HandleError(c, ret, "gnutls_handshake");
#endif /* _GNUTLS */
+ (void)ConnSSL_InitCertFp(c);
+
Conn_OPTION_DEL(c, (CONN_SSL_WANT_WRITE|CONN_SSL_WANT_READ|CONN_SSL_CONNECT));
- ConnSSL_LogCertInfo(c);
+ ConnSSL_LogCertInfo(c, connect);
Conn_StartLogin(CONNECTION2ID(c));
return 1;
#endif
}
+char *
+ConnSSL_GetCertFp(CONNECTION *c)
+{
+ return c->ssl_state.fingerprint;
+}
+
+bool
+ConnSSL_SetCertFp(CONNECTION *c, const char *fingerprint)
+{
+ assert (c != NULL);
+ c->ssl_state.fingerprint = strndup(fingerprint, SHA256_STRING_LEN - 1);
+ return c->ssl_state.fingerprint != NULL;
+}
#else
bool
#endif /* SSL_SUPPORT */
/* -eof- */
-
-