From 12fdce249bce244181186706e4d41ba4982be5db Mon Sep 17 00:00:00 2001 From: Nick Porter Date: Fri, 27 Jun 2025 17:33:29 +0100 Subject: [PATCH] Make fr_der_decode_pair_dbuff a public function So the DER decoder can be used from other modules --- src/protocols/der/decode.c | 7 ++----- src/protocols/der/der.h | 6 ++++++ 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/protocols/der/decode.c b/src/protocols/der/decode.c index e1e4d2dbb7..71dda55e7b 100644 --- a/src/protocols/der/decode.c +++ b/src/protocols/der/decode.c @@ -73,9 +73,6 @@ typedef struct { * - 0 no bytes decoded. * - < 0 on error. May be the offset (as a negative value) where the error occurred. */ -static ssize_t fr_der_decode_pair_dbuff(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_attr_t const *parent, - fr_dbuff_t *in, fr_der_decode_ctx_t *decode_ctx) CC_HINT(nonnull); - static ssize_t fr_der_decode_string(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_attr_t const *parent, fr_dbuff_t *in, bool const allowed_chars[], fr_der_decode_ctx_t *decode_ctx) CC_HINT(nonnull(1,2,3,4,6)); @@ -2362,8 +2359,8 @@ static ssize_t fr_der_decode_string(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dic return fr_dbuff_set(in, &our_in); } -static ssize_t fr_der_decode_pair_dbuff(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_attr_t const *parent, - fr_dbuff_t *in, fr_der_decode_ctx_t *decode_ctx) +ssize_t fr_der_decode_pair_dbuff(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_attr_t const *parent, + fr_dbuff_t *in, fr_der_decode_ctx_t *decode_ctx) { fr_dbuff_t our_in = FR_DBUFF(in); fr_der_tag_decode_t const *func; diff --git a/src/protocols/der/der.h b/src/protocols/der/der.h index 9519c952cb..9e8b99447f 100644 --- a/src/protocols/der/der.h +++ b/src/protocols/der/der.h @@ -147,3 +147,9 @@ char const *fr_der_tag_to_str(fr_der_tag_t tag); int fr_der_global_init(void); void fr_der_global_free(void); + +/* + * decode.c + */ +ssize_t fr_der_decode_pair_dbuff(TALLOC_CTX *ctx, fr_pair_list_t *out, fr_dict_attr_t const *parent, + fr_dbuff_t *in, fr_der_decode_ctx_t *decode_ctx); -- 2.47.3