From 5e2d877cc4137e7bea7d0cdd4bc643e69c957922 Mon Sep 17 00:00:00 2001 From: Jouni Malinen Date: Mon, 11 May 2020 12:16:20 +0300 Subject: [PATCH] DPP: Mark internal-to-file functions static These functions are not used outside dpp_crypto.c anymore. Signed-off-by: Jouni Malinen --- src/common/dpp_crypto.c | 12 +++++++----- src/common/dpp_i.h | 5 ----- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/src/common/dpp_crypto.c b/src/common/dpp_crypto.c index 7495746da..8bf2a74a6 100644 --- a/src/common/dpp_crypto.c +++ b/src/common/dpp_crypto.c @@ -99,7 +99,8 @@ const struct dpp_curve_params * dpp_get_curve_jwk_crv(const char *name) } -const struct dpp_curve_params * dpp_get_curve_oid(const ASN1_OBJECT *poid) +static const struct dpp_curve_params * +dpp_get_curve_oid(const ASN1_OBJECT *poid) { ASN1_OBJECT *oid; int i; @@ -215,8 +216,9 @@ void dpp_debug_print_key(const char *title, EVP_PKEY *key) } -int dpp_hash_vector(const struct dpp_curve_params *curve, size_t num_elem, - const u8 *addr[], const size_t *len, u8 *mac) +static int dpp_hash_vector(const struct dpp_curve_params *curve, + size_t num_elem, const u8 *addr[], const size_t *len, + u8 *mac) { if (curve->hash_len == 32) return sha256_vector(num_elem, addr, len, mac); @@ -264,8 +266,8 @@ int dpp_hmac_vector(size_t hash_len, const u8 *key, size_t key_len, } -int dpp_hmac(size_t hash_len, const u8 *key, size_t key_len, - const u8 *data, size_t data_len, u8 *mac) +static int dpp_hmac(size_t hash_len, const u8 *key, size_t key_len, + const u8 *data, size_t data_len, u8 *mac) { if (hash_len == 32) return hmac_sha256(key, key_len, data, data_len, mac); diff --git a/src/common/dpp_i.h b/src/common/dpp_i.h index f18b8be08..e66eb6cfd 100644 --- a/src/common/dpp_i.h +++ b/src/common/dpp_i.h @@ -72,7 +72,6 @@ dpp_check_signed_connector(struct dpp_signed_connector_info *info, const u8 *peer_connector, size_t peer_connector_len); const struct dpp_curve_params * dpp_get_curve_name(const char *name); const struct dpp_curve_params * dpp_get_curve_jwk_crv(const char *name); -const struct dpp_curve_params * dpp_get_curve_oid(const ASN1_OBJECT *poid); const struct dpp_curve_params * dpp_get_curve_nid(int nid); int dpp_bi_pubkey_hash(struct dpp_bootstrap_info *bi, const u8 *data, size_t data_len); @@ -82,12 +81,8 @@ EVP_PKEY * dpp_set_pubkey_point_group(const EC_GROUP *group, size_t len); EVP_PKEY * dpp_set_pubkey_point(EVP_PKEY *group_key, const u8 *buf, size_t len); int dpp_bn2bin_pad(const BIGNUM *bn, u8 *pos, size_t len); -int dpp_hash_vector(const struct dpp_curve_params *curve, size_t num_elem, - const u8 *addr[], const size_t *len, u8 *mac); int dpp_hkdf_expand(size_t hash_len, const u8 *secret, size_t secret_len, const char *label, u8 *out, size_t outlen); -int dpp_hmac(size_t hash_len, const u8 *key, size_t key_len, - const u8 *data, size_t data_len, u8 *mac); int dpp_hmac_vector(size_t hash_len, const u8 *key, size_t key_len, size_t num_elem, const u8 *addr[], const size_t *len, u8 *mac);