X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fssl.c;h=9c5236ec6815dff9d70f16890e1d5c973b436b7f;hb=b95d77db3f58c300c5e0a9c11862a4ba529ce82b;hp=44fa0c9378d07a0eda9aaa5f7542adcb9154f3c7;hpb=0f7364c13546d3e674da3827eeb2f00a307f4b73;p=umurmur.git diff --git a/src/ssl.c b/src/ssl.c index 44fa0c9..9c5236e 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -1,5 +1,5 @@ -/* Copyright (C) 2009-2011, Martin Johansson - Copyright (C) 2005-2011, Thorvald Natvig +/* Copyright (C) 2009-2012, Martin Johansson + Copyright (C) 2005-2012, Thorvald Natvig All rights reserved. @@ -30,6 +30,7 @@ */ #include #include +#include #include "conf.h" #include "log.h" @@ -46,27 +47,32 @@ #include #include -#define CA_CRT_FILENAME "ca.crt" - +#ifdef POLARSSL_API_V1_2 +int ciphers[] = +{ + TLS_DHE_RSA_WITH_AES_256_CBC_SHA, + TLS_RSA_WITH_AES_256_CBC_SHA, + TLS_RSA_WITH_AES_128_CBC_SHA, + 0 +}; +#else int ciphers[] = { SSL_EDH_RSA_AES_256_SHA, - SSL_EDH_RSA_CAMELLIA_256_SHA, - SSL_EDH_RSA_DES_168_SHA, SSL_RSA_AES_256_SHA, - SSL_RSA_CAMELLIA_256_SHA, SSL_RSA_AES_128_SHA, - SSL_RSA_CAMELLIA_128_SHA, - SSL_RSA_DES_168_SHA, - SSL_RSA_RC4_128_SHA, - SSL_RSA_RC4_128_MD5, 0 }; +#endif static x509_cert certificate; static rsa_context key; bool_t builtInTestCertificate; -havege_state hs; /* exported to crypt.c */ +#ifdef USE_POLARSSL_HAVEGE +havege_state hs; +#else +int urandom_fd; +#endif /* DH prime */ char *my_dhm_P = @@ -79,6 +85,7 @@ char *my_dhm_P = "DEF409C08E8AC24D1732A6128D2220DC53"; char *my_dhm_G = "4"; +#ifdef USE_POLARSSL_TESTCERT static void initTestCert() { int rc; @@ -87,10 +94,6 @@ static void initTestCert() strlen(test_srv_crt)); if (rc != 0) Log_fatal("Could not parse built-in test certificate"); - rc = x509parse_crt(&certificate, (unsigned char *)test_ca_crt, - strlen(test_ca_crt)); - if (rc != 0) - Log_fatal("Could not parse built-in test CA certificate"); } static void initTestKey() @@ -102,8 +105,10 @@ static void initTestKey() if (rc != 0) Log_fatal("Could not parse built-in test RSA key"); } +#endif /* + * How to generate a self-signed cert with openssl: * openssl genrsa 1024 > host.key * openssl req -new -x509 -nodes -sha1 -days 365 -key host.key > host.cert */ @@ -111,44 +116,26 @@ static void initCert() { int rc; char *crtfile = (char *)getStrConf(CERTIFICATE); - char *ca_file, *p; if (crtfile == NULL) { - Log_warn("No certificate file specified"); +#ifdef USE_POLARSSL_TESTCERT + Log_warn("No certificate file specified. Falling back to test certificate."); initTestCert(); +#else + Log_fatal("No certificate file specified"); +#endif return; } rc = x509parse_crtfile(&certificate, crtfile); if (rc != 0) { - Log_warn("Could not read certificate file %s", crtfile); +#ifdef USE_POLARSSL_TESTCERT + Log_warn("Could not read certificate file '%s'. Falling back to test certificate.", crtfile); initTestCert(); +#else + Log_fatal("Could not read certificate file '%s'", crtfile); +#endif return; } - - /* Look for CA certificate file in same dir */ - ca_file = malloc(strlen(crtfile) + strlen(CA_CRT_FILENAME) + 1); - strcpy(ca_file, crtfile); - p = strrchr(ca_file, '/'); - if (p != NULL) - strcpy(p + 1, CA_CRT_FILENAME); - else - strcpy(ca_file, CA_CRT_FILENAME); - - rc = x509parse_crtfile(&certificate, ca_file); - if (rc != 0) { /* No CA certifiacte found. Assume self-signed. */ - Log_info("CA certificate file %s not found. Assuming self-signed certificate.", ca_file); - } - - /* - * PolarSSL 0.11 - 0.12,1 has a bug; it ignores the last certificate in the chain. - * Read the certificate again so that it gets last in chain. Later releases like 0.14.0 works - * fine with the extra certificate, so I don't see any harm in doing so. - */ - rc = x509parse_crtfile(&certificate, crtfile); - if (rc != 0) - Log_fatal("Could not read certificate file %s", crtfile); - - free(ca_file); } static void initKey() @@ -163,25 +150,60 @@ static void initKey() Log_fatal("Could not read RSA key file %s", keyfile); } +#ifndef USE_POLARSSL_HAVEGE +int urandom_bytes(void *ctx, unsigned char *dest, size_t len) +{ + int cur; + + while (len) { + cur = read(urandom_fd, dest, len); + if (cur < 0) + continue; + len -= cur; + } +} +#endif + #define DEBUG_LEVEL 0 static void pssl_debug(void *ctx, int level, const char *str) { if (level <= DEBUG_LEVEL) - Log_debug("PolarSSL [level %d]: %s", level, str); + Log_info("PolarSSL [level %d]: %s", level, str); } void SSLi_init(void) { + char verstring[12]; + initCert(); +#ifdef USE_POLARSSL_TESTCERT if (builtInTestCertificate) { Log_warn("*** Using built-in test certificate and RSA key ***"); - Log_warn("*** This is not secure! Please use a CA-signed certificate or create a self-signed certificate ***"); + Log_warn("*** This is not secure! Please use a CA-signed certificate or create a key and self-signed certificate ***"); initTestKey(); } else initKey(); +#else + initKey(); +#endif + + /* Initialize random number generator */ +#ifdef USE_POLARSSL_HAVEGE havege_init(&hs); +#else + urandom_fd = open("/dev/urandom", O_RDONLY); + if (urandom_fd < 0) + Log_fatal("Cannot open /dev/urandom"); + Log_info("Using random number generator /dev/urandom"); +#endif + +#ifdef POLARSSL_VERSION_MAJOR + version_get_string(verstring); + Log_info("PolarSSL library version %s initialized", verstring); +#else Log_info("PolarSSL library initialized"); +#endif } void SSLi_deinit(void) @@ -190,6 +212,22 @@ void SSLi_deinit(void) rsa_free(&key); } +/* Create SHA1 of last certificate in the peer's chain. */ +bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash) +{ + x509_cert const *cert; +#ifdef POLARSSL_API_V1_2 + cert = ssl_get_peer_cert(ssl); +#else + cert = ssl->peer_cert; +#endif + if (!cert) { + return false; + } + sha1(cert->raw.p, cert->raw.len, hash); + return true; +} + SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready) { ssl_context *ssl; @@ -205,21 +243,35 @@ SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready) rc = ssl_init(ssl); if (rc != 0 ) - Log_fatal("Failed to initalize: %d", rc); + Log_fatal("Failed to initialize: %d", rc); ssl_set_endpoint(ssl, SSL_IS_SERVER); - ssl_set_authmode(ssl, SSL_VERIFY_OPTIONAL); + ssl_set_authmode(ssl, SSL_VERIFY_OPTIONAL); + +#ifdef USE_POLARSSL_HAVEGE + ssl_set_rng(ssl, HAVEGE_RAND, &hs); +#else + ssl_set_rng(ssl, urandom_bytes, NULL); +#endif + + ssl_set_dbg(ssl, pssl_debug, NULL); + ssl_set_bio(ssl, net_recv, fd, net_send, fd); - ssl_set_rng(ssl, havege_rand, &hs); - ssl_set_dbg(ssl, pssl_debug, NULL); - ssl_set_bio(ssl, net_recv, fd, net_send, fd); +#ifdef POLARSSL_API_V1 + ssl_set_ciphersuites(ssl, ciphers); +#else + ssl_set_ciphers(ssl, ciphers); +#endif - ssl_set_ciphers(ssl, ciphers); +#ifdef POLARSSL_API_V1_2 + ssl_set_session(ssl, ssn); +#else ssl_set_session(ssl, 0, 0, ssn); - - ssl_set_ca_chain(ssl, certificate.next, NULL, NULL); - ssl_set_own_cert(ssl, &certificate, &key); - ssl_set_dh_param(ssl, my_dhm_P, my_dhm_G); +#endif + + ssl_set_ca_chain(ssl, &certificate, NULL, NULL); + ssl_set_own_cert(ssl, &certificate, &key); + ssl_set_dh_param(ssl, my_dhm_P, my_dhm_G); return ssl; } @@ -230,8 +282,14 @@ int SSLi_nonblockaccept(SSL_handle_t *ssl, bool_t *SSLready) rc = ssl_handshake(ssl); if (rc != 0) { +#ifdef POLARSSL_API_V1 + if (rc == POLARSSL_ERR_NET_WANT_READ || rc == POLARSSL_ERR_NET_WANT_WRITE) { +#else if (rc == POLARSSL_ERR_NET_TRY_AGAIN) { +#endif return 0; + } else if (POLARSSL_ERR_X509_CERT_VERIFY_FAILED) { /* Allow this (selfsigned etc) */ + return 0; } else { Log_warn("SSL handshake failed: %d", rc); return -1; @@ -244,8 +302,13 @@ int SSLi_nonblockaccept(SSL_handle_t *ssl, bool_t *SSLready) int SSLi_read(SSL_handle_t *ssl, uint8_t *buf, int len) { int rc; + rc = ssl_read(ssl, buf, len); +#ifdef POLARSSL_API_V1 + if (rc == POLARSSL_ERR_NET_WANT_READ) +#else if (rc == POLARSSL_ERR_NET_TRY_AGAIN) +#endif return SSLI_ERROR_WANT_READ; return rc; } @@ -253,8 +316,13 @@ int SSLi_read(SSL_handle_t *ssl, uint8_t *buf, int len) int SSLi_write(SSL_handle_t *ssl, uint8_t *buf, int len) { int rc; + rc = ssl_write(ssl, buf, len); +#ifdef POLARSSL_API_V1 + if (rc == POLARSSL_ERR_NET_WANT_WRITE) +#else if (rc == POLARSSL_ERR_NET_TRY_AGAIN) +#endif return SSLI_ERROR_WANT_WRITE; return rc; } @@ -295,6 +363,8 @@ static X509 *x509; static RSA *rsa; static SSL_CTX *context; static EVP_PKEY *pkey; + +static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx); static int SSL_add_ext(X509 * crt, int nid, char *value) { X509_EXTENSION *ex; @@ -498,10 +568,10 @@ void SSLi_init(void) { const SSL_METHOD *method; SSL *ssl; - int i, offset = 0; + int i, offset = 0, cipherstringlen = 0; STACK_OF(SSL_CIPHER) *cipherlist = NULL, *cipherlist_new = NULL; SSL_CIPHER *cipher; - char cipherstring[1024]; + char *cipherstring, tempstring[128]; SSL_library_init(); OpenSSL_add_all_algorithms(); /* load & register all cryptos, etc. */ @@ -534,11 +604,16 @@ void SSLi_init(void) } Log_debug("List of ciphers:"); if (cipherlist_new) { - for ( i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist_new, i)) != NULL; i++) { + for (i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist_new, i)) != NULL; i++) { Log_debug("%s", SSL_CIPHER_get_name(cipher)); - offset += snprintf(cipherstring + offset, 1024 - offset, "%s:", SSL_CIPHER_get_name(cipher)); + cipherstringlen += strlen(SSL_CIPHER_get_name(cipher)) + 1; + } + cipherstring = malloc(cipherstringlen + 1); + if (cipherstring == NULL) + Log_fatal("Out of memory"); + for (i = 0; (cipher = sk_SSL_CIPHER_value(cipherlist_new, i)) != NULL; i++) { + offset += sprintf(cipherstring + offset, "%s:", SSL_CIPHER_get_name(cipher)); } - cipherstring[offset - 1] = '\0'; } if (cipherlist_new) @@ -549,7 +624,11 @@ void SSLi_init(void) if (SSL_CTX_set_cipher_list(context, cipherstring) == 0) Log_fatal("Failed to set cipher list!"); - + + free(cipherstring); + + SSL_CTX_set_verify(context, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE, + verify_callback); SSL_free(ssl); Log_info("OpenSSL library initialized"); @@ -594,6 +673,32 @@ SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready) return ssl; } +/* Create SHA1 of last certificate in the peer's chain. */ +bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash) +{ + X509 *x509; + uint8_t *buf, *p; + int len; + + x509 = SSL_get_peer_certificate(ssl); + if (!x509) { + return false; + } + + len = i2d_X509(x509, NULL); + buf = malloc(len); + if (buf == NULL) { + Log_fatal("malloc"); + } + + p = buf; + i2d_X509(x509, &p); + + SHA1(buf, len, hash); + free(buf); + return true; +} + void SSLi_closeconnection(SSL_handle_t *ssl) { SSL_free(ssl); @@ -629,4 +734,38 @@ void SSLi_free(SSL_handle_t *ssl) SSL_free(ssl); } +static int verify_callback(int preverify_ok, X509_STORE_CTX *ctx) +{ + char buf[256]; + X509 *err_cert; + int err, depth; + SSL *ssl; + + err_cert = X509_STORE_CTX_get_current_cert(ctx); + err = X509_STORE_CTX_get_error(ctx); + depth = X509_STORE_CTX_get_error_depth(ctx); + + ssl = X509_STORE_CTX_get_ex_data(ctx, SSL_get_ex_data_X509_STORE_CTX_idx()); + X509_NAME_oneline(X509_get_subject_name(err_cert), buf, 256); + + if (depth > 5) { + preverify_ok = 0; + err = X509_V_ERR_CERT_CHAIN_TOO_LONG; + X509_STORE_CTX_set_error(ctx, err); + } + if (!preverify_ok) { + Log_warn("SSL: verify error:num=%d:%s:depth=%d:%s\n", err, + X509_verify_cert_error_string(err), depth, buf); + } + /* + * At this point, err contains the last verification error. We can use + * it for something special + */ + if (!preverify_ok && (err == X509_V_ERR_UNABLE_TO_GET_ISSUER_CERT)) { + X509_NAME_oneline(X509_get_issuer_name(ctx->current_cert), buf, 256); + Log_warn("issuer= %s", buf); + } + return 1; +} + #endif