From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Mon, 6 Mar 2023 03:11:54 +0000 (+0100)
Subject: auth: sasl-server - Add sasl_server_request_{start|accept}_channel_binding
X-Git-Tag: 2.4.2~258
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0abee59477790085ba356fd607350476c53c669b;p=thirdparty%2Fdovecot%2Fcore.git

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 5ee54f6722..8fbce99afa 100644
--- 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 294496669e..2ba0b6e008 100644
--- 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 ccf28e9092..1a5709e698 100644
--- 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)
 {