hide some of the 'new since 1.17' internal functions

This commit is contained in:
Steffen Jaeckel 2017-06-23 14:14:05 +02:00
parent a80d3c00a8
commit 3cfb2a5e2e
2 changed files with 18 additions and 1 deletions

View File

@ -299,11 +299,13 @@ int ocb3_decrypt_verify_memory(int cipher,
int ocb3_test(void); int ocb3_test(void);
#ifdef LTC_SOURCE
/* internal helper functions */ /* internal helper functions */
int ocb3_int_aad_add_block(ocb3_state *ocb, const unsigned char *aad_block); int ocb3_int_aad_add_block(ocb3_state *ocb, const unsigned char *aad_block);
void ocb3_int_calc_offset_zero(ocb3_state *ocb, const unsigned char *nonce, unsigned long noncelen); void ocb3_int_calc_offset_zero(ocb3_state *ocb, const unsigned char *nonce, unsigned long noncelen);
int ocb3_int_ntz(unsigned long x); int ocb3_int_ntz(unsigned long x);
void ocb3_int_xor_blocks(unsigned char *out, const unsigned char *block_a, const unsigned char *block_b, unsigned long block_len); void ocb3_int_xor_blocks(unsigned char *out, const unsigned char *block_a, const unsigned char *block_b, unsigned long block_len);
#endif /* LTC_SOURCE */
#endif /* LTC_OCB3_MODE */ #endif /* LTC_OCB3_MODE */

View File

@ -21,6 +21,9 @@ enum {
#define PK_MAX_RETRIES 20 #define PK_MAX_RETRIES 20
int rand_prime(void *N, long len, prng_state *prng, int wprng); int rand_prime(void *N, long len, prng_state *prng, int wprng);
#ifdef LTC_SOURCE
/* internal helper functions */
int rand_bn_bits(void *N, int bits, prng_state *prng, int wprng); int rand_bn_bits(void *N, int bits, prng_state *prng, int wprng);
int rand_bn_range(void *N, void *limit, prng_state *prng, int wprng); int rand_bn_range(void *N, void *limit, prng_state *prng, int wprng);
@ -36,6 +39,7 @@ typedef struct Oid {
} oid_st; } oid_st;
int pk_get_oid(int pk, oid_st *st); int pk_get_oid(int pk, oid_st *st);
#endif /* LTC_SOURCE */
/* ---- RSA ---- */ /* ---- RSA ---- */
#ifdef LTC_MRSA #ifdef LTC_MRSA
@ -211,7 +215,7 @@ int dh_shared_secret(dh_key *private_key, dh_key *public_key,
unsigned char *out, unsigned long *outlen); unsigned char *out, unsigned long *outlen);
#ifdef LTC_SOURCE #ifdef LTC_SOURCE
/* INTERNAL ONLY - it should be later moved to src/headers/tomcrypt_internal.h */ /* internal helper functions */
int dh_check_pubkey(dh_key *key); int dh_check_pubkey(dh_key *key);
#endif #endif
@ -524,6 +528,9 @@ int der_decode_sequence_ex(const unsigned char *in, unsigned long inlen,
int der_length_sequence(ltc_asn1_list *list, unsigned long inlen, int der_length_sequence(ltc_asn1_list *list, unsigned long inlen,
unsigned long *outlen); unsigned long *outlen);
#ifdef LTC_SOURCE
/* internal helper functions */
/* SUBJECT PUBLIC KEY INFO */ /* SUBJECT PUBLIC KEY INFO */
int der_encode_subject_public_key_info(unsigned char *out, unsigned long *outlen, int der_encode_subject_public_key_info(unsigned char *out, unsigned long *outlen,
unsigned int algorithm, void* public_key, unsigned long public_key_len, 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
int der_decode_subject_public_key_info(const unsigned char *in, unsigned long inlen, int der_decode_subject_public_key_info(const unsigned char *in, unsigned long inlen,
unsigned int algorithm, void* public_key, unsigned long* public_key_len, unsigned int algorithm, void* public_key, unsigned long* public_key_len,
unsigned long parameters_type, ltc_asn1_list* parameters, unsigned long parameters_len); unsigned long parameters_type, ltc_asn1_list* parameters, unsigned long parameters_len);
#endif /* LTC_SOURCE */
/* SET */ /* SET */
#define der_decode_set(in, inlen, list, outlen) der_decode_sequence_ex(in, inlen, list, outlen, 0) #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,
unsigned char *out, unsigned long *outlen); unsigned char *out, unsigned long *outlen);
int der_length_teletex_string(const unsigned char *octets, unsigned long noctets, unsigned long *outlen); int der_length_teletex_string(const unsigned char *octets, unsigned long noctets, unsigned long *outlen);
#ifdef LTC_SOURCE
/* internal helper functions */
int der_teletex_char_encode(int c); int der_teletex_char_encode(int c);
int der_teletex_value_decode(int v); int der_teletex_value_decode(int v);
#endif /* LTC_SOURCE */
/* PRINTABLE STRING */ /* PRINTABLE STRING */
int der_encode_printable_string(const unsigned char *in, unsigned long inlen, 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,
int der_decode_utf8_string(const unsigned char *in, unsigned long inlen, int der_decode_utf8_string(const unsigned char *in, unsigned long inlen,
wchar_t *out, unsigned long *outlen); wchar_t *out, unsigned long *outlen);
unsigned long der_utf8_charsize(const wchar_t c); unsigned long der_utf8_charsize(const wchar_t c);
#ifdef LTC_SOURCE
/* internal helper functions */
int der_utf8_valid_char(const wchar_t c); int der_utf8_valid_char(const wchar_t c);
#endif /* LTC_SOURCE */
int der_length_utf8_string(const wchar_t *in, unsigned long noctets, unsigned long *outlen); int der_length_utf8_string(const wchar_t *in, unsigned long noctets, unsigned long *outlen);