From 108848ae203b5ff73a544e39e0193e8773ccf8b5 Mon Sep 17 00:00:00 2001 From: Tanvi Jagtap <139093547+tanvi-jagtap@users.noreply.github.com> Date: Thu, 18 Apr 2024 12:22:50 -0700 Subject: [PATCH] [grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT (#36368) grpc][Gpr_To_Absl_Logging] Migrating from gpr to absl logging GPR_ASSERT Replacing GPR_ASSERT with absl CHECK These changes have been made using string replacement Will not be replacing all instances of CHECK with CHECK_EQ , CHECK_NE etc because there are too many callsites. Only ones which are doable using very simple regex with least chance of failure will be replaced. Given that we have 5000+ instances of GPR_ASSERT to edit, Doing it manually is too much work for both the author and reviewer. Closes #36368 COPYBARA_INTEGRATE_REVIEW=https://github.com/grpc/grpc/pull/36368 from tanvi-jagtap:tjagtap_test_02 0072bd885476d5ae72a23b2e0421fb6d286f9cb9 PiperOrigin-RevId: 626114257 --- CMakeLists.txt | 5 + build_autogenerated.yaml | 5 + test/core/tsi/BUILD | 1 + test/core/tsi/transport_security_test_lib.cc | 222 ++++++++++--------- 4 files changed, 123 insertions(+), 110 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b2bb8d2151e..bce2fd580fe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -6608,6 +6608,7 @@ target_include_directories(alts_frame_protector_test target_link_libraries(alts_frame_protector_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc_test_util ) @@ -11880,6 +11881,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(crl_ssl_transport_security_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc_test_util ) @@ -13743,6 +13745,7 @@ target_include_directories(fake_transport_security_test target_link_libraries(fake_transport_security_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc_test_util ) @@ -28423,6 +28426,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(ssl_transport_security_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc_test_util ) @@ -28468,6 +28472,7 @@ if(_gRPC_PLATFORM_LINUX OR _gRPC_PLATFORM_MAC OR _gRPC_PLATFORM_POSIX) target_link_libraries(ssl_transport_security_utils_test ${_gRPC_ALLTARGETS_LIBRARIES} gtest + absl::check grpc_test_util ) diff --git a/build_autogenerated.yaml b/build_autogenerated.yaml index aa277f8adf6..0418b6ae26a 100644 --- a/build_autogenerated.yaml +++ b/build_autogenerated.yaml @@ -5492,6 +5492,7 @@ targets: - test/core/tsi/transport_security_test_lib.cc deps: - gtest + - absl/log:check - grpc_test_util - name: alts_grpc_record_protocol_test gtest: true @@ -8476,6 +8477,7 @@ targets: - test/core/tsi/transport_security_test_lib.cc deps: - gtest + - absl/log:check - grpc_test_util platforms: - linux @@ -9476,6 +9478,7 @@ targets: - test/core/tsi/transport_security_test_lib.cc deps: - gtest + - absl/log:check - grpc_test_util - name: fd_posix_test gtest: true @@ -18302,6 +18305,7 @@ targets: - test/core/tsi/transport_security_test_lib.cc deps: - gtest + - absl/log:check - grpc_test_util platforms: - linux @@ -18318,6 +18322,7 @@ targets: - test/core/tsi/transport_security_test_lib.cc deps: - gtest + - absl/log:check - grpc_test_util platforms: - linux diff --git a/test/core/tsi/BUILD b/test/core/tsi/BUILD index fcf97c83eca..3035e3c7415 100644 --- a/test/core/tsi/BUILD +++ b/test/core/tsi/BUILD @@ -26,6 +26,7 @@ grpc_cc_library( srcs = ["transport_security_test_lib.cc"], hdrs = ["transport_security_test_lib.h"], external_deps = [ + "absl/log:check", "libssl", "libcrypto", ], diff --git a/test/core/tsi/transport_security_test_lib.cc b/test/core/tsi/transport_security_test_lib.cc index a0be6edf466..27064d65724 100644 --- a/test/core/tsi/transport_security_test_lib.cc +++ b/test/core/tsi/transport_security_test_lib.cc @@ -31,6 +31,8 @@ #include #include +#include "absl/log/check.h" + #include #include #include @@ -67,8 +69,8 @@ typedef struct handshaker_args { static handshaker_args* handshaker_args_create(tsi_test_fixture* fixture, bool is_client) { - GPR_ASSERT(fixture != nullptr); - GPR_ASSERT(fixture->config != nullptr); + CHECK_NE(fixture, nullptr); + CHECK_NE(fixture->config, nullptr); handshaker_args* args = new handshaker_args(); args->fixture = fixture; args->handshake_buffer_size = fixture->handshake_buffer_size; @@ -87,9 +89,9 @@ static void handshaker_args_destroy(handshaker_args* args) { static void do_handshaker_next(handshaker_args* args); static void setup_handshakers(tsi_test_fixture* fixture) { - GPR_ASSERT(fixture != nullptr); - GPR_ASSERT(fixture->vtable != nullptr); - GPR_ASSERT(fixture->vtable->setup_handshakers != nullptr); + CHECK_NE(fixture, nullptr); + CHECK_NE(fixture->vtable, nullptr); + CHECK_NE(fixture->vtable->setup_handshakers, nullptr); fixture->vtable->setup_handshakers(fixture); } @@ -102,20 +104,20 @@ static void check_unused_bytes(tsi_test_fixture* fixture) { : fixture->server_result; const unsigned char* bytes = nullptr; size_t bytes_size = 0; - GPR_ASSERT(tsi_handshaker_result_get_unused_bytes( - result_with_unused_bytes, &bytes, &bytes_size) == TSI_OK); - GPR_ASSERT(bytes_size == strlen(TSI_TEST_UNUSED_BYTES)); - GPR_ASSERT(memcmp(bytes, TSI_TEST_UNUSED_BYTES, bytes_size) == 0); - GPR_ASSERT(tsi_handshaker_result_get_unused_bytes( - result_without_unused_bytes, &bytes, &bytes_size) == TSI_OK); - GPR_ASSERT(bytes_size == 0); - GPR_ASSERT(bytes == nullptr); + CHECK(tsi_handshaker_result_get_unused_bytes(result_with_unused_bytes, &bytes, + &bytes_size) == TSI_OK); + CHECK_EQ(bytes_size, strlen(TSI_TEST_UNUSED_BYTES)); + CHECK_EQ(memcmp(bytes, TSI_TEST_UNUSED_BYTES, bytes_size), 0); + CHECK(tsi_handshaker_result_get_unused_bytes(result_without_unused_bytes, + &bytes, &bytes_size) == TSI_OK); + CHECK_EQ(bytes_size, 0u); + CHECK_EQ(bytes, nullptr); } static void check_handshake_results(tsi_test_fixture* fixture) { - GPR_ASSERT(fixture != nullptr); - GPR_ASSERT(fixture->vtable != nullptr); - GPR_ASSERT(fixture->vtable->check_handshaker_peers != nullptr); + CHECK_NE(fixture, nullptr); + CHECK_NE(fixture->vtable, nullptr); + CHECK_NE(fixture->vtable->check_handshaker_peers, nullptr); // Check handshaker peers. fixture->vtable->check_handshaker_peers(fixture); // Check unused bytes. @@ -135,24 +137,25 @@ static void check_handshake_results(tsi_test_fixture* fixture) { static void send_bytes_to_peer(tsi_test_channel* test_channel, const unsigned char* buf, size_t buf_size, bool is_client) { - GPR_ASSERT(test_channel != nullptr); - GPR_ASSERT(buf != nullptr); + CHECK_NE(test_channel, nullptr); + CHECK_NE(buf, nullptr); uint8_t* channel = is_client ? test_channel->server_channel : test_channel->client_channel; - GPR_ASSERT(channel != nullptr); + CHECK_NE(channel, nullptr); size_t* bytes_written = is_client ? &test_channel->bytes_written_to_server_channel : &test_channel->bytes_written_to_client_channel; - GPR_ASSERT(bytes_written != nullptr); - GPR_ASSERT(*bytes_written + buf_size <= TSI_TEST_DEFAULT_CHANNEL_SIZE); + CHECK_NE(bytes_written, nullptr); + CHECK_LE(*bytes_written + buf_size, + static_cast(TSI_TEST_DEFAULT_CHANNEL_SIZE)); // Write data to channel. memcpy(channel + *bytes_written, buf, buf_size); *bytes_written += buf_size; } static void maybe_append_unused_bytes(handshaker_args* args) { - GPR_ASSERT(args != nullptr); - GPR_ASSERT(args->fixture != nullptr); + CHECK_NE(args, nullptr); + CHECK_NE(args->fixture, nullptr); tsi_test_fixture* fixture = args->fixture; if (fixture->test_unused_bytes && !args->appended_unused_bytes) { args->appended_unused_bytes = true; @@ -170,20 +173,20 @@ static void maybe_append_unused_bytes(handshaker_args* args) { static void receive_bytes_from_peer(tsi_test_channel* test_channel, unsigned char** buf, size_t* buf_size, bool is_client) { - GPR_ASSERT(test_channel != nullptr); - GPR_ASSERT(*buf != nullptr); - GPR_ASSERT(buf_size != nullptr); + CHECK_NE(test_channel, nullptr); + CHECK_NE(*buf, nullptr); + CHECK_NE(buf_size, nullptr); uint8_t* channel = is_client ? test_channel->client_channel : test_channel->server_channel; - GPR_ASSERT(channel != nullptr); + CHECK_NE(channel, nullptr); size_t* bytes_read = is_client ? &test_channel->bytes_read_from_client_channel : &test_channel->bytes_read_from_server_channel; size_t* bytes_written = is_client ? &test_channel->bytes_written_to_client_channel : &test_channel->bytes_written_to_server_channel; - GPR_ASSERT(bytes_read != nullptr); - GPR_ASSERT(bytes_written != nullptr); + CHECK_NE(bytes_read, nullptr); + CHECK_NE(bytes_written, nullptr); size_t to_read = *buf_size < *bytes_written - *bytes_read ? *buf_size : *bytes_written - *bytes_read; @@ -197,16 +200,16 @@ void tsi_test_frame_protector_send_message_to_peer( tsi_test_frame_protector_config* config, tsi_test_channel* channel, tsi_frame_protector* protector, bool is_client) { // Initialization. - GPR_ASSERT(config != nullptr); - GPR_ASSERT(channel != nullptr); - GPR_ASSERT(protector != nullptr); + CHECK_NE(config, nullptr); + CHECK_NE(channel, nullptr); + CHECK_NE(protector, nullptr); unsigned char* protected_buffer = static_cast(gpr_zalloc(config->protected_buffer_size)); size_t message_size = is_client ? config->client_message_size : config->server_message_size; uint8_t* message = is_client ? config->client_message : config->server_message; - GPR_ASSERT(message != nullptr); + CHECK_NE(message, nullptr); const unsigned char* message_bytes = reinterpret_cast(message); tsi_result result = TSI_OK; @@ -218,7 +221,7 @@ void tsi_test_frame_protector_send_message_to_peer( result = tsi_frame_protector_protect( protector, message_bytes, &processed_message_size, protected_buffer, &protected_buffer_size_to_send); - GPR_ASSERT(result == TSI_OK); + CHECK(result == TSI_OK); // Send protected data to peer. send_bytes_to_peer(channel, protected_buffer, protected_buffer_size_to_send, is_client); @@ -232,14 +235,14 @@ void tsi_test_frame_protector_send_message_to_peer( result = tsi_frame_protector_protect_flush( protector, protected_buffer, &protected_buffer_size_to_send, &still_pending_size); - GPR_ASSERT(result == TSI_OK); + CHECK(result == TSI_OK); send_bytes_to_peer(channel, protected_buffer, protected_buffer_size_to_send, is_client); } while (still_pending_size > 0 && result == TSI_OK); - GPR_ASSERT(result == TSI_OK); + CHECK(result == TSI_OK); } } - GPR_ASSERT(result == TSI_OK); + CHECK(result == TSI_OK); gpr_free(protected_buffer); } @@ -248,11 +251,11 @@ void tsi_test_frame_protector_receive_message_from_peer( tsi_frame_protector* protector, unsigned char* message, size_t* bytes_received, bool is_client) { // Initialization. - GPR_ASSERT(config != nullptr); - GPR_ASSERT(channel != nullptr); - GPR_ASSERT(protector != nullptr); - GPR_ASSERT(message != nullptr); - GPR_ASSERT(bytes_received != nullptr); + CHECK_NE(config, nullptr); + CHECK_NE(channel, nullptr); + CHECK_NE(protector, nullptr); + CHECK_NE(message, nullptr); + CHECK_NE(bytes_received, nullptr); size_t read_offset = 0; size_t message_offset = 0; size_t read_from_peer_size = 0; @@ -282,7 +285,7 @@ void tsi_test_frame_protector_receive_message_from_peer( result = tsi_frame_protector_unprotect( protector, read_buffer + read_offset, &processed_size, message_buffer, &message_buffer_size); - GPR_ASSERT(result == TSI_OK); + CHECK(result == TSI_OK); if (message_buffer_size > 0) { memcpy(message + message_offset, message_buffer, message_buffer_size); message_offset += message_buffer_size; @@ -291,9 +294,9 @@ void tsi_test_frame_protector_receive_message_from_peer( read_from_peer_size -= processed_size; } while ((read_from_peer_size > 0 || message_buffer_size > 0) && result == TSI_OK); - GPR_ASSERT(result == TSI_OK); + CHECK(result == TSI_OK); } - GPR_ASSERT(result == TSI_OK); + CHECK(result == TSI_OK); *bytes_received = message_offset; gpr_free(read_buffer); gpr_free(message_buffer); @@ -303,13 +306,13 @@ grpc_error_handle on_handshake_next_done( tsi_result result, void* user_data, const unsigned char* bytes_to_send, size_t bytes_to_send_size, tsi_handshaker_result* handshaker_result) { handshaker_args* args = static_cast(user_data); - GPR_ASSERT(args != nullptr); - GPR_ASSERT(args->fixture != nullptr); + CHECK_NE(args, nullptr); + CHECK_NE(args->fixture, nullptr); tsi_test_fixture* fixture = args->fixture; grpc_error_handle error; // Read more data if we need to. if (result == TSI_INCOMPLETE_DATA) { - GPR_ASSERT(bytes_to_send_size == 0); + CHECK_EQ(bytes_to_send_size, 0u); notification_signal(fixture); return error; } @@ -322,7 +325,7 @@ grpc_error_handle on_handshake_next_done( if (handshaker_result != nullptr) { tsi_handshaker_result** result_to_write = args->is_client ? &fixture->client_result : &fixture->server_result; - GPR_ASSERT(*result_to_write == nullptr); + CHECK_EQ(*result_to_write, nullptr); *result_to_write = handshaker_result; } // Send data to peer, if needed. @@ -347,8 +350,8 @@ static void on_handshake_next_done_wrapper( } static bool is_handshake_finished_properly(handshaker_args* args) { - GPR_ASSERT(args != nullptr); - GPR_ASSERT(args->fixture != nullptr); + CHECK_NE(args, nullptr); + CHECK_NE(args->fixture, nullptr); tsi_test_fixture* fixture = args->fixture; return (args->is_client && fixture->client_result != nullptr) || (!args->is_client && fixture->server_result != nullptr); @@ -356,8 +359,8 @@ static bool is_handshake_finished_properly(handshaker_args* args) { static void do_handshaker_next(handshaker_args* args) { // Initialization. - GPR_ASSERT(args != nullptr); - GPR_ASSERT(args->fixture != nullptr); + CHECK_NE(args, nullptr); + CHECK_NE(args->fixture, nullptr); tsi_test_fixture* fixture = args->fixture; tsi_handshaker* handshaker = args->is_client ? fixture->client_handshaker : fixture->server_handshaker; @@ -416,7 +419,7 @@ void tsi_test_do_handshake(tsi_test_fixture* fixture) { // responsible for sending the next chunk of bytes to the other. This can // happen e.g. when a bug in the handshaker code results in some bytes being // dropped instead of passed to the BIO or SSL objects. - GPR_ASSERT(client_args->transferred_data || server_args->transferred_data); + CHECK(client_args->transferred_data || server_args->transferred_data); } while (fixture->client_result == nullptr || fixture->server_result == nullptr); // Verify handshake results. @@ -430,10 +433,10 @@ static void tsi_test_do_ping_pong(tsi_test_frame_protector_config* config, tsi_test_channel* channel, tsi_frame_protector* client_frame_protector, tsi_frame_protector* server_frame_protector) { - GPR_ASSERT(config != nullptr); - GPR_ASSERT(channel != nullptr); - GPR_ASSERT(client_frame_protector != nullptr); - GPR_ASSERT(server_frame_protector != nullptr); + CHECK_NE(config, nullptr); + CHECK_NE(channel, nullptr); + CHECK_NE(client_frame_protector, nullptr); + CHECK_NE(server_frame_protector, nullptr); // Client sends a message to server. tsi_test_frame_protector_send_message_to_peer( config, channel, client_frame_protector, true /* is_client */); @@ -443,9 +446,10 @@ static void tsi_test_do_ping_pong(tsi_test_frame_protector_config* config, tsi_test_frame_protector_receive_message_from_peer( config, channel, server_frame_protector, server_received_message, &server_received_message_size, false /* is_client */); - GPR_ASSERT(config->client_message_size == server_received_message_size); - GPR_ASSERT(memcmp(config->client_message, server_received_message, - server_received_message_size) == 0); + CHECK(config->client_message_size == server_received_message_size); + CHECK_EQ(memcmp(config->client_message, server_received_message, + server_received_message_size), + 0); // Server sends a message to client. tsi_test_frame_protector_send_message_to_peer( config, channel, server_frame_protector, false /* is_client */); @@ -455,16 +459,17 @@ static void tsi_test_do_ping_pong(tsi_test_frame_protector_config* config, tsi_test_frame_protector_receive_message_from_peer( config, channel, client_frame_protector, client_received_message, &client_received_message_size, true /* is_client */); - GPR_ASSERT(config->server_message_size == client_received_message_size); - GPR_ASSERT(memcmp(config->server_message, client_received_message, - client_received_message_size) == 0); + CHECK_EQ(config->server_message_size, client_received_message_size); + CHECK_EQ(memcmp(config->server_message, client_received_message, + client_received_message_size), + 0); gpr_free(server_received_message); gpr_free(client_received_message); } void tsi_test_frame_protector_do_round_trip_no_handshake( tsi_test_frame_protector_fixture* fixture) { - GPR_ASSERT(fixture != nullptr); + CHECK_NE(fixture, nullptr); tsi_test_do_ping_pong(fixture->config, fixture->channel, fixture->client_frame_protector, fixture->server_frame_protector); @@ -472,8 +477,8 @@ void tsi_test_frame_protector_do_round_trip_no_handshake( void tsi_test_do_round_trip(tsi_test_fixture* fixture) { // Initialization. - GPR_ASSERT(fixture != nullptr); - GPR_ASSERT(fixture->config != nullptr); + CHECK_NE(fixture, nullptr); + CHECK_NE(fixture->config, nullptr); tsi_test_frame_protector_config* config = fixture->config; tsi_frame_protector* client_frame_protector = nullptr; tsi_frame_protector* server_frame_protector = nullptr; @@ -482,20 +487,20 @@ void tsi_test_do_round_trip(tsi_test_fixture* fixture) { // Create frame protectors. size_t client_max_output_protected_frame_size = config->client_max_output_protected_frame_size; - GPR_ASSERT(tsi_handshaker_result_create_frame_protector( - fixture->client_result, - client_max_output_protected_frame_size == 0 - ? nullptr - : &client_max_output_protected_frame_size, - &client_frame_protector) == TSI_OK); + CHECK(tsi_handshaker_result_create_frame_protector( + fixture->client_result, + client_max_output_protected_frame_size == 0 + ? nullptr + : &client_max_output_protected_frame_size, + &client_frame_protector) == TSI_OK); size_t server_max_output_protected_frame_size = config->server_max_output_protected_frame_size; - GPR_ASSERT(tsi_handshaker_result_create_frame_protector( - fixture->server_result, - server_max_output_protected_frame_size == 0 - ? nullptr - : &server_max_output_protected_frame_size, - &server_frame_protector) == TSI_OK); + CHECK(tsi_handshaker_result_create_frame_protector( + fixture->server_result, + server_max_output_protected_frame_size == 0 + ? nullptr + : &server_max_output_protected_frame_size, + &server_frame_protector) == TSI_OK); tsi_test_do_ping_pong(config, fixture->channel, client_frame_protector, server_frame_protector); // Destroy server and client frame protectors. @@ -576,7 +581,7 @@ void tsi_test_frame_protector_config_set_buffer_size( size_t message_buffer_allocated_size, size_t protected_buffer_size, size_t client_max_output_protected_frame_size, size_t server_max_output_protected_frame_size) { - GPR_ASSERT(config != nullptr); + CHECK_NE(config, nullptr); config->read_buffer_allocated_size = read_buffer_allocated_size; config->message_buffer_allocated_size = message_buffer_allocated_size; config->protected_buffer_size = protected_buffer_size; @@ -641,8 +646,8 @@ void tsi_test_fixture_destroy(tsi_test_fixture* fixture) { tsi_handshaker_result_destroy(fixture->client_result); tsi_handshaker_result_destroy(fixture->server_result); tsi_test_channel_destroy(fixture->channel); - GPR_ASSERT(fixture->vtable != nullptr); - GPR_ASSERT(fixture->vtable->destruct != nullptr); + CHECK_NE(fixture->vtable, nullptr); + CHECK_NE(fixture->vtable->destruct, nullptr); gpr_mu_destroy(&fixture->mu); gpr_cv_destroy(&fixture->cv); fixture->vtable->destruct(fixture); @@ -662,7 +667,7 @@ void tsi_test_frame_protector_fixture_init( tsi_test_frame_protector_fixture* fixture, tsi_frame_protector* client_frame_protector, tsi_frame_protector* server_frame_protector) { - GPR_ASSERT(fixture != nullptr); + CHECK_NE(fixture, nullptr); fixture->client_frame_protector = client_frame_protector; fixture->server_frame_protector = server_frame_protector; } @@ -683,73 +688,70 @@ std::string GenerateSelfSignedCertificate( const SelfSignedCertificateOptions& options) { // Generate an RSA keypair. BIGNUM* bignum = BN_new(); - GPR_ASSERT(BN_set_word(bignum, RSA_F4)); + CHECK(BN_set_word(bignum, RSA_F4)); BIGNUM* n = BN_new(); - GPR_ASSERT(BN_set_word(n, 2048)); + CHECK(BN_set_word(n, 2048)); EVP_PKEY* key = EVP_PKEY_new(); // Create the X509 object. X509* x509 = X509_new(); #if OPENSSL_VERSION_NUMBER < 0x30000000L RSA* rsa = RSA_new(); - GPR_ASSERT( - RSA_generate_key_ex(rsa, /*key_size=*/2048, bignum, /*cb=*/nullptr)); - GPR_ASSERT(EVP_PKEY_assign_RSA(key, rsa)); - GPR_ASSERT(X509_set_version(x509, 2)); // TODO(gtcooke94) make a const + CHECK(RSA_generate_key_ex(rsa, /*key_size=*/2048, bignum, /*cb=*/nullptr)); + CHECK(EVP_PKEY_assign_RSA(key, rsa)); + CHECK(X509_set_version(x509, 2)); // TODO(gtcooke94) make a const #else key = EVP_RSA_gen(2048); - GPR_ASSERT(X509_set_version(x509, X509_VERSION_3)); + CHECK(X509_set_version(x509, X509_VERSION_3)); #endif // Set the not_before/after fields to infinite past/future. The value for // infinite future is from RFC 5280 Section 4.1.2.5.1. ASN1_UTCTIME* infinite_past = ASN1_UTCTIME_new(); - GPR_ASSERT(ASN1_UTCTIME_set(infinite_past, /*posix_time=*/0)); + CHECK(ASN1_UTCTIME_set(infinite_past, /*posix_time=*/0)); #if OPENSSL_VERSION_NUMBER < 0x10100000 - GPR_ASSERT(X509_set_notBefore(x509, infinite_past)); + CHECK(X509_set_notBefore(x509, infinite_past)); #else - GPR_ASSERT(X509_set1_notBefore(x509, infinite_past)); + CHECK(X509_set1_notBefore(x509, infinite_past)); #endif ASN1_UTCTIME_free(infinite_past); ASN1_GENERALIZEDTIME* infinite_future = ASN1_GENERALIZEDTIME_new(); - GPR_ASSERT( - ASN1_GENERALIZEDTIME_set_string(infinite_future, "99991231235959Z")); + CHECK(ASN1_GENERALIZEDTIME_set_string(infinite_future, "99991231235959Z")); #if OPENSSL_VERSION_NUMBER < 0x10100000 - GPR_ASSERT(X509_set_notAfter(x509, infinite_future)); + CHECK(X509_set_notAfter(x509, infinite_future)); #else - GPR_ASSERT(X509_set1_notAfter(x509, infinite_future)); + CHECK(X509_set1_notAfter(x509, infinite_future)); #endif ASN1_GENERALIZEDTIME_free(infinite_future); // Set the subject DN. X509_NAME* subject_name = X509_NAME_new(); - GPR_ASSERT(X509_NAME_add_entry_by_txt( + CHECK(X509_NAME_add_entry_by_txt( subject_name, /*field=*/"CN", MBSTRING_ASC, reinterpret_cast(options.common_name.c_str()), /*len=*/-1, /*loc=*/-1, /*set=*/0)); - GPR_ASSERT(X509_NAME_add_entry_by_txt( + CHECK(X509_NAME_add_entry_by_txt( subject_name, /*field=*/"O", MBSTRING_ASC, reinterpret_cast(options.organization.c_str()), /*len=*/-1, /*loc=*/-1, /*set=*/0)); - GPR_ASSERT( - X509_NAME_add_entry_by_txt(subject_name, /*field=*/"OU", MBSTRING_ASC, - reinterpret_cast( - options.organizational_unit.c_str()), - /*len=*/-1, /*loc=*/-1, - /*set=*/0)); - GPR_ASSERT(X509_set_subject_name(x509, subject_name)); + CHECK(X509_NAME_add_entry_by_txt(subject_name, /*field=*/"OU", MBSTRING_ASC, + reinterpret_cast( + options.organizational_unit.c_str()), + /*len=*/-1, /*loc=*/-1, + /*set=*/0)); + CHECK(X509_set_subject_name(x509, subject_name)); X509_NAME_free(subject_name); // Set the public key and sign the certificate. - GPR_ASSERT(X509_set_pubkey(x509, key)); - GPR_ASSERT(X509_sign(x509, key, EVP_sha256())); + CHECK(X509_set_pubkey(x509, key)); + CHECK(X509_sign(x509, key, EVP_sha256())); // Convert to PEM. BIO* bio = BIO_new(BIO_s_mem()); - GPR_ASSERT(PEM_write_bio_X509(bio, x509)); + CHECK(PEM_write_bio_X509(bio, x509)); const uint8_t* data = nullptr; size_t len = 0; #ifdef OPENSSL_IS_BORINGSSL - GPR_ASSERT(BIO_mem_contents(bio, &data, &len)); + CHECK(BIO_mem_contents(bio, &data, &len)); #else len = BIO_get_mem_data(bio, &data); #endif