Commit 3892e019 authored by Sergey Lyubka's avatar Sergey Lyubka

Passing user_data to init_ssl()

parent 67f5de62
...@@ -4705,7 +4705,7 @@ static int set_ssl_option(struct mg_context *ctx) { ...@@ -4705,7 +4705,7 @@ static int set_ssl_option(struct mg_context *ctx) {
// If user callback returned non-NULL, that means that user callback has // If user callback returned non-NULL, that means that user callback has
// set up certificate itself. In this case, skip sertificate setting. // set up certificate itself. In this case, skip sertificate setting.
if ((ctx->callbacks.init_ssl == NULL || if ((ctx->callbacks.init_ssl == NULL ||
!ctx->callbacks.init_ssl(ctx->ssl_ctx)) && !ctx->callbacks.init_ssl(ctx->ssl_ctx, ctx->user_data)) &&
(SSL_CTX_use_certificate_file(ctx->ssl_ctx, pem, 1) == 0 || (SSL_CTX_use_certificate_file(ctx->ssl_ctx, pem, 1) == 0 ||
SSL_CTX_use_PrivateKey_file(ctx->ssl_ctx, pem, 1) == 0)) { SSL_CTX_use_PrivateKey_file(ctx->ssl_ctx, pem, 1) == 0)) {
cry(fc(ctx), "%s: cannot open %s: %s", __func__, pem, ssl_error()); cry(fc(ctx), "%s: cannot open %s: %s", __func__, pem, ssl_error());
......
...@@ -59,7 +59,7 @@ struct mg_callbacks { ...@@ -59,7 +59,7 @@ struct mg_callbacks {
int (*begin_request)(struct mg_connection *); int (*begin_request)(struct mg_connection *);
void (*end_request)(const struct mg_connection *, int reply_status_code); void (*end_request)(const struct mg_connection *, int reply_status_code);
int (*log_message)(const struct mg_connection *, const char *message); int (*log_message)(const struct mg_connection *, const char *message);
int (*init_ssl)(void *ssl_context); int (*init_ssl)(void *ssl_context, void *user_data);
int (*websocket_connect)(const struct mg_connection *); int (*websocket_connect)(const struct mg_connection *);
void (*websocket_ready)(struct mg_connection *); void (*websocket_ready)(struct mg_connection *);
int (*websocket_data)(struct mg_connection *); int (*websocket_data)(struct mg_connection *);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment