From 08e277d145d284b400f99864c8fca08520c1e8d2 Mon Sep 17 00:00:00 2001 From: Nickolay Olshevsky Date: Thu, 1 Aug 2024 12:02:40 +0300 Subject: [PATCH] Put s2k_specifier_len under the corresponding define. --- src/librepgp/stream-key.cpp | 2 ++ src/librepgp/stream-key.h | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/librepgp/stream-key.cpp b/src/librepgp/stream-key.cpp index 6508c0f44a..30fe3bf0fc 100644 --- a/src/librepgp/stream-key.cpp +++ b/src/librepgp/stream-key.cpp @@ -921,6 +921,7 @@ pgp_key_pkt_t::~pgp_key_pkt_t() free(sec_data); } +#if defined(ENABLE_CRYPTO_REFRESH) uint8_t pgp_key_pkt_t::s2k_specifier_len(pgp_s2k_specifier_t specifier) { @@ -936,6 +937,7 @@ pgp_key_pkt_t::s2k_specifier_len(pgp_s2k_specifier_t specifier) throw rnp::rnp_exception(RNP_ERROR_BAD_PARAMETERS); } } +#endif void pgp_key_pkt_t::make_s2k_params(pgp_packet_body_t &hbody) diff --git a/src/librepgp/stream-key.h b/src/librepgp/stream-key.h index b35c398a91..9820089079 100644 --- a/src/librepgp/stream-key.h +++ b/src/librepgp/stream-key.h @@ -74,8 +74,11 @@ typedef struct pgp_key_pkt_t { void fill_hashed_data(); private: - void make_s2k_params(pgp_packet_body_t &hbody); + /* create the contents of the algorithm specific public key fields in a separate packet */ + void make_s2k_params(pgp_packet_body_t &hbody); +#if defined(ENABLE_CRYPTO_REFRESH) uint8_t s2k_specifier_len(pgp_s2k_specifier_t specifier); +#endif } pgp_key_pkt_t; /* userid/userattr with all the corresponding signatures */