polarssl: init certificate storage

[project/ustream-ssl.git] / ustream-polarssl.c

diff --git a/ustream-polarssl.c b/ustream-polarssl.c
index 615ac2d88bff5ce09b5dbe00eb6815ed949dfc42..7135d3c3952773cf12af3fb22cbf2db946c58fbe 100644 (file)
--- a/ustream-polarssl.c
+++ b/ustream-polarssl.c
@@ -20,6 +20,7 @@
 #include <fcntl.h>
 #include <unistd.h>
 #include <stdlib.h>
+#include <string.h>
 
 #include "ustream-ssl.h"
 #include "ustream-internal.h"
@@ -98,11 +99,9 @@ __ustream_ssl_context_new(bool server)
                return NULL;
 
        ctx->server = server;
-#ifdef USE_VERSION_1_3
        pk_init(&ctx->key);
-#else
-       rsa_init(&ctx->key, RSA_PKCS_V15, 0);
-#endif
+       x509_crt_init(&ctx->ca_cert);
+       x509_crt_init(&ctx->cert);
 
        return ctx;
 }
@@ -111,11 +110,7 @@ __hidden int __ustream_ssl_add_ca_crt_file(struct ustream_ssl_ctx *ctx, const ch
 {
        int ret;
 
-#ifdef USE_VERSION_1_3
        ret = x509_crt_parse_file(&ctx->ca_cert, file);
-#else
-       ret = x509parse_crtfile(&ctx->ca_cert, file);
-#endif
        if (ret)
                return -1;
 
@@ -126,11 +121,7 @@ __hidden int __ustream_ssl_set_crt_file(struct ustream_ssl_ctx *ctx, const char
 {
        int ret;
 
-#ifdef USE_VERSION_1_3
        ret = x509_crt_parse_file(&ctx->cert, file);
-#else
-       ret = x509parse_crtfile(&ctx->cert, file);
-#endif
        if (ret)
                return -1;
 
@@ -141,11 +132,7 @@ __hidden int __ustream_ssl_set_key_file(struct ustream_ssl_ctx *ctx, const char
 {
        int ret;
 
-#ifdef USE_VERSION_1_3
        ret = pk_parse_keyfile(&ctx->key, file, NULL);
-#else
-       ret = x509parse_keyfile(&ctx->key, file, NULL);
-#endif
        if (ret)
                return -1;
 
@@ -154,13 +141,9 @@ __hidden int __ustream_ssl_set_key_file(struct ustream_ssl_ctx *ctx, const char
 
 __hidden void __ustream_ssl_context_free(struct ustream_ssl_ctx *ctx)
 {
-#ifdef USE_VERSION_1_3
        pk_free(&ctx->key);
+       x509_crt_free(&ctx->ca_cert);
        x509_crt_free(&ctx->cert);
-#else
-       rsa_free(&ctx->key);
-       x509_free(&ctx->cert);
-#endif
        free(ctx);
 }
 
@@ -300,10 +283,6 @@ static const int default_ciphersuites[] =
 #endif
 #if defined(POLARSSL_DES_C)
     TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-#endif
-#if defined(POLARSSL_ARC4_C)
-    TLS_RSA_WITH_RC4_128_SHA,
-    TLS_RSA_WITH_RC4_128_MD5,
 #endif
     0
 };
@@ -341,7 +320,7 @@ __hidden void *__ustream_ssl_session_new(struct ustream_ssl_ctx *ctx)
                        ssl_set_ca_chain(ssl, ctx->cert.next, NULL, NULL);
                ssl_set_own_cert(ssl, &ctx->cert, &ctx->key);
        } else {
-               ssl_set_ca_chain(ssl, &ctx->cert, NULL, NULL);
+               ssl_set_ca_chain(ssl, &ctx->ca_cert, NULL, NULL);
        }
 
        ssl_session_reset(ssl);