diff options
author | Adam Langley <agl@google.com> | 2016-07-12 18:09:33 +0300 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2016-07-12 18:09:33 +0300 |
commit | 10f97f3bfcecc3fbe8e9f02e7c426f7e340f7f54 (patch) | |
tree | 3a23df61db5dc580eeb23916bf8955f5fcedc6cd /crypto/bio | |
parent | d2b5af56cf2a8b4695821b2ff64a7bfc82f3ba5e (diff) |
Revert "Move C++ helpers into |bssl| namespace."
This reverts commit 09feb0f3d95a2bc58ce0faaf14256d3bd30f52a4.
(In order to make WebRTC happy this also needs to be reverted.)
Diffstat (limited to 'crypto/bio')
-rw-r--r-- | crypto/bio/bio_test.cc | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/crypto/bio/bio_test.cc b/crypto/bio/bio_test.cc index e7c061eb..f2eb20ba 100644 --- a/crypto/bio/bio_test.cc +++ b/crypto/bio/bio_test.cc @@ -43,8 +43,6 @@ OPENSSL_MSVC_PRAGMA(warning(pop)) #include "../test/scoped_types.h" -namespace bssl { - #if !defined(OPENSSL_WINDOWS) static int closesocket(int sock) { return close(sock); @@ -341,7 +339,7 @@ static bool ReadASN1(bool should_succeed, const uint8_t *data, size_t data_len, if (!ok) { out = nullptr; } - ScopedBytes out_storage(out); + ScopedOpenSSLBytes out_storage(out); if (should_succeed != (ok == 1)) { return false; @@ -371,7 +369,7 @@ static bool TestASN1() { static const size_t kLargePayloadLen = 8000; static const uint8_t kLargePrefix[] = {0x30, 0x82, kLargePayloadLen >> 8, kLargePayloadLen & 0xff}; - ScopedBytes large(reinterpret_cast<uint8_t *>( + ScopedOpenSSLBytes large(reinterpret_cast<uint8_t *>( OPENSSL_malloc(sizeof(kLargePrefix) + kLargePayloadLen))); if (!large) { return false; @@ -412,8 +410,6 @@ static bool TestASN1() { return true; } -} // namespace bssl - int main(void) { CRYPTO_library_init(); @@ -432,10 +428,10 @@ int main(void) { } #endif - if (!bssl::TestSocketConnect() || - !bssl::TestPrintf() || - !bssl::TestZeroCopyBioPairs() || - !bssl::TestASN1()) { + if (!TestSocketConnect() || + !TestPrintf() || + !TestZeroCopyBioPairs() || + !TestASN1()) { return 1; } |