summaryrefslogtreecommitdiffstats
path: root/src/crypto/bytestring/bytestring_test.cc
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2015-09-25 00:37:00 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-09-25 00:37:00 +0000
commit00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872 (patch)
treedc62c249d595198e0d99e43890019d21e901fbec /src/crypto/bytestring/bytestring_test.cc
parent3781a60670f92c3c6fca860cb4589495cefa2e56 (diff)
parenta04d78d392463df4e69a64360c952ffa5abd22f7 (diff)
downloadexternal_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.zip
external_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.tar.gz
external_boringssl-00bc53f6f4436972b7a8dcf2c1e5fd0ad7515872.tar.bz2
am a04d78d3: Revert "external/boringssl: sync with upstream."
* commit 'a04d78d392463df4e69a64360c952ffa5abd22f7': Revert "external/boringssl: sync with upstream."
Diffstat (limited to 'src/crypto/bytestring/bytestring_test.cc')
-rw-r--r--src/crypto/bytestring/bytestring_test.cc13
1 files changed, 2 insertions, 11 deletions
diff --git a/src/crypto/bytestring/bytestring_test.cc b/src/crypto/bytestring/bytestring_test.cc
index e987e1b..66e9c1e 100644
--- a/src/crypto/bytestring/bytestring_test.cc
+++ b/src/crypto/bytestring/bytestring_test.cc
@@ -109,7 +109,7 @@ static bool TestGetASN1() {
static const uint8_t kData2[] = {0x30, 3, 1, 2};
static const uint8_t kData3[] = {0x30, 0x80};
static const uint8_t kData4[] = {0x30, 0x81, 1, 1};
- static const uint8_t kData5[4 + 0x80] = {0x30, 0x82, 0, 0x80};
+ static const uint8_t kData5[] = {0x30, 0x82, 0, 1, 1};
static const uint8_t kData6[] = {0xa1, 3, 0x4, 1, 1};
static const uint8_t kData7[] = {0xa1, 3, 0x4, 2, 1};
static const uint8_t kData8[] = {0xa1, 3, 0x2, 1, 1};
@@ -649,14 +649,6 @@ static bool TestASN1Uint64() {
return true;
}
-static int TestZero() {
- CBB cbb;
- CBB_zero(&cbb);
- // Calling |CBB_cleanup| on a zero-state |CBB| must not crash.
- CBB_cleanup(&cbb);
- return 1;
-}
-
int main(void) {
CRYPTO_library_init();
@@ -673,8 +665,7 @@ int main(void) {
!TestCBBASN1() ||
!TestBerConvert() ||
!TestASN1Uint64() ||
- !TestGetOptionalASN1Bool() ||
- !TestZero()) {
+ !TestGetOptionalASN1Bool()) {
return 1;
}