-/* Copyright (C) 2009-2010, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-2010, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2011, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-2011, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
#include <polarssl/ssl.h>
#include <polarssl/net.h>
-#define CA_CRT_FILENAME "ca.crt"
-
int ciphers[] =
{
SSL_EDH_RSA_AES_256_SHA,
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()
}
/*
+ * 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
*/
{
int rc;
char *crtfile = (char *)getStrConf(CERTIFICATE);
- char *ca_file, *p;
if (crtfile == NULL) {
Log_warn("No certificate file specified");
initTestCert();
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()
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();
if (builtInTestCertificate) {
Log_warn("*** Using built-in test certificate and RSA key ***");
else
initKey();
havege_init(&hs);
+
+#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)
rsa_free(&key);
}
+/* Create SHA1 of last certificate in the peer's chain. */
+void SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash)
+{
+ x509_cert *cert = ssl->peer_cert;
+ if (!ssl->peer_cert) {
+ /* XXX what to do? */
+ return;
+ }
+ sha1(cert->raw.p, cert->raw.len, hash);
+}
+
SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
{
ssl_context *ssl;
Log_fatal("Failed to initalize: %d", rc);
ssl_set_endpoint(ssl, SSL_IS_SERVER);
- ssl_set_authmode(ssl, SSL_VERIFY_OPTIONAL);
+ ssl_set_authmode(ssl, SSL_VERIFY_OPTIONAL);
- ssl_set_rng(ssl, havege_rand, &hs);
- 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);
- ssl_set_ciphers(ssl, ciphers);
+#ifdef POLARSSL_API_V1
+ ssl_set_ciphersuites(ssl, ciphers);
+#else
+ ssl_set_ciphers(ssl, ciphers);
+#endif
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);
+
+ 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;
}
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;
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;
}
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;
}
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;
if (SSL_CTX_set_cipher_list(context, cipherstring) == 0)
Log_fatal("Failed to set cipher list!");
-
+
+ SSL_CTX_set_verify(context, SSL_VERIFY_PEER|SSL_VERIFY_CLIENT_ONCE,
+ verify_callback);
SSL_free(ssl);
Log_info("OpenSSL library initialized");
return ssl;
}
+/* Create SHA1 of last certificate in the peer's chain. */
+void 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) {
+ /* XXX what to do? */
+ return;
+ }
+
+ len = i2d_X509(x509, NULL);
+ buf = malloc(len);
+ if (buf == NULL) {
+ Log_fatal("malloc");
+ }
+
+ i2d_X509(x509, &p);
+
+ SHA1(p, len, hash);
+ free(buf);
+}
+
void SSLi_closeconnection(SSL_handle_t *ssl)
{
SSL_free(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("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