Skip to content

Commit 3cfb2a5

Browse files
committed
hide some of the 'new since 1.17' internal functions
1 parent a80d3c0 commit 3cfb2a5

2 files changed

Lines changed: 18 additions & 1 deletion

File tree

src/headers/tomcrypt_mac.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,11 +299,13 @@ int ocb3_decrypt_verify_memory(int cipher,
299299

300300
int ocb3_test(void);
301301

302+
#ifdef LTC_SOURCE
302303
/* internal helper functions */
303304
int ocb3_int_aad_add_block(ocb3_state *ocb, const unsigned char *aad_block);
304305
void ocb3_int_calc_offset_zero(ocb3_state *ocb, const unsigned char *nonce, unsigned long noncelen);
305306
int ocb3_int_ntz(unsigned long x);
306307
void ocb3_int_xor_blocks(unsigned char *out, const unsigned char *block_a, const unsigned char *block_b, unsigned long block_len);
308+
#endif /* LTC_SOURCE */
307309

308310
#endif /* LTC_OCB3_MODE */
309311

src/headers/tomcrypt_pk.h

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ enum {
2121
#define PK_MAX_RETRIES 20
2222

2323
int rand_prime(void *N, long len, prng_state *prng, int wprng);
24+
25+
#ifdef LTC_SOURCE
26+
/* internal helper functions */
2427
int rand_bn_bits(void *N, int bits, prng_state *prng, int wprng);
2528
int rand_bn_range(void *N, void *limit, prng_state *prng, int wprng);
2629

@@ -36,6 +39,7 @@ typedef struct Oid {
3639
} oid_st;
3740

3841
int pk_get_oid(int pk, oid_st *st);
42+
#endif /* LTC_SOURCE */
3943

4044
/* ---- RSA ---- */
4145
#ifdef LTC_MRSA
@@ -211,7 +215,7 @@ int dh_shared_secret(dh_key *private_key, dh_key *public_key,
211215
unsigned char *out, unsigned long *outlen);
212216

213217
#ifdef LTC_SOURCE
214-
/* INTERNAL ONLY - it should be later moved to src/headers/tomcrypt_internal.h */
218+
/* internal helper functions */
215219
int dh_check_pubkey(dh_key *key);
216220
#endif
217221

@@ -524,6 +528,9 @@ int der_decode_sequence_ex(const unsigned char *in, unsigned long inlen,
524528
int der_length_sequence(ltc_asn1_list *list, unsigned long inlen,
525529
unsigned long *outlen);
526530

531+
532+
#ifdef LTC_SOURCE
533+
/* internal helper functions */
527534
/* SUBJECT PUBLIC KEY INFO */
528535
int der_encode_subject_public_key_info(unsigned char *out, unsigned long *outlen,
529536
unsigned int algorithm, void* public_key, unsigned long public_key_len,
@@ -532,6 +539,7 @@ int der_encode_subject_public_key_info(unsigned char *out, unsigned long *outlen
532539
int der_decode_subject_public_key_info(const unsigned char *in, unsigned long inlen,
533540
unsigned int algorithm, void* public_key, unsigned long* public_key_len,
534541
unsigned long parameters_type, ltc_asn1_list* parameters, unsigned long parameters_len);
542+
#endif /* LTC_SOURCE */
535543

536544
/* SET */
537545
#define der_decode_set(in, inlen, list, outlen) der_decode_sequence_ex(in, inlen, list, outlen, 0)
@@ -609,8 +617,12 @@ int der_decode_teletex_string(const unsigned char *in, unsigned long inlen,
609617
unsigned char *out, unsigned long *outlen);
610618
int der_length_teletex_string(const unsigned char *octets, unsigned long noctets, unsigned long *outlen);
611619

620+
#ifdef LTC_SOURCE
621+
/* internal helper functions */
612622
int der_teletex_char_encode(int c);
613623
int der_teletex_value_decode(int v);
624+
#endif /* LTC_SOURCE */
625+
614626

615627
/* PRINTABLE STRING */
616628
int der_encode_printable_string(const unsigned char *in, unsigned long inlen,
@@ -642,7 +654,10 @@ int der_encode_utf8_string(const wchar_t *in, unsigned long inlen,
642654
int der_decode_utf8_string(const unsigned char *in, unsigned long inlen,
643655
wchar_t *out, unsigned long *outlen);
644656
unsigned long der_utf8_charsize(const wchar_t c);
657+
#ifdef LTC_SOURCE
658+
/* internal helper functions */
645659
int der_utf8_valid_char(const wchar_t c);
660+
#endif /* LTC_SOURCE */
646661
int der_length_utf8_string(const wchar_t *in, unsigned long noctets, unsigned long *outlen);
647662

648663

0 commit comments

Comments
 (0)