Convert bytestring_test to C++.
Change-Id: Id3e6183da3ae328b562ec5413151256cf6071ffc
Reviewed-on: https://boringssl-review.googlesource.com/4140
Reviewed-by: Adam Langley <agl@google.com>
diff --git a/crypto/bytestring/CMakeLists.txt b/crypto/bytestring/CMakeLists.txt
index 8d6be7b..d1f0441 100644
--- a/crypto/bytestring/CMakeLists.txt
+++ b/crypto/bytestring/CMakeLists.txt
@@ -13,7 +13,7 @@
add_executable(
bytestring_test
- bytestring_test.c
+ bytestring_test.cc
)
target_link_libraries(bytestring_test crypto)
diff --git a/crypto/bytestring/bytestring_test.c b/crypto/bytestring/bytestring_test.cc
similarity index 66%
rename from crypto/bytestring/bytestring_test.c
rename to crypto/bytestring/bytestring_test.cc
index cd0155e..ca3d835 100644
--- a/crypto/bytestring/bytestring_test.c
+++ b/crypto/bytestring/bytestring_test.cc
@@ -16,14 +16,17 @@
#include <stdlib.h>
#include <string.h>
+#include <vector>
+
#include <openssl/crypto.h>
#include <openssl/bytestring.h>
#include "internal.h"
#include "../internal.h"
+#include "../test/scoped_types.h"
-static int test_skip(void) {
+static bool TestSkip() {
static const uint8_t kData[] = {1, 2, 3};
CBS data;
@@ -36,7 +39,7 @@
!CBS_skip(&data, 1);
}
-static int test_get_u(void) {
+static bool TestGetUint() {
static const uint8_t kData[] = {1, 2, 3, 4, 5, 6, 7, 8, 9, 10};
uint8_t u8;
uint16_t u16;
@@ -55,7 +58,7 @@
!CBS_get_u8(&data, &u8);
}
-static int test_get_prefixed(void) {
+static bool TestGetPrefixed() {
static const uint8_t kData[] = {1, 2, 0, 2, 3, 4, 0, 0, 3, 3, 2, 1};
uint8_t u8;
uint16_t u16;
@@ -77,7 +80,7 @@
u32 == 0x30201;
}
-static int test_get_prefixed_bad(void) {
+static bool TestGetPrefixedBad() {
static const uint8_t kData1[] = {2, 1};
static const uint8_t kData2[] = {0, 2, 1};
static const uint8_t kData3[] = {0, 0, 2, 1};
@@ -85,23 +88,23 @@
CBS_init(&data, kData1, sizeof(kData1));
if (CBS_get_u8_length_prefixed(&data, &prefixed)) {
- return 0;
+ return false;
}
CBS_init(&data, kData2, sizeof(kData2));
if (CBS_get_u16_length_prefixed(&data, &prefixed)) {
- return 0;
+ return false;
}
CBS_init(&data, kData3, sizeof(kData3));
if (CBS_get_u24_length_prefixed(&data, &prefixed)) {
- return 0;
+ return false;
}
- return 1;
+ return true;
}
-static int test_get_asn1(void) {
+static bool TestGetASN1() {
static const uint8_t kData1[] = {0x30, 2, 1, 2};
static const uint8_t kData2[] = {0x30, 3, 1, 2};
static const uint8_t kData3[] = {0x30, 0x80};
@@ -119,52 +122,52 @@
CBS_init(&data, kData1, sizeof(kData1));
if (CBS_peek_asn1_tag(&data, 0x1) ||
!CBS_peek_asn1_tag(&data, 0x30)) {
- return 0;
+ return false;
}
if (!CBS_get_asn1(&data, &contents, 0x30) ||
CBS_len(&contents) != 2 ||
memcmp(CBS_data(&contents), "\x01\x02", 2) != 0) {
- return 0;
+ return false;
}
CBS_init(&data, kData2, sizeof(kData2));
- /* data is truncated */
+ // data is truncated
if (CBS_get_asn1(&data, &contents, 0x30)) {
- return 0;
+ return false;
}
CBS_init(&data, kData3, sizeof(kData3));
- /* zero byte length of length */
+ // zero byte length of length
if (CBS_get_asn1(&data, &contents, 0x30)) {
- return 0;
+ return false;
}
CBS_init(&data, kData4, sizeof(kData4));
- /* long form mistakenly used. */
+ // long form mistakenly used.
if (CBS_get_asn1(&data, &contents, 0x30)) {
- return 0;
+ return false;
}
CBS_init(&data, kData5, sizeof(kData5));
- /* length takes too many bytes. */
+ // length takes too many bytes.
if (CBS_get_asn1(&data, &contents, 0x30)) {
- return 0;
+ return false;
}
CBS_init(&data, kData1, sizeof(kData1));
- /* wrong tag. */
+ // wrong tag.
if (CBS_get_asn1(&data, &contents, 0x31)) {
- return 0;
+ return false;
}
CBS_init(&data, NULL, 0);
- /* peek at empty data. */
+ // peek at empty data.
if (CBS_peek_asn1_tag(&data, 0x30)) {
- return 0;
+ return false;
}
CBS_init(&data, NULL, 0);
- /* optional elements at empty data. */
+ // optional elements at empty data.
if (!CBS_get_optional_asn1(&data, &contents, &present, 0xa0) ||
present ||
!CBS_get_optional_asn1_octet_string(&data, &contents, &present, 0xa0) ||
@@ -174,22 +177,22 @@
CBS_len(&contents) != 0 ||
!CBS_get_optional_asn1_uint64(&data, &value, 0xa0, 42) ||
value != 42) {
- return 0;
+ return false;
}
CBS_init(&data, kData6, sizeof(kData6));
- /* optional element. */
+ // optional element.
if (!CBS_get_optional_asn1(&data, &contents, &present, 0xa0) ||
present ||
!CBS_get_optional_asn1(&data, &contents, &present, 0xa1) ||
!present ||
CBS_len(&contents) != 3 ||
memcmp(CBS_data(&contents), "\x04\x01\x01", 3) != 0) {
- return 0;
+ return false;
}
CBS_init(&data, kData6, sizeof(kData6));
- /* optional octet string. */
+ // optional octet string.
if (!CBS_get_optional_asn1_octet_string(&data, &contents, &present, 0xa0) ||
present ||
CBS_len(&contents) != 0 ||
@@ -197,97 +200,96 @@
!present ||
CBS_len(&contents) != 1 ||
CBS_data(&contents)[0] != 1) {
- return 0;
+ return false;
}
CBS_init(&data, kData7, sizeof(kData7));
- /* invalid optional octet string. */
+ // invalid optional octet string.
if (CBS_get_optional_asn1_octet_string(&data, &contents, &present, 0xa1)) {
- return 0;
+ return false;
}
CBS_init(&data, kData8, sizeof(kData8));
- /* optional octet string. */
+ // optional octet string.
if (!CBS_get_optional_asn1_uint64(&data, &value, 0xa0, 42) ||
value != 42 ||
!CBS_get_optional_asn1_uint64(&data, &value, 0xa1, 42) ||
value != 1) {
- return 0;
+ return false;
}
CBS_init(&data, kData9, sizeof(kData9));
- /* invalid optional integer. */
+ // invalid optional integer.
if (CBS_get_optional_asn1_uint64(&data, &value, 0xa1, 42)) {
- return 0;
+ return false;
}
- return 1;
+ return true;
}
-static int test_get_optional_asn1_bool(void) {
- CBS data;
- int val;
-
+static bool TestGetOptionalASN1Bool() {
static const uint8_t kTrue[] = {0x0a, 3, CBS_ASN1_BOOLEAN, 1, 0xff};
static const uint8_t kFalse[] = {0x0a, 3, CBS_ASN1_BOOLEAN, 1, 0x00};
static const uint8_t kInvalid[] = {0x0a, 3, CBS_ASN1_BOOLEAN, 1, 0x01};
+ CBS data;
CBS_init(&data, NULL, 0);
- val = 2;
+ int val = 2;
if (!CBS_get_optional_asn1_bool(&data, &val, 0x0a, 0) ||
val != 0) {
- return 0;
+ return false;
}
CBS_init(&data, kTrue, sizeof(kTrue));
val = 2;
if (!CBS_get_optional_asn1_bool(&data, &val, 0x0a, 0) ||
val != 1) {
- return 0;
+ return false;
}
CBS_init(&data, kFalse, sizeof(kFalse));
val = 2;
if (!CBS_get_optional_asn1_bool(&data, &val, 0x0a, 1) ||
val != 0) {
- return 0;
+ return false;
}
CBS_init(&data, kInvalid, sizeof(kInvalid));
if (CBS_get_optional_asn1_bool(&data, &val, 0x0a, 1)) {
- return 0;
+ return false;
}
- return 1;
+ return true;
}
-static int test_cbb_basic(void) {
+static bool TestCBBBasic() {
static const uint8_t kExpected[] = {1, 2, 3, 4, 5, 6, 7, 8};
uint8_t *buf;
size_t buf_len;
- int ok;
CBB cbb;
if (!CBB_init(&cbb, 100)) {
- return 0;
+ return false;
}
CBB_cleanup(&cbb);
- if (!CBB_init(&cbb, 0) ||
- !CBB_add_u8(&cbb, 1) ||
+ if (!CBB_init(&cbb, 0)) {
+ return false;
+ }
+ if (!CBB_add_u8(&cbb, 1) ||
!CBB_add_u16(&cbb, 0x203) ||
!CBB_add_u24(&cbb, 0x40506) ||
!CBB_add_bytes(&cbb, (const uint8_t*) "\x07\x08", 2) ||
!CBB_finish(&cbb, &buf, &buf_len)) {
- return 0;
+ CBB_cleanup(&cbb);
+ return false;
}
- ok = buf_len == sizeof(kExpected) && memcmp(buf, kExpected, buf_len) == 0;
- free(buf);
- return ok;
+ ScopedOpenSSLBytes scoper(buf);
+ return buf_len == sizeof(kExpected) && memcmp(buf, kExpected, buf_len) == 0;
}
-static int test_cbb_fixed(void) {
+static bool TestCBBFixed() {
CBB cbb;
uint8_t buf[1];
uint8_t *out_buf;
@@ -298,7 +300,7 @@
!CBB_finish(&cbb, &out_buf, &out_size) ||
out_buf != NULL ||
out_size != 0) {
- return 0;
+ return false;
}
if (!CBB_init_fixed(&cbb, buf, 1) ||
@@ -308,40 +310,41 @@
out_buf != buf ||
out_size != 1 ||
buf[0] != 1) {
- return 0;
+ return false;
}
- return 1;
+ return true;
}
-static int test_cbb_finish_child(void) {
+static bool TestCBBFinishChild() {
CBB cbb, child;
uint8_t *out_buf;
size_t out_size;
- if (!CBB_init(&cbb, 16) ||
- !CBB_add_u8_length_prefixed(&cbb, &child) ||
- CBB_finish(&child, &out_buf, &out_size) ||
- !CBB_finish(&cbb, &out_buf, &out_size) ||
- out_size != 1 ||
- out_buf[0] != 0) {
- return 0;
+ if (!CBB_init(&cbb, 16)) {
+ return false;
}
-
- free(out_buf);
- return 1;
+ if (!CBB_add_u8_length_prefixed(&cbb, &child) ||
+ CBB_finish(&child, &out_buf, &out_size) ||
+ !CBB_finish(&cbb, &out_buf, &out_size)) {
+ CBB_cleanup(&cbb);
+ return false;
+ }
+ ScopedOpenSSLBytes scoper(out_buf);
+ return out_size == 1 && out_buf[0] == 0;
}
-static int test_cbb_prefixed(void) {
+static bool TestCBBPrefixed() {
static const uint8_t kExpected[] = {0, 1, 1, 0, 2, 2, 3, 0, 0, 3,
4, 5, 6, 5, 4, 1, 0, 1, 2};
uint8_t *buf;
size_t buf_len;
CBB cbb, contents, inner_contents, inner_inner_contents;
- int ok;
- if (!CBB_init(&cbb, 0) ||
- !CBB_add_u8_length_prefixed(&cbb, &contents) ||
+ if (!CBB_init(&cbb, 0)) {
+ return false;
+ }
+ if (!CBB_add_u8_length_prefixed(&cbb, &contents) ||
!CBB_add_u8_length_prefixed(&cbb, &contents) ||
!CBB_add_u8(&contents, 1) ||
!CBB_add_u16_length_prefixed(&cbb, &contents) ||
@@ -354,28 +357,31 @@
!CBB_add_u16_length_prefixed(&inner_contents, &inner_inner_contents) ||
!CBB_add_u8(&inner_inner_contents, 2) ||
!CBB_finish(&cbb, &buf, &buf_len)) {
- return 0;
+ CBB_cleanup(&cbb);
+ return false;
}
- ok = buf_len == sizeof(kExpected) && memcmp(buf, kExpected, buf_len) == 0;
- free(buf);
- return ok;
+ ScopedOpenSSLBytes scoper(buf);
+ return buf_len == sizeof(kExpected) && memcmp(buf, kExpected, buf_len) == 0;
}
-static int test_cbb_misuse(void) {
+static bool TestCBBMisuse() {
CBB cbb, child, contents;
uint8_t *buf;
size_t buf_len;
- if (!CBB_init(&cbb, 0) ||
- !CBB_add_u8_length_prefixed(&cbb, &child) ||
+ if (!CBB_init(&cbb, 0)) {
+ return false;
+ }
+ if (!CBB_add_u8_length_prefixed(&cbb, &child) ||
!CBB_add_u8(&child, 1) ||
!CBB_add_u8(&cbb, 2)) {
- return 0;
+ CBB_cleanup(&cbb);
+ return false;
}
- /* Since we wrote to |cbb|, |child| is now invalid and attempts to write to
- * it should fail. */
+ // Since we wrote to |cbb|, |child| is now invalid and attempts to write to
+ // it should fail.
if (CBB_add_u8(&child, 1) ||
CBB_add_u16(&child, 1) ||
CBB_add_u24(&child, 1) ||
@@ -384,91 +390,104 @@
CBB_add_asn1(&child, &contents, 1) ||
CBB_add_bytes(&child, (const uint8_t*) "a", 1)) {
fprintf(stderr, "CBB operation on invalid CBB did not fail.\n");
- return 0;
+ CBB_cleanup(&cbb);
+ return false;
}
- if (!CBB_finish(&cbb, &buf, &buf_len) ||
- buf_len != 3 ||
+ if (!CBB_finish(&cbb, &buf, &buf_len)) {
+ CBB_cleanup(&cbb);
+ return false;
+ }
+ ScopedOpenSSLBytes scoper(buf);
+
+ if (buf_len != 3 ||
memcmp(buf, "\x01\x01\x02", 3) != 0) {
- return 0;
+ return false;
}
-
- free(buf);
-
- return 1;
+ return true;
}
-static int test_cbb_asn1(void) {
+static bool TestCBBASN1() {
static const uint8_t kExpected[] = {0x30, 3, 1, 2, 3};
- uint8_t *buf, *test_data;
+ uint8_t *buf;
size_t buf_len;
CBB cbb, contents, inner_contents;
- if (!CBB_init(&cbb, 0) ||
- !CBB_add_asn1(&cbb, &contents, 0x30) ||
+ if (!CBB_init(&cbb, 0)) {
+ return false;
+ }
+ if (!CBB_add_asn1(&cbb, &contents, 0x30) ||
!CBB_add_bytes(&contents, (const uint8_t*) "\x01\x02\x03", 3) ||
!CBB_finish(&cbb, &buf, &buf_len)) {
- return 0;
+ CBB_cleanup(&cbb);
+ return false;
}
+ ScopedOpenSSLBytes scoper(buf);
if (buf_len != sizeof(kExpected) || memcmp(buf, kExpected, buf_len) != 0) {
- return 0;
+ return false;
}
- free(buf);
- test_data = malloc(100000);
- memset(test_data, 0x42, 100000);
+ std::vector<uint8_t> test_data(100000, 0x42);
- if (!CBB_init(&cbb, 0) ||
- !CBB_add_asn1(&cbb, &contents, 0x30) ||
- !CBB_add_bytes(&contents, test_data, 130) ||
+ if (!CBB_init(&cbb, 0)) {
+ return false;
+ }
+ if (!CBB_add_asn1(&cbb, &contents, 0x30) ||
+ !CBB_add_bytes(&contents, bssl::vector_data(&test_data), 130) ||
!CBB_finish(&cbb, &buf, &buf_len)) {
- return 0;
+ CBB_cleanup(&cbb);
+ return false;
}
+ scoper.reset(buf);
if (buf_len != 3 + 130 ||
memcmp(buf, "\x30\x81\x82", 3) != 0 ||
- memcmp(buf + 3, test_data, 130) != 0) {
- return 0;
+ memcmp(buf + 3, bssl::vector_data(&test_data), 130) != 0) {
+ return false;
}
- free(buf);
- if (!CBB_init(&cbb, 0) ||
- !CBB_add_asn1(&cbb, &contents, 0x30) ||
- !CBB_add_bytes(&contents, test_data, 1000) ||
- !CBB_finish(&cbb, &buf, &buf_len)) {
- return 0;
+ if (!CBB_init(&cbb, 0)) {
+ return false;
}
+ if (!CBB_add_asn1(&cbb, &contents, 0x30) ||
+ !CBB_add_bytes(&contents, bssl::vector_data(&test_data), 1000) ||
+ !CBB_finish(&cbb, &buf, &buf_len)) {
+ CBB_cleanup(&cbb);
+ return false;
+ }
+ scoper.reset(buf);
if (buf_len != 4 + 1000 ||
memcmp(buf, "\x30\x82\x03\xe8", 4) != 0 ||
- memcmp(buf + 4, test_data, 1000)) {
- return 0;
+ memcmp(buf + 4, bssl::vector_data(&test_data), 1000)) {
+ return false;
}
- free(buf);
- if (!CBB_init(&cbb, 0) ||
- !CBB_add_asn1(&cbb, &contents, 0x30) ||
- !CBB_add_asn1(&contents, &inner_contents, 0x30) ||
- !CBB_add_bytes(&inner_contents, test_data, 100000) ||
- !CBB_finish(&cbb, &buf, &buf_len)) {
- return 0;
+ if (!CBB_init(&cbb, 0)) {
+ return false;
}
+ if (!CBB_add_asn1(&cbb, &contents, 0x30) ||
+ !CBB_add_asn1(&contents, &inner_contents, 0x30) ||
+ !CBB_add_bytes(&inner_contents, bssl::vector_data(&test_data), 100000) ||
+ !CBB_finish(&cbb, &buf, &buf_len)) {
+ CBB_cleanup(&cbb);
+ return false;
+ }
+ scoper.reset(buf);
if (buf_len != 5 + 5 + 100000 ||
memcmp(buf, "\x30\x83\x01\x86\xa5\x30\x83\x01\x86\xa0", 10) != 0 ||
- memcmp(buf + 10, test_data, 100000)) {
- return 0;
+ memcmp(buf + 10, bssl::vector_data(&test_data), 100000)) {
+ return false;
}
- free(buf);
- free(test_data);
- return 1;
+ return true;
}
-static int do_ber_convert(const char *name,
- const uint8_t *der_expected, size_t der_len,
- const uint8_t *ber, size_t ber_len) {
+static bool DoBerConvert(const char *name,
+ const uint8_t *der_expected, size_t der_len,
+ const uint8_t *ber, size_t ber_len) {
CBS in;
uint8_t *out;
size_t out_len;
@@ -476,44 +495,44 @@
CBS_init(&in, ber, ber_len);
if (!CBS_asn1_ber_to_der(&in, &out, &out_len)) {
fprintf(stderr, "%s: CBS_asn1_ber_to_der failed.\n", name);
- return 0;
+ return false;
}
+ ScopedOpenSSLBytes scoper(out);
if (out == NULL) {
if (ber_len != der_len ||
memcmp(der_expected, ber, ber_len) != 0) {
fprintf(stderr, "%s: incorrect unconverted result.\n", name);
- return 0;
+ return false;
}
- return 1;
+ return true;
}
if (out_len != der_len ||
memcmp(out, der_expected, der_len) != 0) {
fprintf(stderr, "%s: incorrect converted result.\n", name);
- return 0;
+ return false;
}
- free(out);
- return 1;
+ return true;
}
-static int test_ber_convert(void) {
+static bool TestBerConvert() {
static const uint8_t kSimpleBER[] = {0x01, 0x01, 0x00};
- /* kIndefBER contains a SEQUENCE with an indefinite length. */
+ // kIndefBER contains a SEQUENCE with an indefinite length.
static const uint8_t kIndefBER[] = {0x30, 0x80, 0x01, 0x01, 0x02, 0x00, 0x00};
static const uint8_t kIndefDER[] = {0x30, 0x03, 0x01, 0x01, 0x02};
- /* kOctetStringBER contains an indefinite length OCTETSTRING with two parts.
- * These parts need to be concatenated in DER form. */
+ // kOctetStringBER contains an indefinite length OCTETSTRING with two parts.
+ // These parts need to be concatenated in DER form.
static const uint8_t kOctetStringBER[] = {0x24, 0x80, 0x04, 0x02, 0, 1,
0x04, 0x02, 2, 3, 0x00, 0x00};
static const uint8_t kOctetStringDER[] = {0x04, 0x04, 0, 1, 2, 3};
- /* kNSSBER is part of a PKCS#12 message generated by NSS that uses indefinite
- * length elements extensively. */
+ // kNSSBER is part of a PKCS#12 message generated by NSS that uses indefinite
+ // length elements extensively.
static const uint8_t kNSSBER[] = {
0x30, 0x80, 0x02, 0x01, 0x03, 0x30, 0x80, 0x06, 0x09, 0x2a, 0x86, 0x48,
0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x80, 0x24, 0x80, 0x04, 0x04,
@@ -536,56 +555,55 @@
0x6e, 0x10, 0x9b, 0xb8, 0x02, 0x02, 0x07, 0xd0,
};
- return do_ber_convert("kSimpleBER", kSimpleBER, sizeof(kSimpleBER),
- kSimpleBER, sizeof(kSimpleBER)) &&
- do_ber_convert("kIndefBER", kIndefDER, sizeof(kIndefDER), kIndefBER,
- sizeof(kIndefBER)) &&
- do_ber_convert("kOctetStringBER", kOctetStringDER,
- sizeof(kOctetStringDER), kOctetStringBER,
- sizeof(kOctetStringBER)) &&
- do_ber_convert("kNSSBER", kNSSDER, sizeof(kNSSDER), kNSSBER,
- sizeof(kNSSBER));
+ return DoBerConvert("kSimpleBER", kSimpleBER, sizeof(kSimpleBER),
+ kSimpleBER, sizeof(kSimpleBER)) &&
+ DoBerConvert("kIndefBER", kIndefDER, sizeof(kIndefDER), kIndefBER,
+ sizeof(kIndefBER)) &&
+ DoBerConvert("kOctetStringBER", kOctetStringDER,
+ sizeof(kOctetStringDER), kOctetStringBER,
+ sizeof(kOctetStringBER)) &&
+ DoBerConvert("kNSSBER", kNSSDER, sizeof(kNSSDER), kNSSBER,
+ sizeof(kNSSBER));
}
-typedef struct {
+struct ASN1Uint64Test {
uint64_t value;
const char *encoding;
size_t encoding_len;
-} ASN1_UINT64_TEST;
-
-static const ASN1_UINT64_TEST kAsn1Uint64Tests[] = {
- {0, "\x02\x01\x00", 3},
- {1, "\x02\x01\x01", 3},
- {127, "\x02\x01\x7f", 3},
- {128, "\x02\x02\x00\x80", 4},
- {0xdeadbeef, "\x02\x05\x00\xde\xad\xbe\xef", 7},
- {OPENSSL_U64(0x0102030405060708),
- "\x02\x08\x01\x02\x03\x04\x05\x06\x07\x08", 10},
- {OPENSSL_U64(0xffffffffffffffff),
- "\x02\x09\x00\xff\xff\xff\xff\xff\xff\xff\xff", 11},
};
-typedef struct {
+static const ASN1Uint64Test kASN1Uint64Tests[] = {
+ {0, "\x02\x01\x00", 3},
+ {1, "\x02\x01\x01", 3},
+ {127, "\x02\x01\x7f", 3},
+ {128, "\x02\x02\x00\x80", 4},
+ {0xdeadbeef, "\x02\x05\x00\xde\xad\xbe\xef", 7},
+ {OPENSSL_U64(0x0102030405060708),
+ "\x02\x08\x01\x02\x03\x04\x05\x06\x07\x08", 10},
+ {OPENSSL_U64(0xffffffffffffffff),
+ "\x02\x09\x00\xff\xff\xff\xff\xff\xff\xff\xff", 11},
+};
+
+struct ASN1InvalidUint64Test {
const char *encoding;
size_t encoding_len;
-} ASN1_INVALID_UINT64_TEST;
-
-static const ASN1_INVALID_UINT64_TEST kAsn1InvalidUint64Tests[] = {
- /* Bad tag. */
- {"\x03\x01\x00", 3},
- /* Empty contents. */
- {"\x02\x00", 2},
- /* Negative number. */
- {"\x02\x01\x80", 3},
- /* Overflow */
- {"\x02\x09\x01\x00\x00\x00\x00\x00\x00\x00\x00", 11},
};
-static int test_asn1_uint64(void) {
- size_t i;
+static const ASN1InvalidUint64Test kASN1InvalidUint64Tests[] = {
+ // Bad tag.
+ {"\x03\x01\x00", 3},
+ // Empty contents.
+ {"\x02\x00", 2},
+ // Negative number.
+ {"\x02\x01\x80", 3},
+ // Overflow
+ {"\x02\x09\x01\x00\x00\x00\x00\x00\x00\x00\x00", 11},
+};
- for (i = 0; i < sizeof(kAsn1Uint64Tests) / sizeof(kAsn1Uint64Tests[0]); i++) {
- const ASN1_UINT64_TEST *test = &kAsn1Uint64Tests[i];
+static bool TestASN1Uint64() {
+ for (size_t i = 0; i < sizeof(kASN1Uint64Tests) / sizeof(kASN1Uint64Tests[0]);
+ i++) {
+ const ASN1Uint64Test *test = &kASN1Uint64Tests[i];
CBS cbs;
uint64_t value;
CBB cbb;
@@ -596,57 +614,56 @@
if (!CBS_get_asn1_uint64(&cbs, &value) ||
CBS_len(&cbs) != 0 ||
value != test->value) {
- return 0;
+ return false;
}
if (!CBB_init(&cbb, 0)) {
- return 0;
+ return false;
}
if (!CBB_add_asn1_uint64(&cbb, test->value) ||
!CBB_finish(&cbb, &out, &len)) {
CBB_cleanup(&cbb);
- return 0;
+ return false;
}
+ ScopedOpenSSLBytes scoper(out);
if (len != test->encoding_len || memcmp(out, test->encoding, len) != 0) {
- free(out);
- return 0;
+ return false;
}
- free(out);
}
- for (i = 0;
- i < sizeof(kAsn1InvalidUint64Tests) / sizeof(kAsn1InvalidUint64Tests[0]);
+ for (size_t i = 0;
+ i < sizeof(kASN1InvalidUint64Tests) / sizeof(kASN1InvalidUint64Tests[0]);
i++) {
- const ASN1_INVALID_UINT64_TEST *test = &kAsn1InvalidUint64Tests[i];
+ const ASN1InvalidUint64Test *test = &kASN1InvalidUint64Tests[i];
CBS cbs;
uint64_t value;
CBS_init(&cbs, (const uint8_t *)test->encoding, test->encoding_len);
if (CBS_get_asn1_uint64(&cbs, &value)) {
- return 0;
+ return false;
}
}
- return 1;
+ return true;
}
int main(void) {
CRYPTO_library_init();
- if (!test_skip() ||
- !test_get_u() ||
- !test_get_prefixed() ||
- !test_get_prefixed_bad() ||
- !test_get_asn1() ||
- !test_cbb_basic() ||
- !test_cbb_fixed() ||
- !test_cbb_finish_child() ||
- !test_cbb_misuse() ||
- !test_cbb_prefixed() ||
- !test_cbb_asn1() ||
- !test_ber_convert() ||
- !test_asn1_uint64() ||
- !test_get_optional_asn1_bool()) {
+ if (!TestSkip() ||
+ !TestGetUint() ||
+ !TestGetPrefixed() ||
+ !TestGetPrefixedBad() ||
+ !TestGetASN1() ||
+ !TestCBBBasic() ||
+ !TestCBBFixed() ||
+ !TestCBBFinishChild() ||
+ !TestCBBMisuse() ||
+ !TestCBBPrefixed() ||
+ !TestCBBASN1() ||
+ !TestBerConvert() ||
+ !TestASN1Uint64() ||
+ !TestGetOptionalASN1Bool()) {
return 1;
}
