Fix tests under OpenSSL

Signed-off-by: Jonh Wendell <jwendell@redhat.com>

Author: jwendell

test/extensions/access_loggers/grpc/tcp_grpc_access_log_integration_test.cc

@@ -850,7 +850,7 @@ TEST_P(TcpGrpcAccessLogIntegrationTest, TlsHandshakeFailure_VerifyFailed) {
       downstream_local_address:
         socket_address:
           address: {0}
-      downstream_transport_failure_reason: "TLS_error:|268435581:SSL routines:OPENSSL_internal:CERTIFICATE_VERIFY_FAILED:verify cert failed: cert hash and spki:TLS_error_end"
+      downstream_transport_failure_reason: "{3}"
       access_log_type: NotSet
       downstream_direct_remote_address:
         socket_address:
@@ -872,7 +872,9 @@ TEST_P(TcpGrpcAccessLogIntegrationTest, TlsHandshakeFailure_VerifyFailed) {
 )EOF",
                                           Network::Test::getLoopbackAddressString(ipVersion()),
                                           SSL_SELECT(49199, 65535),
-                                          peer_certificate_properties)));
+                                          peer_certificate_properties,
+                                          SSL_SELECT("TLS_error:|268435581:SSL routines:OPENSSL_internal:CERTIFICATE_VERIFY_FAILED:verify cert failed: cert hash and spki:TLS_error_end",
+                                                     "TLS_error:|268435581:SSL routines:OPENSSL_internal:CERTIFICATE_VERIFY_FAILED:TLS_error_end"))));
   cleanup();
 }
 

test/extensions/filters/listener/tls_inspector/tls_inspector_test.cc

@@ -295,8 +295,8 @@ TEST_P(TlsInspectorTest, ClientHelloTooBig) {
   const std::vector<uint64_t> bytes_processed =
       store_.histogramValues("tls_inspector.bytes_processed", false);
   ASSERT_EQ(1, bytes_processed.size());
-  EXPECT_EQ("TLS_error|error:10000092:SSL "
-            "routines:OPENSSL_internal:ENCRYPTED_LENGTH_TOO_LONG:TLS_error_end",
+  EXPECT_EQ(SSL_SELECT("TLS_error|error:10000092:SSL routines:OPENSSL_internal:ENCRYPTED_LENGTH_TOO_LONG:TLS_error_end",
+                       "TLS_error|error:0A0000C6:SSL routines::packet length too long:TLS_error_end"),
             cb_.streamInfo().downstreamTransportFailureReason());
 }
 
@@ -501,7 +501,7 @@ TEST_P(TlsInspectorTest, NotSslCloseConnection) {
   ASSERT_EQ(1, bytes_processed.size());
   EXPECT_EQ(5, bytes_processed[0]);
   EXPECT_EQ(
-      "TLS_error|error:100000f7:SSL routines:OPENSSL_internal:WRONG_VERSION_NUMBER:TLS_error_end",
+      SSL_SELECT("TLS_error|error:100000f7:SSL routines:OPENSSL_internal:WRONG_VERSION_NUMBER:TLS_error_end", "TLS_error|error:0A00010B:SSL routines::wrong version number:TLS_error_end"),
       cb_.streamInfo().downstreamTransportFailureReason());
 }