Skip to content

Fix OID issues #430

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Sep 7, 2018
Merged

Fix OID issues #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
079ed04
add OID testcase from x.690
sjaeckel Jul 16, 2018
4ffdb91
fix der_decode_object_identifier()
sjaeckel Jul 16, 2018
6584569
add another OID testcase for root-node 3
sjaeckel Jul 16, 2018
2e9c80c
fix der_length_object_identifier()
sjaeckel Jul 16, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions src/pk/asn1/der/object_identifier/der_decode_object_identifier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,8 +71,13 @@ int der_decode_object_identifier(const unsigned char *in, unsigned long inle
y++;
} else {
if (y == 0) {
words[0] = t / 40;
words[1] = t % 40;
if (t <= 79) {
words[0] = t / 40;
words[1] = t % 40;
} else {
words[0] = 2;
words[1] = t - 80;
}
y = 2;
} else {
words[y++] = t;
Expand Down
4 changes: 2 additions & 2 deletions src/pk/asn1/der/object_identifier/der_length_object_identifier.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ int der_length_object_identifier(const unsigned long *words, unsigned long nword
return CRYPT_INVALID_ARG;
}

/* word1 = 0,1,2,3 and word2 0..39 */
if (words[0] > 3 || (words[0] < 2 && words[1] > 39)) {
/* word1 = 0,1,2 and word2 0..39 */
if (words[0] > 2 || (words[0] < 2 && words[1] > 39)) {
return CRYPT_INVALID_ARG;
}

Expand Down
30 changes: 30 additions & 0 deletions tests/der_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,34 @@ static void der_set_test(void)

*/

static void _der_oid_test(void)
{
static const unsigned char oid_x690_8_19_5_example[] = { 0x06, 0x03, 0x88, 0x37, 0x03 };
unsigned long len, oid[3];
unsigned char buf[64];

ltc_asn1_list *decoded_list, static_list[1];

len = sizeof(oid_x690_8_19_5_example);
DO(der_decode_sequence_flexi(oid_x690_8_19_5_example, &len, &decoded_list));

LTC_SET_ASN1(static_list, 0, LTC_ASN1_OBJECT_IDENTIFIER, (void *)decoded_list->data, decoded_list->size);
len = sizeof(buf);
DO(der_encode_object_identifier(decoded_list->data, decoded_list->size, buf, &len));
der_sequence_free(decoded_list);

DO(do_compare_testvector(buf, len, oid_x690_8_19_5_example, sizeof(oid_x690_8_19_5_example), "OID X6.90 Ch. 8.19.5 Example", 0));

oid[0] = 3;
oid[1] = 4;
oid[2] = 5;

len = sizeof(buf);
SHOULD_FAIL(der_encode_object_identifier(oid, 3, buf, &len));
len = sizeof(buf);
SHOULD_FAIL(der_length_object_identifier(oid, 3, &len));
}

static void der_flexi_test(void)
{
static const char printable_str[] = "printable";
Expand Down Expand Up @@ -1589,6 +1617,8 @@ int der_test(void)

der_cacert_test();

_der_oid_test();

y = 0xffffff00;
#if ULONG_MAX == ULLONG_MAX
y <<= 32;
Expand Down