1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
|
From 5ae05ac1f347fcbdcc73aadf52d6a56c82a50e2e Mon Sep 17 00:00:00 2001
From: Martin Johansson <martin@fatbob.nu>
Date: Wed, 5 Dec 2012 22:01:22 +0100
Subject: [PATCH] Add support for PolarSSL 1.2.x
---
src/ssl.c | 31 ++++++++++++++++++++++---------
src/ssl.h | 3 +++
2 files changed, 25 insertions(+), 9 deletions(-)
diff --git a/src/ssl.c b/src/ssl.c
index 2204a3c..e7a53a2 100644
--- a/src/ssl.c
+++ b/src/ssl.c
@@ -46,20 +46,23 @@
#include <polarssl/ssl.h>
#include <polarssl/net.h>
+#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;
@@ -170,8 +173,13 @@ void SSLi_deinit(void)
/* Create SHA1 of last certificate in the peer's chain. */
bool_t SSLi_getSHA1Hash(SSL_handle_t *ssl, uint8_t *hash)
{
- x509_cert *cert = ssl->peer_cert;
- if (!ssl->peer_cert) {
+ x509_cert *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);
@@ -207,7 +215,12 @@ SSL_handle_t *SSLi_newconnection(int *fd, bool_t *SSLready)
#else
ssl_set_ciphers(ssl, ciphers);
#endif
+
+#ifdef POLARSSL_API_V1_2
+ ssl_set_session(ssl, ssn);
+#else
ssl_set_session(ssl, 0, 0, ssn);
+#endif
ssl_set_ca_chain(ssl, &certificate, NULL, NULL);
ssl_set_own_cert(ssl, &certificate, &key);
diff --git a/src/ssl.h b/src/ssl.h
index aa719af..d155f7f 100644
--- a/src/ssl.h
+++ b/src/ssl.h
@@ -68,6 +68,9 @@
} \
} while (0)
#endif
+ #if (POLARSSL_VERSION_MINOR >= 2)
+ #define POLARSSL_API_V1_2
+ #endif
#endif
#endif
--
1.8.1.5
|
GitWeb