give the main context a type instead of making it void *

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

diff --git a/ustream-example-server.c b/ustream-example-server.c
index f1c02cb4dccbe19b2e6cd4e79faf6f91ff1e82fa..9f2ae805c4c25659262f181a95933b3bb2da6cc3 100644 (file)
--- a/ustream-example-server.c
+++ b/ustream-example-server.c
@@ -31,7 +31,7 @@
 #include <libubox/usock.h>
 #include "ustream-ssl.h"
 
-static void *ctx;
+static struct ustream_ssl_ctx *ctx;
 
 static struct uloop_fd server;
 static const char *port = "10000";

diff --git a/ustream-internal.h b/ustream-internal.h
index f856d992866acda30bd168db18552ed8d8a50edc..85d8b47d2584fda97e5b7bb972005c983e8c8c8d 100644 (file)
--- a/ustream-internal.h
+++ b/ustream-internal.h
@@ -33,11 +33,11 @@ enum ssl_conn_status {
        U_SSL_ERROR = -2,
 };
 
-void ustream_set_io(void *ctx, void *ssl, struct ustream *s);
-void *__ustream_ssl_context_new(bool server);
-int __ustream_ssl_set_crt_file(void *ctx, const char *file);
-int __ustream_ssl_set_key_file(void *ctx, const char *file);
-void __ustream_ssl_context_free(void *ctx);
+void ustream_set_io(struct ustream_ssl_ctx *ctx, void *ssl, struct ustream *s);
+struct ustream_ssl_ctx *__ustream_ssl_context_new(bool server);
+int __ustream_ssl_set_crt_file(struct ustream_ssl_ctx *ctx, const char *file);
+int __ustream_ssl_set_key_file(struct ustream_ssl_ctx *ctx, const char *file);
+void __ustream_ssl_context_free(struct ustream_ssl_ctx *ctx);
 enum ssl_conn_status __ustream_ssl_connect(struct ustream_ssl *us);
 int __ustream_ssl_read(struct ustream_ssl *us, char *buf, int len);
 int __ustream_ssl_write(struct ustream_ssl *us, const char *buf, int len);

diff --git a/ustream-io-openssl.c b/ustream-io-openssl.c
index 9a22ff0a1c4cfbd891b8b377b370cbb1f7f57919..67110550c99926e784ab65cccdfda0eaf0659b27 100644 (file)
--- a/ustream-io-openssl.c
+++ b/ustream-io-openssl.c
@@ -138,7 +138,7 @@ static BIO *ustream_bio_new(struct ustream *s)
        return bio;
 }
 
-__hidden void ustream_set_io(void *ctx, void *ssl, struct ustream *conn)
+__hidden void ustream_set_io(struct ustream_ssl_ctx *ctx, void *ssl, struct ustream *conn)
 {
        BIO *bio = ustream_bio_new(conn);
        SSL_set_bio(ssl, bio, bio);

diff --git a/ustream-openssl.c b/ustream-openssl.c
index 2d569f3101b8367ec699302c59f80df7765cc9fd..c826e4e9bace45ccf5899528fe56f5e85952e515 100644 (file)
--- a/ustream-openssl.c
+++ b/ustream-openssl.c
@@ -19,7 +19,8 @@
 #include "ustream-ssl.h"
 #include "ustream-internal.h"
 
-__hidden void * __ustream_ssl_context_new(bool server)
+__hidden struct ustream_ssl_ctx *
+__ustream_ssl_context_new(bool server)
 {
        static bool _init = false;
        const void *m;
@@ -50,16 +51,16 @@ __hidden void * __ustream_ssl_context_new(bool server)
        if (server)
                SSL_CTX_set_verify(c, SSL_VERIFY_NONE, NULL);
 
-       return c;
+       return (void *) c;
 }
 
-__hidden int __ustream_ssl_set_crt_file(void *ctx, const char *file)
+__hidden int __ustream_ssl_set_crt_file(struct ustream_ssl_ctx *ctx, const char *file)
 {
        int ret;
 
-       ret = SSL_CTX_use_certificate_file(ctx, file, SSL_FILETYPE_PEM);
+       ret = SSL_CTX_use_certificate_file((void *) ctx, file, SSL_FILETYPE_PEM);
        if (ret < 1)
-               ret = SSL_CTX_use_certificate_file(ctx, file, SSL_FILETYPE_ASN1);
+               ret = SSL_CTX_use_certificate_file((void *) ctx, file, SSL_FILETYPE_ASN1);
 
        if (ret < 1)
                return -1;
@@ -67,13 +68,13 @@ __hidden int __ustream_ssl_set_crt_file(void *ctx, const char *file)
        return 0;
 }
 
-__hidden int __ustream_ssl_set_key_file(void *ctx, const char *file)
+__hidden int __ustream_ssl_set_key_file(struct ustream_ssl_ctx *ctx, const char *file)
 {
        int ret;
 
-       ret = SSL_CTX_use_PrivateKey_file(ctx, file, SSL_FILETYPE_PEM);
+       ret = SSL_CTX_use_PrivateKey_file((void *) ctx, file, SSL_FILETYPE_PEM);
        if (ret < 1)
-               ret = SSL_CTX_use_PrivateKey_file(ctx, file, SSL_FILETYPE_ASN1);
+               ret = SSL_CTX_use_PrivateKey_file((void *) ctx, file, SSL_FILETYPE_ASN1);
 
        if (ret < 1)
                return -1;
@@ -81,9 +82,9 @@ __hidden int __ustream_ssl_set_key_file(void *ctx, const char *file)
        return 0;
 }
 
-__hidden void __ustream_ssl_context_free(void *ctx)
+__hidden void __ustream_ssl_context_free(struct ustream_ssl_ctx *ctx)
 {
-       SSL_CTX_free(ctx);
+       SSL_CTX_free((void *) ctx);
 }
 
 static void ustream_ssl_error(struct ustream_ssl *us, int ret)

diff --git a/ustream-polarssl.c b/ustream-polarssl.c
index d55fe0439d1a5cf993b15b448fb841438a156350..c0147ed948260974ce3da64ee546047afd72c7d4 100644 (file)
--- a/ustream-polarssl.c
+++ b/ustream-polarssl.c
@@ -60,7 +60,7 @@ static int s_ustream_write(void *ctx, const unsigned char *buf, size_t len)
        return ret;
 }
 
-__hidden void ustream_set_io(void *ctx, void *ssl, struct ustream *conn)
+__hidden void ustream_set_io(struct ustream_ssl_ctx *ctx, void *ssl, struct ustream *conn)
 {
        ssl_set_bio(ssl, s_ustream_read, conn, s_ustream_write, conn);
 }
@@ -83,36 +83,36 @@ static int _urandom(void *ctx, unsigned char *out, size_t len)
        return 0;
 }
 
-__hidden void * __ustream_ssl_context_new(bool server)
+__hidden struct ustream_ssl_ctx *
+__ustream_ssl_context_new(bool server)
 {
-       struct ustream_polarssl_ctx *uctx;
+       struct ustream_ssl_ctx *ctx;
 
        if (!urandom_init())
                return NULL;
 
-       uctx = calloc(1, sizeof(*uctx));
-       if (!uctx)
+       ctx = calloc(1, sizeof(*ctx));
+       if (!ctx)
                return NULL;
 
-       uctx->server = server;
+       ctx->server = server;
 #ifdef USE_VERSION_1_3
-       pk_init(&uctx->key);
+       pk_init(&ctx->key);
 #else
-       rsa_init(&uctx->key, RSA_PKCS_V15, 0);
+       rsa_init(&ctx->key, RSA_PKCS_V15, 0);
 #endif
 
-       return uctx;
+       return ctx;
 }
 
-__hidden int __ustream_ssl_set_crt_file(void *ctx, const char *file)
+__hidden int __ustream_ssl_set_crt_file(struct ustream_ssl_ctx *ctx, const char *file)
 {
-       struct ustream_polarssl_ctx *uctx = ctx;
        int ret;
 
 #ifdef USE_VERSION_1_3
-       ret = x509_crt_parse_file(&uctx->cert, file);
+       ret = x509_crt_parse_file(&ctx->cert, file);
 #else
-       ret = x509parse_crtfile(&uctx->cert, file);
+       ret = x509parse_crtfile(&ctx->cert, file);
 #endif
        if (ret)
                return -1;
@@ -120,15 +120,14 @@ __hidden int __ustream_ssl_set_crt_file(void *ctx, const char *file)
        return 0;
 }
 
-__hidden int __ustream_ssl_set_key_file(void *ctx, const char *file)
+__hidden int __ustream_ssl_set_key_file(struct ustream_ssl_ctx *ctx, const char *file)
 {
-       struct ustream_polarssl_ctx *uctx = ctx;
        int ret;
 
 #ifdef USE_VERSION_1_3
-       ret = pk_parse_keyfile(&uctx->key, file, NULL);
+       ret = pk_parse_keyfile(&ctx->key, file, NULL);
 #else
-       ret = x509parse_keyfile(&uctx->key, file, NULL);
+       ret = x509parse_keyfile(&ctx->key, file, NULL);
 #endif
        if (ret)
                return -1;
@@ -136,16 +135,14 @@ __hidden int __ustream_ssl_set_key_file(void *ctx, const char *file)
        return 0;
 }
 
-__hidden void __ustream_ssl_context_free(void *ctx)
+__hidden void __ustream_ssl_context_free(struct ustream_ssl_ctx *ctx)
 {
-       struct ustream_polarssl_ctx *uctx = ctx;
-
 #ifdef USE_VERSION_1_3
-       pk_free(&uctx->key);
-       x509_crt_free(&uctx->cert);
+       pk_free(&ctx->key);
+       x509_crt_free(&ctx->cert);
 #else
-       rsa_free(&uctx->key);
-       x509_free(&uctx->cert);
+       rsa_free(&ctx->key);
+       x509_free(&ctx->cert);
 #endif
        free(ctx);
 }
@@ -256,9 +253,8 @@ static const int default_ciphersuites[] =
     0
 };
 
-__hidden void *__ustream_ssl_session_new(void *ctx)
+__hidden void *__ustream_ssl_session_new(struct ustream_ssl_ctx *ctx)
 {
-       struct ustream_polarssl_ctx *uctx = ctx;
        ssl_context *ssl;
        int ep, auth;
 
@@ -271,7 +267,7 @@ __hidden void *__ustream_ssl_session_new(void *ctx)
                return NULL;
        }
 
-       if (uctx->server) {
+       if (ctx->server) {
                ep = SSL_IS_SERVER;
                auth = SSL_VERIFY_NONE;
        } else {
@@ -284,10 +280,10 @@ __hidden void *__ustream_ssl_session_new(void *ctx)
        ssl_set_authmode(ssl, auth);
        ssl_set_rng(ssl, _urandom, NULL);
 
-       if (uctx->server) {
-               if (uctx->cert.next)
-                       ssl_set_ca_chain(ssl, uctx->cert.next, NULL, NULL);
-               ssl_set_own_cert(ssl, &uctx->cert, &uctx->key);
+       if (ctx->server) {
+               if (ctx->cert.next)
+                       ssl_set_ca_chain(ssl, ctx->cert.next, NULL, NULL);
+               ssl_set_own_cert(ssl, &ctx->cert, &ctx->key);
        }
 
        ssl_session_reset(ssl);

diff --git a/ustream-polarssl.h b/ustream-polarssl.h
index e7445f75cde366bbf3e965ba6e241a8a6a53bcde..70e8b42805287cf77bf93e2aa32c4036d25c6e35 100644 (file)
--- a/ustream-polarssl.h
+++ b/ustream-polarssl.h
@@ -33,7 +33,7 @@
 #define x509_crt x509_cert
 #endif
 
-struct ustream_polarssl_ctx {
+struct ustream_ssl_ctx {
 #ifdef USE_VERSION_1_3
        pk_context key;
 #else
@@ -50,6 +50,6 @@ static inline char *__ustream_ssl_strerror(int error, char *buffer, int len)
 }
 
 void __ustream_ssl_session_free(void *ssl);
-void *__ustream_ssl_session_new(void *ctx);
+void *__ustream_ssl_session_new(struct ustream_ssl_ctx *ctx);
 
 #endif

diff --git a/ustream-ssl.c b/ustream-ssl.c
index b182308039dc3c2b62b13491c2d276850ed89be4..4526db082e4362d1479cb9c7b6e1258ea394ac60 100644 (file)
--- a/ustream-ssl.c
+++ b/ustream-ssl.c
@@ -164,7 +164,7 @@ static void ustream_ssl_stream_init(struct ustream_ssl *us)
        ustream_init_defaults(s);
 }
 
-static int _ustream_ssl_init(struct ustream_ssl *us, struct ustream *conn, void *ctx, bool server)
+static int _ustream_ssl_init(struct ustream_ssl *us, struct ustream *conn, struct ustream_ssl_ctx *ctx, bool server)
 {
        us->error_timer.cb = ustream_ssl_error_cb;
        us->server = server;

diff --git a/ustream-ssl.h b/ustream-ssl.h
index aa1ced5943b3228cfc1494918a7901f62d81a87f..d2cdb69f77a8c95f3ee0570f94aadd65b0f2b001 100644 (file)
--- a/ustream-ssl.h
+++ b/ustream-ssl.h
@@ -29,7 +29,7 @@ struct ustream_ssl {
        void (*notify_connected)(struct ustream_ssl *us);
        void (*notify_error)(struct ustream_ssl *us, int error, const char *str);
 
-       void *ctx;
+       struct ustream_ssl_ctx *ctx;
        void *ssl;
 
        int error;
@@ -37,13 +37,16 @@ struct ustream_ssl {
        bool server;
 };
 
+struct ustream_ssl_ctx;
+
 struct ustream_ssl_ops {
-       void *(*context_new)(bool server);
-       int (*context_set_crt_file)(void *ctx, const char *file);
-       int (*context_set_key_file)(void *ctx, const char *file);
-       void (*context_free)(void *ctx);
 
-       int (*init)(struct ustream_ssl *us, struct ustream *conn, void *ctx, bool server);
+       struct ustream_ssl_ctx *(*context_new)(bool server);
+       int (*context_set_crt_file)(struct ustream_ssl_ctx *ctx, const char *file);
+       int (*context_set_key_file)(struct ustream_ssl_ctx *ctx, const char *file);
+       void (*context_free)(struct ustream_ssl_ctx *ctx);
+
+       int (*init)(struct ustream_ssl *us, struct ustream *conn, struct ustream_ssl_ctx *ctx, bool server);
 };
 
 extern const struct ustream_ssl_ops ustream_ssl_ops;