From: Stephan Bosch Date: Sun, 6 Jan 2019 22:19:14 +0000 (+0100) Subject: auth: Reduce code line length in password-scheme.h. X-Git-Tag: 2.3.10~238 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=972c1d6bda9ef4ab483168b32c9dad4b03f7cd54;p=thirdparty%2Fdovecot%2Fcore.git auth: Reduce code line length in password-scheme.h. --- diff --git a/src/auth/password-scheme.h b/src/auth/password-scheme.h index 8ba2639766..aa51a50a5a 100644 --- a/src/auth/password-scheme.h +++ b/src/auth/password-scheme.h @@ -22,10 +22,12 @@ struct password_scheme { hex and base64 encoded passwords. */ unsigned int raw_password_len; - int (*password_verify)(const char *plaintext, const struct password_generate_params *params, + int (*password_verify)(const char *plaintext, + const struct password_generate_params *params, const unsigned char *raw_password, size_t size, const char **error_r); - void (*password_generate)(const char *plaintext, const struct password_generate_params *params, + void (*password_generate)(const char *plaintext, + const struct password_generate_params *params, const unsigned char **raw_password_r, size_t *size_r); }; @@ -36,8 +38,10 @@ extern unsigned int password_scheme_encryption_rounds; /* Returns 1 = matched, 0 = didn't match, -1 = unknown scheme or invalid raw_password */ -int password_verify(const char *plaintext, const struct password_generate_params *params, - const char *scheme, const unsigned char *raw_password, size_t size, +int password_verify(const char *plaintext, + const struct password_generate_params *params, + const char *scheme, + const unsigned char *raw_password, size_t size, const char **error_r); /* Extracts scheme from password, or returns NULL if it isn't found. @@ -53,13 +57,15 @@ int password_decode(const char *password, const char *scheme, /* Create password with wanted scheme out of plaintext password and username. Potential base64/hex directives are ignored in scheme. Returns FALSE if the scheme is unknown. */ -bool password_generate(const char *plaintext, const struct password_generate_params *params, +bool password_generate(const char *plaintext, + const struct password_generate_params *params, const char *scheme, const unsigned char **raw_password_r, size_t *size_r); /* Like above, but generate encoded passwords. If hex/base64 directive isn't specified in the scheme, the default encoding for the scheme is used. Returns FALSE if the scheme is unknown. */ -bool password_generate_encoded(const char *plaintext, const struct password_generate_params *params, +bool password_generate_encoded(const char *plaintext, + const struct password_generate_params *params, const char *scheme, const char **password_r); /* Returns TRUE if schemes are equivalent. */ @@ -89,7 +95,8 @@ int password_generate_otp(const char *pw, const char *state_data, ATTR_NULL(2); void password_generate_rpa(const char *pw, unsigned char result[]); -int crypt_verify(const char *plaintext, const struct password_generate_params *params, +int crypt_verify(const char *plaintext, + const struct password_generate_params *params, const unsigned char *raw_password, size_t size, const char **error_r); @@ -97,14 +104,19 @@ int scram_sha1_scheme_parse(const unsigned char *credentials, size_t size, unsigned int *iter_count_r, const char **salt_r, unsigned char stored_key_r[], unsigned char server_key_r[], const char **error_r); -int scram_sha1_verify(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED, +int scram_sha1_verify(const char *plaintext, + const struct password_generate_params *params ATTR_UNUSED, const unsigned char *raw_password, size_t size, const char **error_r ATTR_UNUSED); -void scram_sha1_generate(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED, +void scram_sha1_generate(const char *plaintext, + const struct password_generate_params *params ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r); -void pbkdf2_generate(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED, + +void pbkdf2_generate(const char *plaintext, + const struct password_generate_params *params ATTR_UNUSED, const unsigned char **raw_password_r, size_t *size_r); -int pbkdf2_verify(const char *plaintext, const struct password_generate_params *params ATTR_UNUSED, +int pbkdf2_verify(const char *plaintext, + const struct password_generate_params *params ATTR_UNUSED, const unsigned char *raw_password, size_t size, const char **error_r);