Skip to content

Commit 1c7e06b

Browse files
committed
Make some DER helpers private
Signed-off-by: Steffen Jaeckel <s@jaeckel.eu>
1 parent 53d601f commit 1c7e06b

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

src/headers/tomcrypt_pk.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -844,7 +844,6 @@ int der_encode_object_identifier(const unsigned long *words, unsigned long nwor
844844
int der_decode_object_identifier(const unsigned char *in, unsigned long inlen,
845845
unsigned long *words, unsigned long *outlen);
846846
int der_length_object_identifier(const unsigned long *words, unsigned long nwords, unsigned long *outlen);
847-
unsigned long der_object_identifier_bits(unsigned long x);
848847

849848
/* IA5 STRING */
850849
int der_encode_ia5_string(const unsigned char *in, unsigned long inlen,
@@ -853,9 +852,6 @@ int der_decode_ia5_string(const unsigned char *in, unsigned long inlen,
853852
unsigned char *out, unsigned long *outlen);
854853
int der_length_ia5_string(const unsigned char *octets, unsigned long noctets, unsigned long *outlen);
855854

856-
int der_ia5_char_encode(int c);
857-
int der_ia5_value_decode(int v);
858-
859855
/* TELETEX STRING */
860856
int der_decode_teletex_string(const unsigned char *in, unsigned long inlen,
861857
unsigned char *out, unsigned long *outlen);
@@ -868,9 +864,6 @@ int der_decode_printable_string(const unsigned char *in, unsigned long inlen,
868864
unsigned char *out, unsigned long *outlen);
869865
int der_length_printable_string(const unsigned char *octets, unsigned long noctets, unsigned long *outlen);
870866

871-
int der_printable_char_encode(int c);
872-
int der_printable_value_decode(int v);
873-
874867
/* UTF-8 */
875868
#if (defined(SIZE_MAX) || __STDC_VERSION__ >= 199901L || defined(WCHAR_MAX) || defined(__WCHAR_MAX__) || defined(_WCHAR_T) || defined(_WCHAR_T_DEFINED) || defined (__WCHAR_TYPE__)) && !defined(LTC_NO_WCHAR)
876869
#if defined(__WCHAR_MAX__)
@@ -890,7 +883,6 @@ int der_encode_utf8_string(const wchar_t *in, unsigned long inlen,
890883

891884
int der_decode_utf8_string(const unsigned char *in, unsigned long inlen,
892885
wchar_t *out, unsigned long *outlen);
893-
unsigned long der_utf8_charsize(const wchar_t c);
894886
int der_length_utf8_string(const wchar_t *in, unsigned long noctets, unsigned long *outlen);
895887

896888

src/headers/tomcrypt_private.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -584,6 +584,16 @@ int der_length_asn1_length(unsigned long len, unsigned long *outlen);
584584
int der_length_sequence_ex(const ltc_asn1_list *list, unsigned long inlen,
585585
unsigned long *outlen, unsigned long *payloadlen);
586586

587+
unsigned long der_object_identifier_bits(unsigned long x);
588+
589+
int der_ia5_char_encode(int c);
590+
int der_ia5_value_decode(int v);
591+
592+
int der_printable_char_encode(int c);
593+
int der_printable_value_decode(int v);
594+
595+
unsigned long der_utf8_charsize(const wchar_t c);
596+
587597
typedef struct {
588598
ltc_asn1_type t;
589599
ltc_asn1_list **pp;

0 commit comments

Comments
 (0)