From a04d78d392463df4e69a64360c952ffa5abd22f7 Mon Sep 17 00:00:00 2001
From: Kenny Root <kroot@google.com>
Date: Fri, 25 Sep 2015 00:26:37 +0000
Subject: Revert "external/boringssl: sync with upstream."

This reverts commit 1e4884f615b20946411a74e41eb9c6aa65e2d5f3.

This breaks some x86 builds.

Change-Id: I4d4310663ce52bc0a130e6b9dbc22b868ff4fb25
---
 src/crypto/bytestring/bytestring_test.cc | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'src/crypto/bytestring/bytestring_test.cc')

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;
   }
 
-- 
cgit v1.1