Convert bio_test to GTest.
BUG=129
Change-Id: Iaf07075afaa2ea447e19a8c53ec0d29560d625b3
Reviewed-on: https://boringssl-review.googlesource.com/14207
Commit-Queue: David Benjamin <davidben@google.com>
Commit-Queue: Steven Valdez <svaldez@google.com>
Reviewed-by: Steven Valdez <svaldez@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 81efad4..dbc09fd 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -212,6 +212,7 @@
crypto_test
asn1/asn1_test.cc
+ bio/bio_test.cc
chacha/chacha_test.cc
curve25519/x25519_test.cc
dh/dh_test.cc
@@ -226,4 +227,7 @@
)
target_link_libraries(crypto_test crypto gtest)
+if (WIN32)
+ target_link_libraries(crypto_test ws2_32)
+endif()
add_dependencies(all_tests crypto_test)
diff --git a/crypto/bio/CMakeLists.txt b/crypto/bio/CMakeLists.txt
index 49b9d76..fccb152 100644
--- a/crypto/bio/CMakeLists.txt
+++ b/crypto/bio/CMakeLists.txt
@@ -16,17 +16,3 @@
socket.c
socket_helper.c
)
-
-add_executable(
- bio_test
-
- bio_test.cc
-
- $<TARGET_OBJECTS:test_support>
-)
-
-target_link_libraries(bio_test crypto)
-if (WIN32)
- target_link_libraries(bio_test ws2_32)
-endif()
-add_dependencies(all_tests bio_test)
diff --git a/crypto/bio/bio_test.cc b/crypto/bio/bio_test.cc
index fbfacf8..beb182b 100644
--- a/crypto/bio/bio_test.cc
+++ b/crypto/bio/bio_test.cc
@@ -16,7 +16,18 @@
#define _POSIX_C_SOURCE 201410L
#endif
-#include <openssl/base.h>
+#include <algorithm>
+#include <string>
+
+#include <gtest/gtest.h>
+
+#include <openssl/bio.h>
+#include <openssl/crypto.h>
+#include <openssl/err.h>
+#include <openssl/mem.h>
+
+#include "../internal.h"
+#include "../test/test_util.h"
#if !defined(OPENSSL_WINDOWS)
#include <arpa/inet.h>
@@ -33,27 +44,15 @@
OPENSSL_MSVC_PRAGMA(warning(pop))
#endif
-#include <openssl/bio.h>
-#include <openssl/crypto.h>
-#include <openssl/err.h>
-#include <openssl/mem.h>
-
-#include <algorithm>
-
-#include "../internal.h"
-
#if !defined(OPENSSL_WINDOWS)
-static int closesocket(int sock) {
- return close(sock);
-}
-
-static void PrintSocketError(const char *func) {
- perror(func);
-}
+static int closesocket(int sock) { return close(sock); }
+static std::string LastSocketError() { return strerror(errno); }
#else
-static void PrintSocketError(const char *func) {
- fprintf(stderr, "%s: %d\n", func, WSAGetLastError());
+static std::string LastSocketError() {
+ char buf[DECIMAL_SIZE(int) + 1];
+ BIO_snprintf(buf, sizeof(buf), "%d", WSAGetLastError());
+ return buf;
}
#endif
@@ -68,356 +67,246 @@
const int sock_;
};
-static bool TestSocketConnect() {
+TEST(BIOTest, SocketConnect) {
static const char kTestMessage[] = "test";
+ // Set up a listening socket on localhost.
int listening_sock = socket(AF_INET, SOCK_STREAM, 0);
- if (listening_sock == -1) {
- PrintSocketError("socket");
- return false;
- }
+ ASSERT_NE(-1, listening_sock) << LastSocketError();
ScopedSocket listening_sock_closer(listening_sock);
struct sockaddr_in sin;
OPENSSL_memset(&sin, 0, sizeof(sin));
sin.sin_family = AF_INET;
- if (!inet_pton(AF_INET, "127.0.0.1", &sin.sin_addr)) {
- PrintSocketError("inet_pton");
- return false;
- }
- if (bind(listening_sock, (struct sockaddr *)&sin, sizeof(sin)) != 0) {
- PrintSocketError("bind");
- return false;
- }
- if (listen(listening_sock, 1)) {
- PrintSocketError("listen");
- return false;
- }
+ ASSERT_EQ(1, inet_pton(AF_INET, "127.0.0.1", &sin.sin_addr))
+ << LastSocketError();
+ ASSERT_EQ(0, bind(listening_sock, (struct sockaddr *)&sin, sizeof(sin)))
+ << LastSocketError();
+ ASSERT_EQ(0, listen(listening_sock, 1)) << LastSocketError();
socklen_t sockaddr_len = sizeof(sin);
- if (getsockname(listening_sock, (struct sockaddr *)&sin, &sockaddr_len) ||
- sockaddr_len != sizeof(sin)) {
- PrintSocketError("getsockname");
- return false;
- }
+ ASSERT_EQ(0,
+ getsockname(listening_sock, (struct sockaddr *)&sin, &sockaddr_len))
+ << LastSocketError();
+ // The Android NDK, contrary to POSIX, makes |socklen_t| signed.
+ ASSERT_EQ(sizeof(sin), static_cast<size_t>(sockaddr_len));
+ // Connect to it with a connect BIO.
char hostname[80];
BIO_snprintf(hostname, sizeof(hostname), "%s:%d", "127.0.0.1",
ntohs(sin.sin_port));
bssl::UniquePtr<BIO> bio(BIO_new_connect(hostname));
- if (!bio) {
- fprintf(stderr, "BIO_new_connect failed.\n");
- return false;
- }
+ ASSERT_TRUE(bio);
- if (BIO_write(bio.get(), kTestMessage, sizeof(kTestMessage)) !=
- sizeof(kTestMessage)) {
- fprintf(stderr, "BIO_write failed.\n");
- ERR_print_errors_fp(stderr);
- return false;
- }
+ // Write a test message to the BIO.
+ ASSERT_EQ(static_cast<int>(sizeof(kTestMessage)),
+ BIO_write(bio.get(), kTestMessage, sizeof(kTestMessage)));
+ // Accept the socket.
int sock = accept(listening_sock, (struct sockaddr *) &sin, &sockaddr_len);
- if (sock == -1) {
- PrintSocketError("accept");
- return false;
- }
+ ASSERT_NE(-1, sock) << LastSocketError();
ScopedSocket sock_closer(sock);
- char buf[5];
- if (recv(sock, buf, sizeof(buf), 0) != sizeof(kTestMessage)) {
- PrintSocketError("read");
- return false;
- }
- if (OPENSSL_memcmp(buf, kTestMessage, sizeof(kTestMessage))) {
- return false;
- }
-
- return true;
+ // Check the same message is read back out.
+ char buf[sizeof(kTestMessage)];
+ ASSERT_EQ(static_cast<int>(sizeof(kTestMessage)),
+ recv(sock, buf, sizeof(buf), 0))
+ << LastSocketError();
+ EXPECT_EQ(Bytes(kTestMessage, sizeof(kTestMessage)), Bytes(buf, sizeof(buf)));
}
-static bool TestPrintf() {
+TEST(BIOTest, Printf) {
// Test a short output, a very long one, and various sizes around
// 256 (the size of the buffer) to ensure edge cases are correct.
- static const size_t kLengths[] = { 5, 250, 251, 252, 253, 254, 1023 };
+ static const size_t kLengths[] = {5, 250, 251, 252, 253, 254, 1023};
bssl::UniquePtr<BIO> bio(BIO_new(BIO_s_mem()));
- if (!bio) {
- fprintf(stderr, "BIO_new failed\n");
- return false;
- }
+ ASSERT_TRUE(bio);
- for (size_t i = 0; i < OPENSSL_ARRAY_SIZE(kLengths); i++) {
- char string[1024];
- if (kLengths[i] >= sizeof(string)) {
- fprintf(stderr, "Bad test string length\n");
- return false;
- }
- OPENSSL_memset(string, 'a', sizeof(string));
- string[kLengths[i]] = '\0';
+ for (size_t length : kLengths) {
+ SCOPED_TRACE(length);
- int ret = BIO_printf(bio.get(), "test %s", string);
- if (ret < 0 || static_cast<size_t>(ret) != 5 + kLengths[i]) {
- fprintf(stderr, "BIO_printf failed: %d\n", ret);
- return false;
- }
+ std::string in(length, 'a');
+
+ int ret = BIO_printf(bio.get(), "test %s", in.c_str());
+ ASSERT_GE(ret, 0);
+ EXPECT_EQ(5 + length, static_cast<size_t>(ret));
+
const uint8_t *contents;
size_t len;
- if (!BIO_mem_contents(bio.get(), &contents, &len)) {
- fprintf(stderr, "BIO_mem_contents failed\n");
- return false;
- }
- if (len != 5 + kLengths[i] ||
- strncmp((const char *)contents, "test ", 5) != 0 ||
- strncmp((const char *)contents + 5, string, kLengths[i]) != 0) {
- fprintf(stderr, "Contents did not match: %.*s\n", (int)len, contents);
- return false;
- }
+ ASSERT_TRUE(BIO_mem_contents(bio.get(), &contents, &len));
+ EXPECT_EQ("test " + in,
+ std::string(reinterpret_cast<const char *>(contents), len));
- if (!BIO_reset(bio.get())) {
- fprintf(stderr, "BIO_reset failed\n");
- return false;
- }
+ ASSERT_TRUE(BIO_reset(bio.get()));
}
-
- return true;
}
-static bool ReadASN1(bool should_succeed, const uint8_t *data, size_t data_len,
- size_t expected_len, size_t max_len) {
- bssl::UniquePtr<BIO> bio(BIO_new_mem_buf(data, data_len));
+static const size_t kLargeASN1PayloadLen = 8000;
+
+struct ASN1TestParam {
+ bool should_succeed;
+ std::vector<uint8_t> input;
+ // suffix_len is the number of zeros to append to |input|.
+ size_t suffix_len;
+ // expected_len, if |should_succeed| is true, is the expected length of the
+ // ASN.1 element.
+ size_t expected_len;
+ size_t max_len;
+} kASN1TestParams[] = {
+ {true, {0x30, 2, 1, 2, 0, 0}, 0, 4, 100},
+ {false /* truncated */, {0x30, 3, 1, 2}, 0, 0, 100},
+ {false /* should be short len */, {0x30, 0x81, 1, 1}, 0, 0, 100},
+ {false /* zero padded */, {0x30, 0x82, 0, 1, 1}, 0, 0, 100},
+
+ // Test a large payload.
+ {true,
+ {0x30, 0x82, kLargeASN1PayloadLen >> 8, kLargeASN1PayloadLen & 0xff},
+ kLargeASN1PayloadLen,
+ 4 + kLargeASN1PayloadLen,
+ kLargeASN1PayloadLen * 2},
+ {false /* max_len too short */,
+ {0x30, 0x82, kLargeASN1PayloadLen >> 8, kLargeASN1PayloadLen & 0xff},
+ kLargeASN1PayloadLen,
+ 4 + kLargeASN1PayloadLen,
+ 3 + kLargeASN1PayloadLen},
+
+ // Test an indefinite-length input.
+ {true,
+ {0x30, 0x80},
+ kLargeASN1PayloadLen + 2,
+ 2 + kLargeASN1PayloadLen + 2,
+ kLargeASN1PayloadLen * 2},
+ {false /* max_len too short */,
+ {0x30, 0x80},
+ kLargeASN1PayloadLen + 2,
+ 2 + kLargeASN1PayloadLen + 2,
+ 2 + kLargeASN1PayloadLen + 1},
+};
+
+class BIOASN1Test : public testing::TestWithParam<ASN1TestParam> {};
+
+TEST_P(BIOASN1Test, ReadASN1) {
+ const ASN1TestParam& param = GetParam();
+ std::vector<uint8_t> input = param.input;
+ input.resize(input.size() + param.suffix_len, 0);
+
+ bssl::UniquePtr<BIO> bio(BIO_new_mem_buf(input.data(), input.size()));
+ ASSERT_TRUE(bio);
uint8_t *out;
size_t out_len;
- int ok = BIO_read_asn1(bio.get(), &out, &out_len, max_len);
+ int ok = BIO_read_asn1(bio.get(), &out, &out_len, param.max_len);
if (!ok) {
out = nullptr;
}
bssl::UniquePtr<uint8_t> out_storage(out);
- if (should_succeed != (ok == 1)) {
- return false;
+ ASSERT_EQ(param.should_succeed, (ok == 1));
+ if (param.should_succeed) {
+ EXPECT_EQ(Bytes(input.data(), param.expected_len), Bytes(out, out_len));
}
-
- if (should_succeed && (out_len != expected_len ||
- OPENSSL_memcmp(data, out, expected_len) != 0)) {
- return false;
- }
-
- return true;
}
-static bool TestASN1() {
- static const uint8_t kData1[] = {0x30, 2, 1, 2, 0, 0};
- static const uint8_t kData2[] = {0x30, 3, 1, 2}; /* truncated */
- static const uint8_t kData3[] = {0x30, 0x81, 1, 1}; /* should be short len */
- static const uint8_t kData4[] = {0x30, 0x82, 0, 1, 1}; /* zero padded. */
+INSTANTIATE_TEST_CASE_P(, BIOASN1Test, testing::ValuesIn(kASN1TestParams));
- if (!ReadASN1(true, kData1, sizeof(kData1), 4, 100) ||
- !ReadASN1(false, kData2, sizeof(kData2), 0, 100) ||
- !ReadASN1(false, kData3, sizeof(kData3), 0, 100) ||
- !ReadASN1(false, kData4, sizeof(kData4), 0, 100)) {
- return false;
+// Run through the tests twice, swapping |bio1| and |bio2|, for symmetry.
+class BIOPairTest : public testing::TestWithParam<bool> {};
+
+TEST_P(BIOPairTest, TestPair) {
+ BIO *bio1, *bio2;
+ ASSERT_TRUE(BIO_new_bio_pair(&bio1, 10, &bio2, 10));
+ bssl::UniquePtr<BIO> free_bio1(bio1), free_bio2(bio2);
+
+ if (GetParam()) {
+ std::swap(bio1, bio2);
}
- static const size_t kLargePayloadLen = 8000;
- static const uint8_t kLargePrefix[] = {0x30, 0x82, kLargePayloadLen >> 8,
- kLargePayloadLen & 0xff};
- bssl::UniquePtr<uint8_t> large(reinterpret_cast<uint8_t *>(
- OPENSSL_malloc(sizeof(kLargePrefix) + kLargePayloadLen)));
- if (!large) {
- return false;
- }
- OPENSSL_memset(large.get() + sizeof(kLargePrefix), 0, kLargePayloadLen);
- OPENSSL_memcpy(large.get(), kLargePrefix, sizeof(kLargePrefix));
+ // Check initial states.
+ EXPECT_EQ(10u, BIO_ctrl_get_write_guarantee(bio1));
+ EXPECT_EQ(0u, BIO_ctrl_get_read_request(bio1));
- if (!ReadASN1(true, large.get(), sizeof(kLargePrefix) + kLargePayloadLen,
- sizeof(kLargePrefix) + kLargePayloadLen,
- kLargePayloadLen * 2)) {
- fprintf(stderr, "Large payload test failed.\n");
- return false;
- }
+ // Data written in one end may be read out the other.
+ uint8_t buf[20];
+ EXPECT_EQ(5, BIO_write(bio1, "12345", 5));
+ EXPECT_EQ(5u, BIO_ctrl_get_write_guarantee(bio1));
+ ASSERT_EQ(5, BIO_read(bio2, buf, sizeof(buf)));
+ EXPECT_EQ(Bytes("12345"), Bytes(buf, 5));
+ EXPECT_EQ(10u, BIO_ctrl_get_write_guarantee(bio1));
- if (!ReadASN1(false, large.get(), sizeof(kLargePrefix) + kLargePayloadLen,
- sizeof(kLargePrefix) + kLargePayloadLen,
- kLargePayloadLen - 1)) {
- fprintf(stderr, "max_len test failed.\n");
- return false;
- }
+ // Attempting to write more than 10 bytes will write partially.
+ EXPECT_EQ(10, BIO_write(bio1, "1234567890___", 13));
+ EXPECT_EQ(0u, BIO_ctrl_get_write_guarantee(bio1));
+ EXPECT_EQ(-1, BIO_write(bio1, "z", 1));
+ EXPECT_TRUE(BIO_should_write(bio1));
+ ASSERT_EQ(10, BIO_read(bio2, buf, sizeof(buf)));
+ EXPECT_EQ(Bytes("1234567890"), Bytes(buf, 10));
+ EXPECT_EQ(10u, BIO_ctrl_get_write_guarantee(bio1));
- static const uint8_t kIndefPrefix[] = {0x30, 0x80};
- OPENSSL_memcpy(large.get(), kIndefPrefix, sizeof(kIndefPrefix));
- if (!ReadASN1(true, large.get(), sizeof(kLargePrefix) + kLargePayloadLen,
- sizeof(kLargePrefix) + kLargePayloadLen,
- kLargePayloadLen*2)) {
- fprintf(stderr, "indefinite length test failed.\n");
- return false;
- }
+ // Unsuccessful reads update the read request.
+ EXPECT_EQ(-1, BIO_read(bio2, buf, 5));
+ EXPECT_TRUE(BIO_should_read(bio2));
+ EXPECT_EQ(5u, BIO_ctrl_get_read_request(bio1));
- if (!ReadASN1(false, large.get(), sizeof(kLargePrefix) + kLargePayloadLen,
- sizeof(kLargePrefix) + kLargePayloadLen,
- kLargePayloadLen-1)) {
- fprintf(stderr, "indefinite length, max_len test failed.\n");
- return false;
- }
+ // The read request is clamped to the size of the buffer.
+ EXPECT_EQ(-1, BIO_read(bio2, buf, 20));
+ EXPECT_TRUE(BIO_should_read(bio2));
+ EXPECT_EQ(10u, BIO_ctrl_get_read_request(bio1));
- return true;
+ // Data may be written and read in chunks.
+ EXPECT_EQ(5, BIO_write(bio1, "12345", 5));
+ EXPECT_EQ(5u, BIO_ctrl_get_write_guarantee(bio1));
+ EXPECT_EQ(5, BIO_write(bio1, "67890___", 8));
+ EXPECT_EQ(0u, BIO_ctrl_get_write_guarantee(bio1));
+ ASSERT_EQ(3, BIO_read(bio2, buf, 3));
+ EXPECT_EQ(Bytes("123"), Bytes(buf, 3));
+ EXPECT_EQ(3u, BIO_ctrl_get_write_guarantee(bio1));
+ ASSERT_EQ(7, BIO_read(bio2, buf, sizeof(buf)));
+ EXPECT_EQ(Bytes("4567890"), Bytes(buf, 7));
+ EXPECT_EQ(10u, BIO_ctrl_get_write_guarantee(bio1));
+
+ // Successful reads reset the read request.
+ EXPECT_EQ(0u, BIO_ctrl_get_read_request(bio1));
+
+ // Test writes and reads starting in the middle of the ring buffer and
+ // wrapping to front.
+ EXPECT_EQ(8, BIO_write(bio1, "abcdefgh", 8));
+ EXPECT_EQ(2u, BIO_ctrl_get_write_guarantee(bio1));
+ ASSERT_EQ(3, BIO_read(bio2, buf, 3));
+ EXPECT_EQ(Bytes("abc"), Bytes(buf, 3));
+ EXPECT_EQ(5u, BIO_ctrl_get_write_guarantee(bio1));
+ EXPECT_EQ(5, BIO_write(bio1, "ijklm___", 8));
+ EXPECT_EQ(0u, BIO_ctrl_get_write_guarantee(bio1));
+ ASSERT_EQ(10, BIO_read(bio2, buf, sizeof(buf)));
+ EXPECT_EQ(Bytes("defghijklm"), Bytes(buf, 10));
+ EXPECT_EQ(10u, BIO_ctrl_get_write_guarantee(bio1));
+
+ // Data may flow from both ends in parallel.
+ EXPECT_EQ(5, BIO_write(bio1, "12345", 5));
+ EXPECT_EQ(5, BIO_write(bio2, "67890", 5));
+ ASSERT_EQ(5, BIO_read(bio2, buf, sizeof(buf)));
+ EXPECT_EQ(Bytes("12345"), Bytes(buf, 5));
+ ASSERT_EQ(5, BIO_read(bio1, buf, sizeof(buf)));
+ EXPECT_EQ(Bytes("67890"), Bytes(buf, 5));
+
+ // Closing the write end causes an EOF on the read half, after draining.
+ EXPECT_EQ(5, BIO_write(bio1, "12345", 5));
+ EXPECT_TRUE(BIO_shutdown_wr(bio1));
+ ASSERT_EQ(5, BIO_read(bio2, buf, sizeof(buf)));
+ EXPECT_EQ(Bytes("12345"), Bytes(buf, 5));
+ EXPECT_EQ(0, BIO_read(bio2, buf, sizeof(buf)));
+
+ // A closed write end may not be written to.
+ EXPECT_EQ(0u, BIO_ctrl_get_write_guarantee(bio1));
+ EXPECT_EQ(-1, BIO_write(bio1, "_____", 5));
+
+ uint32_t err = ERR_get_error();
+ EXPECT_EQ(ERR_LIB_BIO, ERR_GET_LIB(err));
+ EXPECT_EQ(BIO_R_BROKEN_PIPE, ERR_GET_REASON(err));
+
+ // The other end is still functional.
+ EXPECT_EQ(5, BIO_write(bio2, "12345", 5));
+ ASSERT_EQ(5, BIO_read(bio1, buf, sizeof(buf)));
+ EXPECT_EQ(Bytes("12345"), Bytes(buf, 5));
}
-static bool TestPair() {
- // Run through the tests twice, swapping |bio1| and |bio2|, for symmetry.
- for (int i = 0; i < 2; i++) {
- BIO *bio1, *bio2;
- if (!BIO_new_bio_pair(&bio1, 10, &bio2, 10)) {
- return false;
- }
- bssl::UniquePtr<BIO> free_bio1(bio1), free_bio2(bio2);
-
- if (i == 1) {
- std::swap(bio1, bio2);
- }
-
- // Check initial states.
- if (BIO_ctrl_get_write_guarantee(bio1) != 10 ||
- BIO_ctrl_get_read_request(bio1) != 0) {
- return false;
- }
-
- // Data written in one end may be read out the other.
- char buf[20];
- if (BIO_write(bio1, "12345", 5) != 5 ||
- BIO_ctrl_get_write_guarantee(bio1) != 5 ||
- BIO_read(bio2, buf, sizeof(buf)) != 5 ||
- OPENSSL_memcmp(buf, "12345", 5) != 0 ||
- BIO_ctrl_get_write_guarantee(bio1) != 10) {
- return false;
- }
-
- // Attempting to write more than 10 bytes will write partially.
- if (BIO_write(bio1, "1234567890___", 13) != 10 ||
- BIO_ctrl_get_write_guarantee(bio1) != 0 ||
- BIO_write(bio1, "z", 1) != -1 ||
- !BIO_should_write(bio1) ||
- BIO_read(bio2, buf, sizeof(buf)) != 10 ||
- OPENSSL_memcmp(buf, "1234567890", 10) != 0 ||
- BIO_ctrl_get_write_guarantee(bio1) != 10) {
- return false;
- }
-
- // Unsuccessful reads update the read request.
- if (BIO_read(bio2, buf, 5) != -1 ||
- !BIO_should_read(bio2) ||
- BIO_ctrl_get_read_request(bio1) != 5) {
- return false;
- }
-
- // The read request is clamped to the size of the buffer.
- if (BIO_read(bio2, buf, 20) != -1 ||
- !BIO_should_read(bio2) ||
- BIO_ctrl_get_read_request(bio1) != 10) {
- return false;
- }
-
- // Data may be written and read in chunks.
- if (BIO_write(bio1, "12345", 5) != 5 ||
- BIO_ctrl_get_write_guarantee(bio1) != 5 ||
- BIO_write(bio1, "67890___", 8) != 5 ||
- BIO_ctrl_get_write_guarantee(bio1) != 0 ||
- BIO_read(bio2, buf, 3) != 3 ||
- OPENSSL_memcmp(buf, "123", 3) != 0 ||
- BIO_ctrl_get_write_guarantee(bio1) != 3 ||
- BIO_read(bio2, buf, sizeof(buf)) != 7 ||
- OPENSSL_memcmp(buf, "4567890", 7) != 0 ||
- BIO_ctrl_get_write_guarantee(bio1) != 10) {
- return false;
- }
-
- // Successful reads reset the read request.
- if (BIO_ctrl_get_read_request(bio1) != 0) {
- return false;
- }
-
- // Test writes and reads starting in the middle of the ring buffer and
- // wrapping to front.
- if (BIO_write(bio1, "abcdefgh", 8) != 8 ||
- BIO_ctrl_get_write_guarantee(bio1) != 2 ||
- BIO_read(bio2, buf, 3) != 3 ||
- OPENSSL_memcmp(buf, "abc", 3) != 0 ||
- BIO_ctrl_get_write_guarantee(bio1) != 5 ||
- BIO_write(bio1, "ijklm___", 8) != 5 ||
- BIO_ctrl_get_write_guarantee(bio1) != 0 ||
- BIO_read(bio2, buf, sizeof(buf)) != 10 ||
- OPENSSL_memcmp(buf, "defghijklm", 10) != 0 ||
- BIO_ctrl_get_write_guarantee(bio1) != 10) {
- return false;
- }
-
- // Data may flow from both ends in parallel.
- if (BIO_write(bio1, "12345", 5) != 5 ||
- BIO_write(bio2, "67890", 5) != 5 ||
- BIO_read(bio2, buf, sizeof(buf)) != 5 ||
- OPENSSL_memcmp(buf, "12345", 5) != 0 ||
- BIO_read(bio1, buf, sizeof(buf)) != 5 ||
- OPENSSL_memcmp(buf, "67890", 5) != 0) {
- return false;
- }
-
- // Closing the write end causes an EOF on the read half, after draining.
- if (BIO_write(bio1, "12345", 5) != 5 ||
- !BIO_shutdown_wr(bio1) ||
- BIO_read(bio2, buf, sizeof(buf)) != 5 ||
- OPENSSL_memcmp(buf, "12345", 5) != 0 ||
- BIO_read(bio2, buf, sizeof(buf)) != 0) {
- return false;
- }
-
- // A closed write end may not be written to.
- if (BIO_ctrl_get_write_guarantee(bio1) != 0 ||
- BIO_write(bio1, "_____", 5) != -1) {
- return false;
- }
-
- uint32_t err = ERR_get_error();
- if (ERR_GET_LIB(err) != ERR_LIB_BIO ||
- ERR_GET_REASON(err) != BIO_R_BROKEN_PIPE) {
- return false;
- }
-
- // The other end is still functional.
- if (BIO_write(bio2, "12345", 5) != 5 ||
- BIO_read(bio1, buf, sizeof(buf)) != 5 ||
- OPENSSL_memcmp(buf, "12345", 5) != 0) {
- return false;
- }
- }
-
- return true;
-}
-
-int main() {
- CRYPTO_library_init();
-
-#if defined(OPENSSL_WINDOWS)
- // Initialize Winsock.
- WORD wsa_version = MAKEWORD(2, 2);
- WSADATA wsa_data;
- int wsa_err = WSAStartup(wsa_version, &wsa_data);
- if (wsa_err != 0) {
- fprintf(stderr, "WSAStartup failed: %d\n", wsa_err);
- return 1;
- }
- if (wsa_data.wVersion != wsa_version) {
- fprintf(stderr, "Didn't get expected version: %x\n", wsa_data.wVersion);
- return 1;
- }
-#endif
-
- if (!TestSocketConnect() ||
- !TestPrintf() ||
- !TestASN1() ||
- !TestPair()) {
- return 1;
- }
-
- printf("PASS\n");
- return 0;
-}
+INSTANTIATE_TEST_CASE_P(, BIOPairTest, testing::Values(false, true));
diff --git a/crypto/test/gtest_main.cc b/crypto/test/gtest_main.cc
index 50970af..ea1135c 100644
--- a/crypto/test/gtest_main.cc
+++ b/crypto/test/gtest_main.cc
@@ -19,6 +19,13 @@
#include <openssl/err.h>
#include <openssl/crypto.h>
+#if defined(OPENSSL_WINDOWS)
+OPENSSL_MSVC_PRAGMA(warning(push, 3))
+#include <winsock2.h>
+OPENSSL_MSVC_PRAGMA(warning(pop))
+#endif
+
+
namespace {
class ErrorTestEventListener : public testing::EmptyTestEventListener {
@@ -41,6 +48,22 @@
int main(int argc, char **argv) {
CRYPTO_library_init();
+
+#if defined(OPENSSL_WINDOWS)
+ // Initialize Winsock.
+ WORD wsa_version = MAKEWORD(2, 2);
+ WSADATA wsa_data;
+ int wsa_err = WSAStartup(wsa_version, &wsa_data);
+ if (wsa_err != 0) {
+ fprintf(stderr, "WSAStartup failed: %d\n", wsa_err);
+ return 1;
+ }
+ if (wsa_data.wVersion != wsa_version) {
+ fprintf(stderr, "Didn't get expected version: %x\n", wsa_data.wVersion);
+ return 1;
+ }
+#endif
+
testing::InitGoogleTest(&argc, argv);
testing::UnitTest::GetInstance()->listeners().Append(
new ErrorTestEventListener);
diff --git a/crypto/test/test_util.h b/crypto/test/test_util.h
index 1447bf6..bce34d4 100644
--- a/crypto/test/test_util.h
+++ b/crypto/test/test_util.h
@@ -34,6 +34,8 @@
struct Bytes {
Bytes(const uint8_t *data_arg, size_t len_arg)
: data(data_arg), len(len_arg) {}
+ Bytes(const char *data_arg, size_t len_arg)
+ : data(reinterpret_cast<const uint8_t *>(data_arg)), len(len_arg) {}
Bytes(const char *str)
: data(reinterpret_cast<const uint8_t *>(str)), len(strlen(str)) {}
diff --git a/decrepit/CMakeLists.txt b/decrepit/CMakeLists.txt
index 223320d..a3e409b 100644
--- a/decrepit/CMakeLists.txt
+++ b/decrepit/CMakeLists.txt
@@ -46,4 +46,7 @@
)
target_link_libraries(decrepit_test crypto decrepit gtest)
+if (WIN32)
+ target_link_libraries(decrepit_test ws2_32)
+endif()
add_dependencies(all_tests decrepit_test)
diff --git a/ssl/CMakeLists.txt b/ssl/CMakeLists.txt
index 5b5ea97..3e9cd40 100644
--- a/ssl/CMakeLists.txt
+++ b/ssl/CMakeLists.txt
@@ -52,4 +52,7 @@
)
target_link_libraries(ssl_test ssl crypto gtest)
+if (WIN32)
+ target_link_libraries(ssl_test ws2_32)
+endif()
add_dependencies(all_tests ssl_test)
diff --git a/util/all_tests.json b/util/all_tests.json
index d5c6e54..c959e54 100644
--- a/util/all_tests.json
+++ b/util/all_tests.json
@@ -1,7 +1,6 @@
[
["crypto/aes/aes_test", "crypto/aes/aes_tests.txt"],
["crypto/base64/base64_test"],
- ["crypto/bio/bio_test"],
["crypto/bn/bn_test", "crypto/bn/bn_tests.txt"],
["crypto/bytestring/bytestring_test"],
["crypto/cipher/aead_test", "aes-128-gcm", "crypto/cipher/test/aes_128_gcm_tests.txt"],
