/*
* ngIRCd -- The Next Generation IRC Daemon
- *
- * SSL wrapper functions.
* Copyright (c) 2005-2008 Florian Westphal <fw@strlen.de>
*/
#include "portab.h"
+
+/**
+ * @file
+ * SSL wrapper functions
+ */
+
#include "imp.h"
#include "conf-ssl.h"
#include <unistd.h>
#include <gnutls/x509.h>
-#define DH_BITS 1024
+#define DH_BITS 2048
+#define DH_BITS_MIN 1024
+
+#define MAX_HASH_SIZE 64 /* from gnutls-int.h */
+
static gnutls_certificate_credentials_t x509_cred;
static gnutls_dh_params_t dh_params;
-
static bool ConnSSL_LoadServerKey_gnutls PARAMS(( void ));
#endif
+#define CERTFP_LEN (20 * 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 ));
{
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);
memcpy(buf, (char *)(array_start(pass)), size);
return size;
}
+
+
+static int
+Verify_openssl(UNUSED int preverify_ok, UNUSED X509_STORE_CTX *x509_ctx)
+{
+ return 1;
+}
#endif
bool ret = true;
if (!Conf_SSLOptions.DHFile) {
- Log(LOG_NOTICE, "Configuration option \"SSLDHFile\" not set");
+ Log(LOG_NOTICE, "Configuration option \"DHFile\" 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,
+ "DHFile 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));
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
}
#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);
}
bool
ConnSSL_InitLibrary( void )
{
+ if (!Conf_SSLInUse()) {
+ LogDebug("SSL not in use, skipping initialization.");
+ return true;
+ }
+
#ifdef HAVE_LIBSSL
SSL_CTX *newctx;
* 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);
return false;
}
newctx = SSL_CTX_new(SSLv23_method());
if (!newctx) {
LogOpenSSLError("SSL_CTX_new()", NULL);
+ array_free(&Conf_SSLOptions.ListenPorts);
return false;
}
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, Verify_openssl);
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);
+ array_free(&Conf_SSLOptions.ListenPorts);
return false;
#endif
#ifdef HAVE_LIBGNUTLS
err = gnutls_global_init();
if (err) {
Log(LOG_ERR, "gnutls_global_init(): %s", gnutls_strerror(err));
+ array_free(&Conf_SSLOptions.ListenPorts);
return false;
}
- if (!ConnSSL_LoadServerKey_gnutls())
+ if (!ConnSSL_LoadServerKey_gnutls()) {
+ array_free(&Conf_SSLOptions.ListenPorts);
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_ERR, "No SSL server key configured!");
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_ERR, "No SSL server key configured!");
return false;
}
int ret;
assert(c != NULL);
#ifdef HAVE_LIBSSL
- assert(ssl_ctx);
- if (!ssl_ctx) /* NULL when library initialization failed */
+ if (!ssl_ctx) {
+ Log(LOG_ERR, "Cannot init ssl_ctx: 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) {
if (ret < 0) {
Log(LOG_ERR, "gnutls_set_default_priority: %s", gnutls_strerror(ret));
ConnSSL_Free(c);
+ return false;
}
- 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);
+ 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, "gnutls_credentials_set: %s", gnutls_strerror(ret));
ConnSSL_Free(c);
+ return false;
}
- gnutls_dh_set_prime_bits(c->ssl_state.gnutls_session, DH_BITS);
+ gnutls_dh_set_prime_bits(c->ssl_state.gnutls_session, DH_BITS_MIN);
#endif
Conn_OPTION_ADD(c, CONN_SSL);
return true;
bool ret;
#ifdef HAVE_LIBGNUTLS
int err;
-#endif
- assert(c != NULL);
- assert(s != NULL);
-#ifdef HAVE_LIBGNUTLS
+
err = gnutls_init(&c->ssl_state.gnutls_session, GNUTLS_CLIENT);
if (err) {
Log(LOG_ERR, "gnutls_init: %s", gnutls_strerror(err));
unsigned long sslerr;
int real_errno = errno;
- assert( fname );
-
ret = SSL_get_error(c->ssl_state.ssl, code);
switch (ret) {
case SSL_ERROR_WANT_READ:
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)) {
#ifdef HAVE_LIBSSL
SSL *ssl = c->ssl_state.ssl;
- assert( c );
- assert( ssl );
+ assert(ssl);
- Log( LOG_INFO, "New %s connection using cipher %s on socket %d",
- SSL_get_version(ssl), SSL_get_cipher(ssl), c->sock);
+ Log(LOG_INFO, "Connection %d: initialized %s using cipher %s.",
+ c->sock, SSL_get_version(ssl), SSL_get_cipher(ssl));
#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, "Connection %d: initialized %s using cipher %s-%s.",
+ c->sock,
+ gnutls_protocol_get_name(gnutls_protocol_get_version(sess)),
+ gnutls_cipher_get_name(cipher),
+ gnutls_mac_get_name(gnutls_mac_get(sess)));
#endif
}
ConnSSL_Accept( CONNECTION *c )
{
assert(c != NULL);
-#ifdef HAVE_LIBSSL
- if (!c->ssl_state.ssl) {
-#endif
-#ifdef HAVE_LIBGNUTLS
if (!Conn_OPTION_ISSET(c, CONN_SSL)) {
+#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));
#ifdef HAVE_LIBSSL
assert(c->ssl_state.ssl);
#endif
-#ifdef HAVE_LIBGNUTLS
assert(Conn_OPTION_ISSET(c, CONN_SSL));
-#endif
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_sha1(), 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_SHA1, 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(CERTFP_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
#endif
#ifdef HAVE_LIBGNUTLS
(void) connect;
- assert(Conn_OPTION_ISSET(c, CONN_SSL));
ret = gnutls_handshake(c->ssl_state.gnutls_session);
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);
+
+ Conn_StartLogin(CONNECTION2ID(c));
return 1;
}
#ifdef HAVE_LIBGNUTLS
bw = gnutls_write(c->ssl_state.gnutls_session, buf, count);
#endif
- if ( bw > 0 ) return bw;
+ if (bw > 0)
+ return bw;
if (ConnSSL_HandleError( c, bw, "ConnSSL_Write") == 0)
errno = EAGAIN; /* try again */
return -1;
{
#ifdef HAVE_LIBSSL
char *nl;
+ SSL *ssl = c->ssl_state.ssl;
- SSL *ssl;
- assert(c != NULL);
- assert(len >= 128);
- ssl = c->ssl_state.ssl;
if (!ssl)
return false;
*buf = 0;
return true;
#endif
#ifdef HAVE_LIBGNUTLS
- assert(c != NULL);
- assert(len >= 128);
if (Conn_OPTION_ISSET(c, CONN_SSL)) {
const char *name_cipher, *name_mac, *name_proto, *name_keyexchange;
unsigned keysize;
#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 = strdup(fingerprint);
+ return c->ssl_state.fingerprint != NULL;
+}
+#else
+
+bool
+ConnSSL_InitLibrary(void)
+{
+ return true;
+}
#endif /* SSL_SUPPORT */
/* -eof- */