Skip to content

Commit

Permalink
Put s2k_specifier_len under the corresponding define.
Browse files Browse the repository at this point in the history
  • Loading branch information
ni4 committed Aug 1, 2024
1 parent 0177167 commit 347de0c
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 2 deletions.
2 changes: 2 additions & 0 deletions src/librepgp/stream-key.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1175,6 +1175,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)
{
Expand All @@ -1190,6 +1191,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)
Expand Down
6 changes: 4 additions & 2 deletions src/librepgp/stream-key.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,11 @@ typedef struct pgp_key_pkt_t {

private:
/* create the contents of the algorithm specific public key fields in a separate packet */
void make_alg_spec_fields_for_public_key(pgp_packet_body_t &hbody);
void make_s2k_params(pgp_packet_body_t &hbody);
void make_alg_spec_fields_for_public_key(pgp_packet_body_t &hbody);
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 */
Expand Down

0 comments on commit 347de0c

Please sign in to comment.