-/* Copyright (C) 2009-2012, Martin Johansson <martin@fatbob.nu>
- Copyright (C) 2005-2012, Thorvald Natvig <thorvald@natvig.com>
+/* Copyright (C) 2009-2013, Martin Johansson <martin@fatbob.nu>
+ Copyright (C) 2005-2013, Thorvald Natvig <thorvald@natvig.com>
All rights reserved.
* PolarSSL interface
*/
+#include <polarssl/config.h>
#include <polarssl/havege.h>
#include <polarssl/certs.h>
#include <polarssl/x509.h>
#include <polarssl/ssl.h>
#include <polarssl/net.h>
-#ifdef POLARSSL_API_V1_2
+#ifdef POLARSSL_API_V1_2_ABOVE
int ciphers[] =
{
TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
0
};
#endif
+
+#ifdef POLARSSL_API_V1_3_ABOVE
+static x509_crt certificate;
+static inline int x509parse_keyfile(rsa_context *rsa, const char *path,
+ const char *pwd)
+{
+ int ret;
+ pk_context pk;
+
+ pk_init(&pk);
+ ret = pk_parse_keyfile(&pk, path, pwd);
+ if (ret == 0 && !pk_can_do( &pk, POLARSSL_PK_RSA))
+ ret = POLARSSL_ERR_PK_TYPE_MISMATCH;
+ if (ret == 0)
+ rsa_copy(rsa, pk_rsa(pk));
+ else
+ rsa_free(rsa);
+ pk_free(&pk);
+ return ret;
+}
+#else
static x509_cert certificate;
+#endif
+
static rsa_context key;
bool_t builtInTestCertificate;
{
int rc;
builtInTestCertificate = true;
+#ifdef POLARSSL_API_V1_3_ABOVE
+ rc = x509_crt_parse_rsa(&certificate, (unsigned char *)test_srv_crt,
+ strlen(test_srv_crt));
+#else
rc = x509parse_crt(&certificate, (unsigned char *)test_srv_crt,
- strlen(test_srv_crt));
+ strlen(test_srv_crt));
+#endif
if (rc != 0)
Log_fatal("Could not parse built-in test certificate");
}
{
int rc;
- rc = x509parse_key(&key, (unsigned char *)test_srv_key,
- strlen(test_srv_key), NULL, 0);
+ rc = x509parse_key_rsa(&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");
}
#endif
return;
}
+#ifdef POLARSSL_API_V1_3_ABOVE
+ rc = x509_crt_parse_file(&certificate, crtfile);
+#else
rc = x509parse_crtfile(&certificate, crtfile);
+#endif
if (rc != 0) {
#ifdef USE_POLARSSL_TESTCERT
Log_warn("Could not read certificate file '%s'. Falling back to test certificate.", crtfile);
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;
}
+ return 0;
}
#endif
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)
{
+#ifdef POLARSSL_API_V1_3_ABOVE
+ x509_crt_free(&certificate);
+#else
x509_free(&certificate);
+#endif
rsa_free(&key);
}
/* Create SHA1 of last certificate in the peer's chain. */
bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash)
{
+#ifdef POLARSSL_API_V1_3_ABOVE
+ x509_crt const *cert;
+#else
x509_cert const *cert;
-#ifdef POLARSSL_API_V1_2
+#endif
+#ifdef POLARSSL_API_V1_2_ABOVE
cert = ssl_get_peer_cert(ssl);
#else
cert = ssl->peer_cert;
ssl_set_ciphersuites(ssl, ciphers);
-#ifdef POLARSSL_API_V1_2
+#ifdef POLARSSL_API_V1_2_ABOVE
ssl_set_session(ssl, ssn);
#else
ssl_set_session(ssl, 0, 0, ssn);
#endif
ssl_set_ca_chain(ssl, &certificate, NULL, NULL);
+#ifdef POLARSSL_API_V1_3_ABOVE
+ ssl_set_own_cert_rsa(ssl, &certificate, &key);
+#else
ssl_set_own_cert(ssl, &certificate, &key);
+#endif
ssl_set_dh_param(ssl, my_dhm_P, my_dhm_G);
return ssl;
if (rc != 0) {
if (rc == POLARSSL_ERR_NET_WANT_READ || rc == POLARSSL_ERR_NET_WANT_WRITE) {
return 0;
- } else if (POLARSSL_ERR_X509_CERT_VERIFY_FAILED) { /* Allow this (selfsigned etc) */
+ } else if (rc == POLARSSL_ERR_X509_CERT_VERIFY_FAILED) { /* Allow this (selfsigned etc) */
return 0;
} else {
Log_warn("SSL handshake failed: %d", rc);
void SSLi_free(SSL_handle_t *ssl)
{
Log_debug("SSLi_free");
- free(ssl->session); /* XXX - Hmmm. */
+#if (POLARSSL_VERSION_MINOR <= 2 && POLARSSL_VERSION_PATCH < 6)
+ free(ssl->session); /* Workaround for memory leak in PolarSSL < 1.2.6 */
+ ssl->session = NULL;
+#endif
ssl_free(ssl);
free(ssl);
}
static void SSL_writecert(char *certfile, X509 *x509)
{
FILE *fp;
- BIO *err_output;
-
- /* prepare a BIO for outputting error messages */
-
- err_output = BIO_new_fp(stderr,BIO_NOCLOSE);
-
+
/* open the private key file */
fp = fopen(certfile, "w");
if (fp == NULL) {
- BIO_printf(err_output, "Unable to open the X509 file for writing.\n");
- BIO_free(err_output);
+ Log_warn("Unable to open the X509 file %s for writing", certfile);
return;
- }
-
+ }
if (PEM_write_X509(fp, x509) == 0) {
- BIO_printf(err_output, "Error trying to write X509 info.\n");
- ERR_print_errors(err_output);
+ Log_warn("Error trying to write X509 info.");
}
fclose(fp);
}
static void SSL_writekey(char *keyfile, RSA *rsa)
{
FILE *fp;
- BIO *err_output;
- /* prepare a BIO for outputing error messages */
- err_output = BIO_new_fp(stderr, BIO_NOCLOSE);
/* open the private key file for reading */
fp = fopen(keyfile, "w");
if (fp == NULL) {
- BIO_printf(err_output, "Unable to open the private key file %s for writing.\n", keyfile);
- BIO_free(err_output);
+ Log_warn("Unable to open the private key file %s for writing.", keyfile);
return;
}
if (PEM_write_RSAPrivateKey(fp, rsa, NULL, NULL, 0, NULL, NULL) == 0) {
- /* error reading the key - check the error stack */
- BIO_printf(err_output, "Error trying to write private key\n");
- ERR_print_errors(err_output);
+ Log_warn("Error trying to write private key");
}
fclose(fp);
}
#endif
if (!rsa || !x509) {
- logthis("Generating new server certificate.");
+ Log_info("Generating new server certificate.");
- BIO *bio_err;
CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
-
- bio_err=BIO_new_fp(stderr, BIO_NOCLOSE);
-
+
x509 = X509_new();
pkey = EVP_PKEY_new();
rsa = RSA_generate_key(1024,RSA_F4,NULL,NULL);
projects / umurmur.git / blobdiff