From: Alexandr Nedvedicky Date: Wed, 10 Dec 2025 12:22:28 +0000 (+0100) Subject: make snmpkdf.c good openssl citizen X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=42d464454dc41403da4c04d6799a25b40682dad6;p=thirdparty%2Fopenssl.git make snmpkdf.c good openssl citizen cstyle change only Reviewed-by: Tomas Mraz Reviewed-by: Simo Sorce (Merged from https://github.com/openssl/openssl/pull/29369) --- diff --git a/.gitignore b/.gitignore index 851a319a5ee..9a388a8c724 100644 --- a/.gitignore +++ b/.gitignore @@ -162,6 +162,7 @@ providers/implementations/digests/mdc2_prov.inc providers/implementations/digests/sha2_prov.inc providers/implementations/digests/sha3_prov.inc providers/implementations/include/prov/blake2_params.inc +providers/implementations/kdfs/snmpkdf.inc providers/implementations/macs/cmac_prov.inc providers/implementations/macs/gmac_prov.inc providers/implementations/macs/hmac_prov.inc diff --git a/providers/implementations/kdfs/snmpkdf.c b/providers/implementations/kdfs/snmpkdf.c index 9a55b90b335..d94fdc385b3 100644 --- a/providers/implementations/kdfs/snmpkdf.c +++ b/providers/implementations/kdfs/snmpkdf.c @@ -25,7 +25,7 @@ #include "providers/implementations/kdfs/snmpkdf.inc" #define KDF_SNMP_PASSWORD_HASH_AMOUNT (1024 * 1024) -#define KDF_SNMP_MIN_PASSWORD_LEN 8 +#define KDF_SNMP_MIN_PASSWORD_LEN 8 /* See RFC 3414, Appendix A.2.2 */ /* See NIST SP800-135 Section 6.8 */ @@ -40,9 +40,9 @@ static OSSL_FUNC_kdf_gettable_ctx_params_fn kdf_snmpkdf_gettable_ctx_params; static OSSL_FUNC_kdf_get_ctx_params_fn kdf_snmpkdf_get_ctx_params; static int SNMPKDF(const EVP_MD *evp_md, - const unsigned char *eid, size_t eid_len, - unsigned char *password, size_t password_len, - unsigned char *key, size_t keylen); + const unsigned char *eid, size_t eid_len, + unsigned char *password, size_t password_len, + unsigned char *key, size_t keylen); typedef struct { /* Warning: Any changes to this structure may require you to update kdf_snmpkdf_dup */ @@ -74,15 +74,15 @@ static void *kdf_snmpkdf_dup(void *vctx) dest = kdf_snmpkdf_new(src->provctx); if (dest != NULL) { if (!ossl_prov_memdup(src->eid, src->eid_len, - &dest->eid, &dest->eid_len) - || !ossl_prov_memdup(src->password, src->password_len, - &dest->password, &dest->password_len) - || !ossl_prov_digest_copy(&dest->digest, &src->digest)) + &dest->eid, &dest->eid_len) + || !ossl_prov_memdup(src->password, src->password_len, + &dest->password, &dest->password_len) + || !ossl_prov_digest_copy(&dest->digest, &src->digest)) goto err; } return dest; - err: +err: kdf_snmpkdf_free(dest); return NULL; } @@ -110,7 +110,7 @@ static void kdf_snmpkdf_reset(void *vctx) } static int snmpkdf_set_membuf(unsigned char **dst, size_t *dst_len, - const OSSL_PARAM *p) + const OSSL_PARAM *p) { OPENSSL_clear_free(*dst, *dst_len); *dst = NULL; @@ -119,7 +119,7 @@ static int snmpkdf_set_membuf(unsigned char **dst, size_t *dst_len, } static int kdf_snmpkdf_derive(void *vctx, unsigned char *key, size_t keylen, - const OSSL_PARAM params[]) + const OSSL_PARAM params[]) { KDF_SNMPKDF *ctx = (KDF_SNMPKDF *)vctx; const EVP_MD *md; @@ -142,8 +142,8 @@ static int kdf_snmpkdf_derive(void *vctx, unsigned char *key, size_t keylen, } return SNMPKDF(md, ctx->eid, ctx->eid_len, - ctx->password, ctx->password_len, - key, keylen); + ctx->password, ctx->password_len, + key, keylen); } static int kdf_snmpkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) @@ -174,8 +174,7 @@ static int kdf_snmpkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) if (p.pw != NULL) { if (!snmpkdf_set_membuf(&ctx->password, &ctx->password_len, p.pw)) return 0; - if ((ctx->password_len > KDF_SNMP_PASSWORD_HASH_AMOUNT) || - (ctx->password_len < KDF_SNMP_MIN_PASSWORD_LEN)) + if ((ctx->password_len > KDF_SNMP_PASSWORD_HASH_AMOUNT) || (ctx->password_len < KDF_SNMP_MIN_PASSWORD_LEN)) return 0; } @@ -186,7 +185,7 @@ static int kdf_snmpkdf_set_ctx_params(void *vctx, const OSSL_PARAM params[]) } static const OSSL_PARAM *kdf_snmpkdf_settable_ctx_params(ossl_unused void *ctx, - ossl_unused void *p_ctx) + ossl_unused void *p_ctx) { return snmp_set_ctx_params_list; } @@ -225,23 +224,23 @@ static int kdf_snmpkdf_get_ctx_params(void *vctx, OSSL_PARAM params[]) } static const OSSL_PARAM *kdf_snmpkdf_gettable_ctx_params(ossl_unused void *ctx, - ossl_unused void *p_ctx) + ossl_unused void *p_ctx) { return snmp_get_ctx_params_list; } const OSSL_DISPATCH ossl_kdf_snmpkdf_functions[] = { - { OSSL_FUNC_KDF_NEWCTX, (void(*)(void))kdf_snmpkdf_new }, - { OSSL_FUNC_KDF_DUPCTX, (void(*)(void))kdf_snmpkdf_dup }, - { OSSL_FUNC_KDF_FREECTX, (void(*)(void))kdf_snmpkdf_free }, - { OSSL_FUNC_KDF_RESET, (void(*)(void))kdf_snmpkdf_reset }, - { OSSL_FUNC_KDF_DERIVE, (void(*)(void))kdf_snmpkdf_derive }, + { OSSL_FUNC_KDF_NEWCTX, (void (*)(void))kdf_snmpkdf_new }, + { OSSL_FUNC_KDF_DUPCTX, (void (*)(void))kdf_snmpkdf_dup }, + { OSSL_FUNC_KDF_FREECTX, (void (*)(void))kdf_snmpkdf_free }, + { OSSL_FUNC_KDF_RESET, (void (*)(void))kdf_snmpkdf_reset }, + { OSSL_FUNC_KDF_DERIVE, (void (*)(void))kdf_snmpkdf_derive }, { OSSL_FUNC_KDF_SETTABLE_CTX_PARAMS, - (void(*)(void))kdf_snmpkdf_settable_ctx_params }, - { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void(*)(void))kdf_snmpkdf_set_ctx_params }, + (void (*)(void))kdf_snmpkdf_settable_ctx_params }, + { OSSL_FUNC_KDF_SET_CTX_PARAMS, (void (*)(void))kdf_snmpkdf_set_ctx_params }, { OSSL_FUNC_KDF_GETTABLE_CTX_PARAMS, - (void(*)(void))kdf_snmpkdf_gettable_ctx_params }, - { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void(*)(void))kdf_snmpkdf_get_ctx_params }, + (void (*)(void))kdf_snmpkdf_gettable_ctx_params }, + { OSSL_FUNC_KDF_GET_CTX_PARAMS, (void (*)(void))kdf_snmpkdf_get_ctx_params }, { 0, NULL } }; @@ -274,9 +273,9 @@ const OSSL_DISPATCH ossl_kdf_snmpkdf_functions[] = { * return - 1 pass 0 for error */ static int SNMPKDF(const EVP_MD *evp_md, - const unsigned char *e_id, size_t e_len, - unsigned char *password, size_t password_len, - unsigned char *okey, size_t okeylen) + const unsigned char *e_id, size_t e_len, + unsigned char *password, size_t password_len, + unsigned char *okey, size_t okeylen) { EVP_MD_CTX *md = NULL; unsigned char digest[EVP_MAX_MD_SIZE];