#include <polarssl/x509.h>
#include <polarssl/ssl.h>
#include <polarssl/net.h>
-#include <polarssl/version.h>
int ciphers[] =
{
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)
ssl_set_endpoint(ssl, SSL_IS_SERVER);
ssl_set_authmode(ssl, SSL_VERIFY_NONE);
- ssl_set_rng(ssl, havege_rand, &hs);
+ ssl_set_rng(ssl, HAVEGE_RAND, &hs);
ssl_set_dbg(ssl, pssl_debug, NULL);
ssl_set_bio(ssl, net_recv, fd, net_send, fd);
+#ifdef POLARSSL_API_V1
+ ssl_set_ciphersuites(ssl, ciphers);
+#else
ssl_set_ciphers(ssl, ciphers);
- ssl_set_session(ssl, 0, 0, ssn);
+#endif
+ ssl_set_session(ssl, 0, 0, ssn);
ssl_set_own_cert(ssl, &certificate, &key);
ssl_set_dh_param(ssl, my_dhm_P, my_dhm_G);
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);
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;
}