static int s_ustream_write(void *ctx, const unsigned char *buf, size_t len)
{
struct ustream *s = ctx;
+ int ret;
- len = ustream_write(s, (const char *) buf, len, false);
- if (len < 0 || s->write_error)
+ ret = ustream_write(s, (const char *) buf, len, false);
+ if (ret < 0 || s->write_error)
return POLARSSL_ERR_NET_SEND_FAILED;
- return 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);
}
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;
- rsa_init(&uctx->key, RSA_PKCS_V15, 0);
+ ctx->auth = SSL_VERIFY_NONE;
+ ctx->server = server;
+#ifdef USE_VERSION_1_3
+ pk_init(&ctx->key);
+#else
+ 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;
- if (x509parse_crtfile(&uctx->cert, file))
+#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;
+ if (!ctx->server)
+ ctx->auth = SSL_VERIFY_OPTIONAL;
+
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;
- if (x509parse_keyfile(&uctx->key, file, NULL))
+#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;
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;
-
- rsa_free(&uctx->key);
- x509_free(&uctx->cert);
+#ifdef USE_VERSION_1_3
+ pk_free(&ctx->key);
+ x509_crt_free(&ctx->cert);
+#else
+ rsa_free(&ctx->key);
+ x509_free(&ctx->cert);
+#endif
free(ctx);
}
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;
+ int ep;
ssl = calloc(1, sizeof(ssl_context));
if (!ssl)
return NULL;
}
- if (uctx->server) {
+ if (ctx->server)
ep = SSL_IS_SERVER;
- auth = SSL_VERIFY_NONE;
- } else {
+ else
ep = SSL_IS_CLIENT;
- auth = SSL_VERIFY_OPTIONAL;
- }
ssl_set_ciphersuites(ssl, default_ciphersuites);
ssl_set_endpoint(ssl, ep);
- ssl_set_authmode(ssl, auth);
+ ssl_set_authmode(ssl, ctx->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);