diff options
Diffstat (limited to 'src/crypto/bytestring/ber.c')
| -rw-r--r-- | src/crypto/bytestring/ber.c | 68 |
1 files changed, 34 insertions, 34 deletions
diff --git a/src/crypto/bytestring/ber.c b/src/crypto/bytestring/ber.c index 54bac596..4dc94f6f 100644 --- a/src/crypto/bytestring/ber.c +++ b/src/crypto/bytestring/ber.c @@ -21,13 +21,13 @@ #include "../internal.h" -/* kMaxDepth is a just a sanity limit. The code should be such that the length - * of the input being processes always decreases. None the less, a very large - * input could otherwise cause the stack to overflow. */ +// kMaxDepth is a just a sanity limit. The code should be such that the length +// of the input being processes always decreases. None the less, a very large +// input could otherwise cause the stack to overflow. static const unsigned kMaxDepth = 2048; -/* is_string_type returns one if |tag| is a string type and zero otherwise. It - * ignores the constructed bit. */ +// is_string_type returns one if |tag| is a string type and zero otherwise. It +// ignores the constructed bit. static int is_string_type(unsigned tag) { if ((tag & 0xc0) != 0) { return 0; @@ -52,10 +52,10 @@ static int is_string_type(unsigned tag) { } } -/* cbs_find_ber walks an ASN.1 structure in |orig_in| and sets |*ber_found| - * depending on whether an indefinite length element or constructed string was - * found. The value of |orig_in| is not changed. It returns one on success (i.e. - * |*ber_found| was set) and zero on error. */ +// cbs_find_ber walks an ASN.1 structure in |orig_in| and sets |*ber_found| +// depending on whether an indefinite length element or constructed string was +// found. The value of |orig_in| is not changed. It returns one on success (i.e. +// |*ber_found| was set) and zero on error. static int cbs_find_ber(const CBS *orig_in, char *ber_found, unsigned depth) { CBS in; @@ -77,13 +77,13 @@ static int cbs_find_ber(const CBS *orig_in, char *ber_found, unsigned depth) { if (CBS_len(&contents) == header_len && header_len > 0 && CBS_data(&contents)[header_len-1] == 0x80) { - /* Found an indefinite-length element. */ + // Found an indefinite-length element. *ber_found = 1; return 1; } if (tag & CBS_ASN1_CONSTRUCTED) { if (is_string_type(tag)) { - /* Constructed strings are only legal in BER and require conversion. */ + // Constructed strings are only legal in BER and require conversion. *ber_found = 1; return 1; } @@ -97,20 +97,20 @@ static int cbs_find_ber(const CBS *orig_in, char *ber_found, unsigned depth) { return 1; } -/* is_eoc returns true if |header_len| and |contents|, as returned by - * |CBS_get_any_ber_asn1_element|, indicate an "end of contents" (EOC) value. */ +// is_eoc returns true if |header_len| and |contents|, as returned by +// |CBS_get_any_ber_asn1_element|, indicate an "end of contents" (EOC) value. static char is_eoc(size_t header_len, CBS *contents) { return header_len == 2 && CBS_len(contents) == 2 && OPENSSL_memcmp(CBS_data(contents), "\x00\x00", 2) == 0; } -/* cbs_convert_ber reads BER data from |in| and writes DER data to |out|. If - * |string_tag| is non-zero, then all elements must match |string_tag| up to the - * constructed bit and primitive element bodies are written to |out| without - * element headers. This is used when concatenating the fragments of a - * constructed string. If |looking_for_eoc| is set then any EOC elements found - * will cause the function to return after consuming it. It returns one on - * success and zero on error. */ +// cbs_convert_ber reads BER data from |in| and writes DER data to |out|. If +// |string_tag| is non-zero, then all elements must match |string_tag| up to the +// constructed bit and primitive element bodies are written to |out| without +// element headers. This is used when concatenating the fragments of a +// constructed string. If |looking_for_eoc| is set then any EOC elements found +// will cause the function to return after consuming it. It returns one on +// success and zero on error. static int cbs_convert_ber(CBS *in, CBB *out, unsigned string_tag, char looking_for_eoc, unsigned depth) { assert(!(string_tag & CBS_ASN1_CONSTRUCTED)); @@ -134,9 +134,9 @@ static int cbs_convert_ber(CBS *in, CBB *out, unsigned string_tag, } if (string_tag != 0) { - /* This is part of a constructed string. All elements must match - * |string_tag| up to the constructed bit and get appended to |out| - * without a child element. */ + // This is part of a constructed string. All elements must match + // |string_tag| up to the constructed bit and get appended to |out| + // without a child element. if ((tag & ~CBS_ASN1_CONSTRUCTED) != string_tag) { return 0; } @@ -144,8 +144,8 @@ static int cbs_convert_ber(CBS *in, CBB *out, unsigned string_tag, } else { unsigned out_tag = tag; if ((tag & CBS_ASN1_CONSTRUCTED) && is_string_type(tag)) { - /* If a constructed string, clear the constructed bit and inform - * children to concatenate bodies. */ + // If a constructed string, clear the constructed bit and inform + // children to concatenate bodies. out_tag &= ~CBS_ASN1_CONSTRUCTED; child_string_tag = out_tag; } @@ -157,7 +157,7 @@ static int cbs_convert_ber(CBS *in, CBB *out, unsigned string_tag, if (CBS_len(&contents) == header_len && header_len > 0 && CBS_data(&contents)[header_len - 1] == 0x80) { - /* This is an indefinite length element. */ + // This is an indefinite length element. if (!cbs_convert_ber(in, out_contents, child_string_tag, 1 /* looking for eoc */, depth + 1) || !CBB_flush(out)) { @@ -171,13 +171,13 @@ static int cbs_convert_ber(CBS *in, CBB *out, unsigned string_tag, } if (tag & CBS_ASN1_CONSTRUCTED) { - /* Recurse into children. */ + // Recurse into children. if (!cbs_convert_ber(&contents, out_contents, child_string_tag, 0 /* not looking for eoc */, depth + 1)) { return 0; } } else { - /* Copy primitive contents as-is. */ + // Copy primitive contents as-is. if (!CBB_add_bytes(out_contents, CBS_data(&contents), CBS_len(&contents))) { return 0; @@ -195,8 +195,8 @@ static int cbs_convert_ber(CBS *in, CBB *out, unsigned string_tag, int CBS_asn1_ber_to_der(CBS *in, uint8_t **out, size_t *out_len) { CBB cbb; - /* First, do a quick walk to find any indefinite-length elements. Most of the - * time we hope that there aren't any and thus we can quickly return. */ + // First, do a quick walk to find any indefinite-length elements. Most of the + // time we hope that there aren't any and thus we can quickly return. char conversion_needed; if (!cbs_find_ber(in, &conversion_needed, 0)) { return 0; @@ -225,14 +225,14 @@ int CBS_get_asn1_implicit_string(CBS *in, CBS *out, uint8_t **out_storage, assert(is_string_type(inner_tag)); if (CBS_peek_asn1_tag(in, outer_tag)) { - /* Normal implicitly-tagged string. */ + // Normal implicitly-tagged string. *out_storage = NULL; return CBS_get_asn1(in, out, outer_tag); } - /* Otherwise, try to parse an implicitly-tagged constructed string. - * |CBS_asn1_ber_to_der| is assumed to have run, so only allow one level deep - * of nesting. */ + // Otherwise, try to parse an implicitly-tagged constructed string. + // |CBS_asn1_ber_to_der| is assumed to have run, so only allow one level deep + // of nesting. CBB result; CBS child; if (!CBB_init(&result, CBS_len(in)) || |