X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=src%2Fssl.c;h=1f2ef6a01deff74fee8871670a9b45384fc0c69d;hb=18d8a6a0b45e622bf18af3be30f1c60c2e1022e8;hp=6ed9aea15df1708fd46da57b73dc640eb478f354;hpb=ebdd6565cbbd2db46833530112c15be0e22afc29;p=umurmur.git diff --git a/src/ssl.c b/src/ssl.c index 6ed9aea..1f2ef6a 100644 --- a/src/ssl.c +++ b/src/ssl.c @@ -46,8 +46,6 @@ #include #include -#define CA_CRT_FILENAME "ca.crt" - int ciphers[] = { SSL_EDH_RSA_AES_256_SHA, @@ -69,7 +67,7 @@ bool_t builtInTestCertificate; havege_state hs; /* exported to crypt.c */ /* DH prime */ -const char *my_dhm_P = +char *my_dhm_P = "9CE85640903BF123906947FEDE767261" \ "D9B4A973EB8F7D984A8C656E2BCC161C" \ "183D4CA471BA78225F940F16D1D99CA3" \ @@ -77,54 +75,14 @@ const char *my_dhm_P = "44FF6AB553EC7073AD0CB608F2A3B480" \ "19E6C02BCED40BD30E91BB2469089670" \ "DEF409C08E8AC24D1732A6128D2220DC53"; -const char *my_dhm_G = "4"; - -const char *test_key = - "-----BEGIN RSA PRIVATE KEY-----\r\n" - "MIICXAIBAAKBgQC/zZ5p/st9JUgoFIuNCwyYJhKhnqKlAk36RJJAXhJ/3FZCThQK\r\n" - "J0jxMCjnQb9envZPIKrAfyDtlEGKU8OI2HvDsFL7Y2fNjew0R9DoUyzPRVBInfW9\r\n" - "JP03aiOldpooTjXBrzoZV+DGqRYJE/IRJEyXir5NEJu624bMJm0XDVkxiwIDAQAB\r\n" - "AoGAPcFJiR01jYSsd+Mtj2sIUhCoHQuDmJdmXfcoE7t2P17FEzIqd55weN+lu9fK\r\n" - "cv/BlHaTI8mK45PBinUv1ubE6gzzyLtNgBW7ko8i23YQNMS4+8ApZZoCFsVbN533\r\n" - "/mFYcOmWpdgIsAOyi3gAyO5OyGA71a3gkNX+MDYc7PgbTkkCQQDq1NN/j6xVw4qc\r\n" - "3qunsMOVJxln7Gkgt0fOrCV0WltJNkKYiARwtpvB/SHIj6nHhun+J/ee/v+QjAL4\r\n" - "aUwC8OmnAkEA0RfWWVQ2Yxk9QjRcqcpDddtc+9xxM6Dt+edGDSYKRUB/S2cl/Sdg\r\n" - "abFdrFEnFdO03VknCrqUgweegeUJhU1tfQJBAKLFFjxK59cijMejCDRZr5eI3HFO\r\n" - "Sqgkoh8871Ew+ClM9OgpD3rY+CmEPZB5E+N7PmGublLEyXv1sHFi+w7m0e0CQDnH\r\n" - "eoYIzVapHNJ0ob6Rk/63dYRrsCRyLhDGpgbwIhps7kAp6sd/4BaU2qvJaSGQ9QPN\r\n" - "pQpD8NIcguKmJfFeKgkCQBABatS74xI2UAW/IIbRBg8a8z4v5JxEnQwp0EtmON2I\r\n" - "+AVBenUVFjpdjaaQ2/2IEgEwnzRfbERQfUlAkjczRaM=\r\n" - "-----END RSA PRIVATE KEY-----\r\n"; - -const char *test_cert = - "-----BEGIN CERTIFICATE-----\r\n" - "MIICfDCCAeWgAwIBAgIJANEN9Jb9sp0oMA0GCSqGSIb3DQEBBQUAMFcxCzAJBgNV\r\n" - "BAYTAlNFMRMwEQYDVQQHDApHb3RoZW5idXJnMRAwDgYDVQQKDAd1TXVybXVyMSEw\r\n" - "HwYDVQQDDBh1TXVybXVyIHRlc3QgY2VydGlmaWNhdGUwHhcNMTEwMzIyMjIxMTEy\r\n" - "WhcNMjEwMzE5MjIxMTEyWjBXMQswCQYDVQQGEwJTRTETMBEGA1UEBwwKR290aGVu\r\n" - "YnVyZzEQMA4GA1UECgwHdU11cm11cjEhMB8GA1UEAwwYdU11cm11ciB0ZXN0IGNl\r\n" - "cnRpZmljYXRlMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC/zZ5p/st9JUgo\r\n" - "FIuNCwyYJhKhnqKlAk36RJJAXhJ/3FZCThQKJ0jxMCjnQb9envZPIKrAfyDtlEGK\r\n" - "U8OI2HvDsFL7Y2fNjew0R9DoUyzPRVBInfW9JP03aiOldpooTjXBrzoZV+DGqRYJ\r\n" - "E/IRJEyXir5NEJu624bMJm0XDVkxiwIDAQABo1AwTjAdBgNVHQ4EFgQUyI0/J6gS\r\n" - "G7vEZl1nKq9rAYAg/TMwHwYDVR0jBBgwFoAUyI0/J6gSG7vEZl1nKq9rAYAg/TMw\r\n" - "DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOBgQCGL3T4a7g+MUtcjIq2XLON\r\n" - "cN/oPgPpMNcSPj7zQF1NVzjeQagvKIe3mL5sNIYuoIQm1Xm7aH2ueruhH0wkSOf0\r\n" - "+7U/g7r70U1CFWzfgwzz3EWRq3hUQmZ9/Xy9V2P/iRrFNyAKE8MneuVv3aAIN6/W\r\n" - "rWVxhCquqhFM3yIGe0f6hw==\r\n" - "-----END CERTIFICATE-----\r\n"; - +char *my_dhm_G = "4"; static void initTestCert() { int rc; builtInTestCertificate = true; - rc = x509parse_crt(&certificate, (unsigned char *)test_cert, - strlen(test_cert)); - if (rc != 0) - Log_fatal("Could not parse built-in test certificate"); - rc = x509parse_crt(&certificate, (unsigned char *)test_cert, - strlen(test_cert)); + rc = x509parse_crt(&certificate, (unsigned char *)test_srv_crt, + strlen(test_srv_crt)); if (rc != 0) Log_fatal("Could not parse built-in test certificate"); } @@ -133,13 +91,14 @@ static void initTestKey() { int rc; - rc = x509parse_key(&key, (unsigned char *)test_key, - strlen(test_key), NULL, 0); + rc = x509parse_key(&key, (unsigned char *)test_srv_key, + strlen(test_srv_key), NULL, 0); if (rc != 0) Log_fatal("Could not parse built-in test RSA key"); } /* + * 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 */ @@ -147,7 +106,6 @@ static void initCert() { int rc; char *crtfile = (char *)getStrConf(CERTIFICATE); - char *ca_file, *p; if (crtfile == NULL) { Log_warn("No certificate file specified"); @@ -160,31 +118,6 @@ static void initCert() 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() @@ -208,6 +141,8 @@ static void pssl_debug(void *ctx, int level, const char *str) void SSLi_init(void) { + char verstring[12]; + initCert(); if (builtInTestCertificate) { Log_warn("*** Using built-in test certificate and RSA key ***"); @@ -217,7 +152,13 @@ void SSLi_init(void) 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) @@ -244,18 +185,21 @@ SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready) 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_NONE); - 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_own_cert(ssl, &certificate, &key); + ssl_set_dh_param(ssl, my_dhm_P, my_dhm_G); return ssl; } @@ -266,7 +210,11 @@ 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 { Log_warn("SSL handshake failed: %d", rc); @@ -280,8 +228,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; } @@ -289,8 +242,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; }