lib-sasl: API change - use size_t type for input/output lengths

It's highly unlikely that the length is ever >4GB, but this avoids any
potential problems with integer truncation.

diff --git a/src/lib-sasl/dsasl-client-private.h b/src/lib-sasl/dsasl-client-private.h
index a7295819cc0736f6fa99a7ae41091b862ea1626e..01e87128e815bbb2f8c19c78a9310f034eca50de 100644 (file)
--- a/src/lib-sasl/dsasl-client-private.h
+++ b/src/lib-sasl/dsasl-client-private.h
@@ -15,12 +15,10 @@ struct dsasl_client_mech {
        size_t struct_size;
 
        int (*input)(struct dsasl_client *client,
-                    const unsigned char *input,
-                    unsigned int input_len,
+                    const unsigned char *input, size_t input_len,
                     const char **error_r);
        int (*output)(struct dsasl_client *client,
-                     const unsigned char **output_r,
-                     unsigned int *output_len_r,
+                     const unsigned char **output_r, size_t *output_len_r,
                      const char **error_r);
        void (*free)(struct dsasl_client *client);
 };

diff --git a/src/lib-sasl/dsasl-client.c b/src/lib-sasl/dsasl-client.c
index 13338991b4c9acd9956334f2161c1aedc273dad7..ab58128ad05477ea2425338eeeeff233b1c5334a 100644 (file)
--- a/src/lib-sasl/dsasl-client.c
+++ b/src/lib-sasl/dsasl-client.c
@@ -83,16 +83,14 @@ void dsasl_client_free(struct dsasl_client **_client)
 }
 
 int dsasl_client_input(struct dsasl_client *client,
-                      const unsigned char *input,
-                      unsigned int input_len,
+                      const unsigned char *input, size_t input_len,
                       const char **error_r)
 {
        return client->mech->input(client, input, input_len, error_r);
 }
 
 int dsasl_client_output(struct dsasl_client *client,
-                       const unsigned char **output_r,
-                       unsigned int *output_len_r,
+                       const unsigned char **output_r, size_t *output_len_r,
                        const char **error_r)
 {
        return client->mech->output(client, output_r, output_len_r, error_r);

diff --git a/src/lib-sasl/dsasl-client.h b/src/lib-sasl/dsasl-client.h
index f2daa70da4b29516c0dff80093479f285fe97a8c..4265e3e86285ed53345bcd107742d37299cd2f09 100644 (file)
--- a/src/lib-sasl/dsasl-client.h
+++ b/src/lib-sasl/dsasl-client.h
@@ -23,14 +23,12 @@ void dsasl_client_free(struct dsasl_client **client);
 
 /* Call for server input. */
 int dsasl_client_input(struct dsasl_client *client,
-                      const unsigned char *input,
-                      unsigned int input_len,
+                      const unsigned char *input, size_t input_len,
                       const char **error_r);
 /* Call for getting server output. Also used to get the initial SASL response
    if supported by the protocol. */
 int dsasl_client_output(struct dsasl_client *client,
-                       const unsigned char **output_r,
-                       unsigned int *output_len_r,
+                       const unsigned char **output_r, size_t *output_len_r,
                        const char **error_r);
 
 void dsasl_clients_init(void);

diff --git a/src/lib-sasl/mech-external.c b/src/lib-sasl/mech-external.c
index d1f6bb69f0bf7e95d5e4bfa0bc947ceb99543cc0..b3c9554a6274bb23d48720eb6b76f68131a6209b 100644 (file)
--- a/src/lib-sasl/mech-external.c
+++ b/src/lib-sasl/mech-external.c
@@ -10,7 +10,7 @@ struct external_dsasl_client {
 
 static int
 mech_external_input(struct dsasl_client *_client,
-                   const unsigned char *input ATTR_UNUSED, unsigned int input_len,
+                   const unsigned char *input ATTR_UNUSED, size_t input_len,
                    const char **error_r)
 {
        struct external_dsasl_client *client =
@@ -30,7 +30,7 @@ mech_external_input(struct dsasl_client *_client,
 
 static int
 mech_external_output(struct dsasl_client *_client,
-                    const unsigned char **output_r, unsigned int *output_len_r,
+                    const unsigned char **output_r, size_t *output_len_r,
                     const char **error_r ATTR_UNUSED)
 {
        struct external_dsasl_client *client =

diff --git a/src/lib-sasl/mech-login.c b/src/lib-sasl/mech-login.c
index 4c202ab89635a6d57c716c82d345aaef303711b6..20b44366060cfb5392bb0edabd8f06c61900fb02 100644 (file)
--- a/src/lib-sasl/mech-login.c
+++ b/src/lib-sasl/mech-login.c
@@ -18,7 +18,7 @@ struct login_dsasl_client {
 static int
 mech_login_input(struct dsasl_client *_client,
                 const unsigned char *input ATTR_UNUSED,
-                unsigned int input_len ATTR_UNUSED,
+                size_t input_len ATTR_UNUSED,
                 const char **error_r)
 {
        struct login_dsasl_client *client =
@@ -34,7 +34,7 @@ mech_login_input(struct dsasl_client *_client,
 
 static int
 mech_login_output(struct dsasl_client *_client,
-                 const unsigned char **output_r, unsigned int *output_len_r,
+                 const unsigned char **output_r, size_t *output_len_r,
                  const char **error_r)
 {
        struct login_dsasl_client *client =

diff --git a/src/lib-sasl/mech-plain.c b/src/lib-sasl/mech-plain.c
index ef22183ce6bfe4fc1e3a002602dbf52cf85a293b..af7465cb1f3928943f723039f4fd4382beffbc66 100644 (file)
--- a/src/lib-sasl/mech-plain.c
+++ b/src/lib-sasl/mech-plain.c
@@ -11,7 +11,7 @@ struct plain_dsasl_client {
 
 static int
 mech_plain_input(struct dsasl_client *_client,
-                const unsigned char *input ATTR_UNUSED, unsigned int input_len,
+                const unsigned char *input ATTR_UNUSED, size_t input_len,
                 const char **error_r)
 {
        struct plain_dsasl_client *client =
@@ -31,7 +31,7 @@ mech_plain_input(struct dsasl_client *_client,
 
 static int
 mech_plain_output(struct dsasl_client *_client,
-                 const unsigned char **output_r, unsigned int *output_len_r,
+                 const unsigned char **output_r, size_t *output_len_r,
                  const char **error_r)
 {
        struct plain_dsasl_client *client =