auth: sasl-server - Add sasl_server_request_{start|accept}_channel_binding

These wrap auth_request_{start|accept}_channel_binding().

diff --git a/src/auth/sasl-server-mech-scram.c b/src/auth/sasl-server-mech-scram.c
index 5ee54f67226b64dde6595194917541db37d44701..8fbce99afa930c3329c0c1ea8a05a4aa16ea965f 100644 (file)
--- a/src/auth/sasl-server-mech-scram.c
+++ b/src/auth/sasl-server-mech-scram.c
@@ -92,7 +92,7 @@ mech_scram_start_channel_binding(struct auth_scram_server *asserver,
                container_of(asserver, struct scram_auth_request, scram_server);
        struct auth_request *auth_request = &request->auth_request;
 
-       auth_request_start_channel_binding(auth_request, type);
+       sasl_server_request_start_channel_binding(auth_request, type);
 }
 
 static int
@@ -103,7 +103,7 @@ mech_scram_accept_channel_binding(struct auth_scram_server *asserver,
                container_of(asserver, struct scram_auth_request, scram_server);
        struct auth_request *auth_request = &request->auth_request;
 
-       return auth_request_accept_channel_binding(auth_request, data_r);
+       return sasl_server_request_accept_channel_binding(auth_request, data_r);
 }
 
 static int

diff --git a/src/auth/sasl-server-protected.h b/src/auth/sasl-server-protected.h
index 294496669e7bc0db29f97812e9b6197846ba95be..2ba0b6e008f49c7e12f246e3c723e7e8999119df 100644 (file)
--- a/src/auth/sasl-server-protected.h
+++ b/src/auth/sasl-server-protected.h
@@ -79,6 +79,11 @@ bool sasl_server_request_get_extra_field(struct auth_request *request,
                                         const char *name,
                                         const char **field_r);
 
+void sasl_server_request_start_channel_binding(
+       struct auth_request *request, const char *type);
+int sasl_server_request_accept_channel_binding(
+       struct auth_request *request, buffer_t **data_r);
+
 void sasl_server_request_output(struct auth_request *request,
                                const void *data, size_t data_size);
 void sasl_server_request_success(struct auth_request *request,

diff --git a/src/auth/sasl-server-request.c b/src/auth/sasl-server-request.c
index ccf28e909269af3b5a4ea1f0cdf10067dbcda068..1a5709e698a79ae318214ed0051c55250e5555b2 100644 (file)
--- a/src/auth/sasl-server-request.c
+++ b/src/auth/sasl-server-request.c
@@ -35,6 +35,18 @@ bool sasl_server_request_get_extra_field(struct auth_request *request,
        return auth_sasl_request_get_extra_field(request, name, field_r);
 }
 
+void sasl_server_request_start_channel_binding(
+       struct auth_request *request, const char *type)
+{
+       auth_sasl_request_start_channel_binding(request, type);
+}
+
+int sasl_server_request_accept_channel_binding(
+       struct auth_request *request, buffer_t **data_r)
+{
+       return auth_sasl_request_accept_channel_binding(request, data_r);
+}
+
 void sasl_server_request_output(struct auth_request *request,
                                const void *data, size_t data_size)
 {