projects
/
umurmur.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
bb58415
)
Add support for PolarSSL 1.3.x
author
Martin Johansson
<martin@fatbob.nu>
Tue, 12 Nov 2013 19:58:42 +0000
(20:58 +0100)
committer
Martin Johansson
<martin@fatbob.nu>
Tue, 12 Nov 2013 19:58:42 +0000
(20:58 +0100)
src/ssl.c
patch
|
blob
|
history
src/ssl.h
patch
|
blob
|
history
diff --git
a/src/ssl.c
b/src/ssl.c
index 6b7a5353f7aeb25674ccb093c82db9af800826cc..925795c0b8de6857dacb34d173f162ff8b5dfa64 100644
(file)
--- a/
src/ssl.c
+++ b/
src/ssl.c
@@
-41,13
+41,14
@@
* PolarSSL interface
*/
* 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>
#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,
int ciphers[] =
{
TLS_DHE_RSA_WITH_AES_256_CBC_SHA,
@@
-64,7
+65,30
@@
int ciphers[] =
0
};
#endif
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;
static x509_cert certificate;
+#endif
+
static rsa_context key;
bool_t builtInTestCertificate;
static rsa_context key;
bool_t builtInTestCertificate;
@@
-90,8
+114,13
@@
static void initTestCert()
{
int rc;
builtInTestCertificate = true;
{
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,
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");
}
if (rc != 0)
Log_fatal("Could not parse built-in test certificate");
}
@@
-100,8
+129,8
@@
static void initTestKey()
{
int rc;
{
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");
}
if (rc != 0)
Log_fatal("Could not parse built-in test RSA key");
}
@@
-126,7
+155,11
@@
static void initCert()
#endif
return;
}
#endif
return;
}
+#ifdef POLARSSL_API_V1_3_ABOVE
+ rc = x509_crt_parse_file(&certificate, crtfile);
+#else
rc = x509parse_crtfile(&certificate, crtfile);
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);
if (rc != 0) {
#ifdef USE_POLARSSL_TESTCERT
Log_warn("Could not read certificate file '%s'. Falling back to test certificate.", crtfile);
@@
-204,15
+237,23
@@
void SSLi_init(void)
void SSLi_deinit(void)
{
void SSLi_deinit(void)
{
+#ifdef POLARSSL_API_V1_3_ABOVE
+ x509_crt_free(&certificate);
+#else
x509_free(&certificate);
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)
{
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;
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;
cert = ssl_get_peer_cert(ssl);
#else
cert = ssl->peer_cert;
@@
-255,14
+296,18
@@
SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
ssl_set_ciphersuites(ssl, ciphers);
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);
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);
ssl_set_own_cert(ssl, &certificate, &key);
+#endif
ssl_set_dh_param(ssl, my_dhm_P, my_dhm_G);
return ssl;
ssl_set_dh_param(ssl, my_dhm_P, my_dhm_G);
return ssl;
diff --git
a/src/ssl.h
b/src/ssl.h
index 3b310cc4b4425761f2eca39497f4dbf8f8c90a1a..0340673bdc4be894b3561651c76f7169839b6f68 100644
(file)
--- a/
src/ssl.h
+++ b/
src/ssl.h
@@
-70,7
+70,10
@@
int urandom_bytes(void *ctx, unsigned char *dest, size_t len);
#endif
#if (POLARSSL_VERSION_MINOR >= 2)
#endif
#if (POLARSSL_VERSION_MINOR >= 2)
- #define POLARSSL_API_V1_2
+ #define POLARSSL_API_V1_2_ABOVE
+#endif
+#if (POLARSSL_VERSION_MINOR == 3)
+ #define POLARSSL_API_V1_3_ABOVE
#endif
#else /* OpenSSL */
#endif
#else /* OpenSSL */