commit 10f97f3bfcecc3fbe8e9f02e7c426f7e340f7f54
author Adam Langley <agl@google.com> Tue Jul 12 08:09:33 2016 -0700
committer Adam Langley <agl@google.com> Tue Jul 12 08:09:33 2016 -0700
tree 3a23df61db5dc580eeb23916bf8955f5fcedc6cd
parent d2b5af56cf2a8b4695821b2ff64a7bfc82f3ba5e

Revert "Move C++ helpers into |bssl| namespace."

This reverts commit 09feb0f3d95a2bc58ce0faaf14256d3bd30f52a4.

(In order to make WebRTC happy this also needs to be reverted.)

crypto/bn/bn_test.cc

diff --git a/crypto/bn/bn_test.cc b/crypto/bn/bn_test.cc
index 3028745..3405cbd 100644
--- a/crypto/bn/bn_test.cc
+++ b/crypto/bn/bn_test.cc
@@ -90,8 +90,6 @@
 #include "../crypto/test/test_util.h"
 
 
-namespace bssl {
-
 static int HexToBIGNUM(ScopedBIGNUM *out, const char *in) {
   BIGNUM *raw = NULL;
   int ret = BN_hex2bn(&raw, in);
@@ -134,8 +132,8 @@
     return true;
   }
 
-  ScopedString expected_str(BN_bn2hex(expected));
-  ScopedString actual_str(BN_bn2hex(actual));
+  ScopedOpenSSLString expected_str(BN_bn2hex(expected));
+  ScopedOpenSSLString actual_str(BN_bn2hex(actual));
   if (!expected_str || !actual_str) {
     return false;
   }
@@ -999,7 +997,7 @@
       CBB_cleanup(&cbb);
       return false;
     }
-    ScopedBytes delete_der(der);
+    ScopedOpenSSLBytes delete_der(der);
     if (der_len != test.der_len ||
         memcmp(der, reinterpret_cast<const uint8_t*>(test.der), der_len) != 0) {
       fprintf(stderr, "Bad serialization.\n");
@@ -1265,8 +1263,6 @@
   return true;
 }
 
-}  // namespace bssl
-
 int main(int argc, char *argv[]) {
   CRYPTO_library_init();
 
@@ -1275,24 +1271,24 @@
     return 1;
   }
 
-  bssl::ScopedBN_CTX ctx(BN_CTX_new());
+  ScopedBN_CTX ctx(BN_CTX_new());
   if (!ctx) {
     return 1;
   }
 
-  if (!bssl::TestBN2BinPadded(ctx.get()) ||
-      !bssl::TestDec2BN(ctx.get()) ||
-      !bssl::TestHex2BN(ctx.get()) ||
-      !bssl::TestASC2BN(ctx.get()) ||
-      !bssl::TestMPI() ||
-      !bssl::TestRand() ||
-      !bssl::TestASN1() ||
-      !bssl::TestNegativeZero(ctx.get()) ||
-      !bssl::TestBadModulus(ctx.get()) ||
-      !bssl::TestExpModZero() ||
-      !bssl::TestSmallPrime(ctx.get())) {
+  if (!TestBN2BinPadded(ctx.get()) ||
+      !TestDec2BN(ctx.get()) ||
+      !TestHex2BN(ctx.get()) ||
+      !TestASC2BN(ctx.get()) ||
+      !TestMPI() ||
+      !TestRand() ||
+      !TestASN1() ||
+      !TestNegativeZero(ctx.get()) ||
+      !TestBadModulus(ctx.get()) ||
+      !TestExpModZero() ||
+      !TestSmallPrime(ctx.get())) {
     return 1;
   }
 
-  return bssl::FileTestMain(bssl::RunTest, ctx.get(), argv[1]);
+  return FileTestMain(RunTest, ctx.get(), argv[1]);
 }