This is an automated email from the ASF dual-hosted git repository.
bneradt pushed a commit to branch 9.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/9.2.x by this push:
new 3e18e87fe6 9.2.x: fix libyaml for gcc 15, and cherry-pick fedora:42
updates (#12169)
3e18e87fe6 is described below
commit 3e18e87fe6a324080dcd16f861fc1eb1f3803704
Author: Brian Neradt <[email protected]>
AuthorDate: Mon Apr 7 21:47:28 2025 -0500
9.2.x: fix libyaml for gcc 15, and cherry-pick fedora:42 updates (#12169)
* yamlcpp: fix gcc 15 build issue
We don't want to update all of yamlcpp at this time in 9.2.x. This patch
addresses the following gcc 15 build error:
```
src/emitterutils.cpp:221:11: error: 'uint16_t' was not declared in this
scope
221 | std::pair<uint16_t, uint16_t> EncodeUTF16SurrogatePair(int
codePoint) {
| ^~~~~~~~
src/emitterutils.cpp:13:1: note: 'uint16_t' is defined in header
'<cstdint>'; this is probably fixable by adding '#include <cstdint>'
12 | #include "yaml-cpp/null.h"
+++ |+#include <cstdint>
13 | #include "yaml-cpp/ostream_wrapper.h"
```
* autest updates for recent curl and nghttp2 versions (#12165)
* number_of_redirects.test.py: curl verbosity change
Change curl verbosity of number_of_redirects.test.py to -v from -vvv
since in later versions of curl, the output of -vvv no longer matches
the gold file.
* chunked_encoding_h2: make content-length search specific
Later versions of nghttp2 now include content-length headers in the
request generated by chunked_encoding_h2. Therefore the search strings
for the responses have to be more specific to look in server responses
only otherwise they see the content-length in the request and
incorrectly fail.
* compress.test.py: update for recent curl output
Recent versions of curl add a 'using HTTP/2' string to the output that
the compress.test.py test has to filter out.
* connect.test.py: accommodate curl output order changes
Recent versions of curl switch the order of the "Connected to" CONNECT
information with respect to the rest of the verbose output content. This
updates the test expectations to accommodate that.
* cripts autests updates
This allows the cripts.test.py file to work in generic environments
rather than just those that install into /tmp/ats.
* polite_hook_wait.test.py: update for recent curl output
Update the polite_hook_wait.test.py so that it can handle recent curl
output that adds a 'using HTTP/1.x' or similar strings to the output.
* test_TSHttpSsnInfo.test.py: accommodate nghttp
The latest version of nghttp2 has different output that the
test_TSHttpSsnInfo.test.py gold file has to be updated to accommodate.
This updates it so that it can work for newer and older versions of the
tool.
(cherry picked from commit 73670a3c6cf83c3eb01b9d62e15e37b3698075f7)
* Update the expired certs for autest ssl_key_dialog (#12160)
(cherry picked from commit 4eb02fd29aa1351a67880100a4f7ea2f9ad8ee69)
---------
Co-authored-by: Mo Chen <[email protected]>
---
lib/yamlcpp/src/emitterutils.cpp | 1 +
.../chunked_encoding/chunked_encoding_h2.test.py | 6 +--
tests/gold_tests/connect/connect.test.py | 2 +
.../gold_tests/connect/gold/connect_0_stderr.gold | 2 -
.../pluginTest/compress/compress.test.py | 4 +-
tests/gold_tests/pluginTest/compress/greplog.sh | 4 +-
.../redirect/number_of_redirects.test.py | 2 +-
tests/gold_tests/tls/ssl/passphrase.key | 56 +++++++++++-----------
tests/gold_tests/tls/ssl/passphrase.pem | 46 +++++++++---------
tests/gold_tests/tls/ssl/passphrase2.key | 56 +++++++++++-----------
tests/gold_tests/tls/ssl/passphrase2.pem | 46 +++++++++---------
11 files changed, 112 insertions(+), 113 deletions(-)
diff --git a/lib/yamlcpp/src/emitterutils.cpp b/lib/yamlcpp/src/emitterutils.cpp
index c6ad5e5d93..bac0458658 100644
--- a/lib/yamlcpp/src/emitterutils.cpp
+++ b/lib/yamlcpp/src/emitterutils.cpp
@@ -1,4 +1,5 @@
#include <algorithm>
+#include <cstdint>
#include <iomanip>
#include <sstream>
diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
index 32bfd7cfae..d8ef01019a 100644
--- a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
+++ b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py
@@ -62,7 +62,7 @@ tr.Processes.Default.Command = 'sh ./case1.sh {0}
{1}'.format(ts.Variables.ssl_p
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.StartBefore(Test.Processes.ts)
tr.Processes.Default.Streams.All = Testers.ExcludesExpression("RST_STREAM",
"Delayed chunk close should not cause reset")
-tr.Processes.Default.Streams.All +=
Testers.ExcludesExpression("content-length", "Should return chunked")
+tr.Processes.Default.Streams.All += Testers.ExcludesExpression("<
content-length", "Should return chunked")
tr.Processes.Default.Streams.All += Testers.ContainsExpression(":status: 200",
"Should get successful response")
tr.StillRunningAfter = ts
# No resets in the output
@@ -76,7 +76,7 @@ tr.Setup.Copy('case2.sh')
tr.Processes.Default.Command = 'sh ./case2.sh {0}
{1}'.format(ts.Variables.ssl_port, Test.Variables.upstream_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200",
"Request should succeed")
-tr.Processes.Default.Streams.All +=
Testers.ContainsExpression("content-length:", "Response should include content
length")
+tr.Processes.Default.Streams.All += Testers.ContainsExpression("<
content-length:", "Response should include content length")
server2_out = Testers.ContainsExpression("Transfer-Encoding: chunked",
"Request should be chunked encoded")
# No content-length in header
# Transfer encoding to origin, but no content-length
@@ -90,7 +90,7 @@ tr.Setup.Copy('case3.sh')
tr.Processes.Default.Command = 'sh ./case3.sh {0}
{1}'.format(ts.Variables.ssl_port, Test.Variables.upstream_port)
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.All = Testers.ContainsExpression("HTTP/2 200",
"Request should succeed")
-tr.Processes.Default.Streams.All +=
Testers.ExcludesExpression("content-length:", "Response should not include
content length")
+tr.Processes.Default.Streams.All += Testers.ExcludesExpression("<
content-length:", "Response should not include content length")
server3_out = Testers.ContainsExpression("Transfer-Encoding: chunked",
"Request should be chunked encoded")
# No content length in header
# Transfer encoding to origin, but no content-length
diff --git a/tests/gold_tests/connect/connect.test.py
b/tests/gold_tests/connect/connect.test.py
index f81fa741f1..ac120fd5af 100644
--- a/tests/gold_tests/connect/connect.test.py
+++ b/tests/gold_tests/connect/connect.test.py
@@ -86,6 +86,8 @@ logging:
tr.Processes.Default.Command = f"curl -v --fail -s -p -x
127.0.0.1:{self.ts.Variables.port} 'http://foo.com/get'"
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Streams.stderr = "gold/connect_0_stderr.gold"
+ tr.Processes.Default.Streams.stderr = Testers.ContainsExpression(
+ f'Connected to 127.0.0.1.*{self.ts.Variables.port}', 'Curl should
connect through the ATS proxy port.')
tr.Processes.Default.TimeOut = 3
self.__checkProcessAfter(tr)
diff --git a/tests/gold_tests/connect/gold/connect_0_stderr.gold
b/tests/gold_tests/connect/gold/connect_0_stderr.gold
index c114dc4cf4..e8b13580d1 100644
--- a/tests/gold_tests/connect/gold/connect_0_stderr.gold
+++ b/tests/gold_tests/connect/gold/connect_0_stderr.gold
@@ -1,6 +1,4 @@
``
-* Connected to 127.0.0.1 (127.0.0.1) port ``
-``
* Establish HTTP proxy tunnel to foo.com:80
> CONNECT foo.com:80 HTTP/1.1
> Host: foo.com:80
diff --git a/tests/gold_tests/pluginTest/compress/compress.test.py
b/tests/gold_tests/pluginTest/compress/compress.test.py
index d9a7ed163e..698dfa001c 100644
--- a/tests/gold_tests/pluginTest/compress/compress.test.py
+++ b/tests/gold_tests/pluginTest/compress/compress.test.py
@@ -191,8 +191,8 @@ tr.Processes.Default.Command = curl_post(ts, 3, "gzip")
tr = Test.AddTestRun()
tr.Processes.Default.ReturnCode = 0
tr.Processes.Default.Command = (
- r"tr -d '\r' < compress_long.log | sed 's/\(..*\)\([<>]\)/\1\n\2/' |
{0}/greplog.sh > compress_short.log").format(
- Test.TestDirectory)
+ r"tr -d '\r' < compress_long.log | sed 's/\(..*\)\([<>]\)/\1\n\2/' |
{0}/greplog.sh > compress_short.log".format(
+ Test.TestDirectory))
f = tr.Disk.File("compress_short.log")
f.Content = "compress.gold"
diff --git a/tests/gold_tests/pluginTest/compress/greplog.sh
b/tests/gold_tests/pluginTest/compress/greplog.sh
index 5148bebe69..19b9109288 100755
--- a/tests/gold_tests/pluginTest/compress/greplog.sh
+++ b/tests/gold_tests/pluginTest/compress/greplog.sh
@@ -15,7 +15,9 @@
# limitations under the License.
grep --text \
- -e 'HTTP/' \
+ -e '< HTTP/' \
+ -e '> GET' \
+ -e '> POST' \
-e '^> X-Ats-Compress-Test:' \
-e '^> Accept-Encoding:' \
-e '^< Content-' \
diff --git a/tests/gold_tests/redirect/number_of_redirects.test.py
b/tests/gold_tests/redirect/number_of_redirects.test.py
index f0e93dec39..1793ae0c6d 100644
--- a/tests/gold_tests/redirect/number_of_redirects.test.py
+++ b/tests/gold_tests/redirect/number_of_redirects.test.py
@@ -83,7 +83,7 @@ class NumberOfRedirectionsTest:
self._tr.Processes.Default.StartBefore(self._srv3)
self._tr.Processes.Default.StartBefore(self._dns)
self._tr.Processes.Default.StartBefore(self._ts)
- self._tr.Command = "curl -L -vvv a.test/ping --proxy 127.0.0.1:{0} -H
'uuid: redirect_test_1'".format(
+ self._tr.Command = "curl -L -v a.test/ping --proxy 127.0.0.1:{0} -H
'uuid: redirect_test_1'".format(
self._ts.Variables.port)
self._tr.Processes.Default.Streams.All =
f"gold/number_of_redirections_{self._numberOfRedirections}.gold"
self._tr.ReturnCode = 0
diff --git a/tests/gold_tests/tls/ssl/passphrase.key
b/tests/gold_tests/tls/ssl/passphrase.key
index 152197bf99..145b4b8733 100644
--- a/tests/gold_tests/tls/ssl/passphrase.key
+++ b/tests/gold_tests/tls/ssl/passphrase.key
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQBZQrPgU+cHs3Ls4O
-gfcPBwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIBRDrt5DRnIoEggTI
-S5O31tiNE8pgNMZ9MAoiNfGGJHcnvQcOnP/bosrxfXRVrumLzxLhpXhPREtBiIUk
-ksuPmvobWS7AcZIPD72RpCN8NZw3lTANHnN3N7HP7qgUDbXsYhT2ssuT+BQsNRhA
-y8uh0tKysVCbVNClYJvgrM2xzU7JFghaeHkJkabYJ2FKnHVRIZwkwbJWDeW0Ce/V
-r858mzdmbJGack2Rg3FT5xDAqmzUc6PWSZgBXkrOwbmHJehoWTzfMSl4uBsrFKnd
-KGHQJ6m24DP4Am79BOce6YoM1P36i56Rwo/q7LHI5AAadVSTLMaoD8gey6Ny9ZO9
-eflyKDW80wqmJxDevEhCKqOQbunogBuVfyo4dc2G4XPfwBhN4Vp+dVcfx9TBTdGo
-gxNEd8+Nr8Ihzoff6brst9iJrBx/uWkEblSQXlp1cI9qfv8w/ji4PeLJilRaHfwV
-VSr2BupIseW2GDjOOiziFvgl7Crj2kOevThunNl/IdNf8LmidUCIRJimwh38KsLx
-VyG8+VFpISnkgPd89S9UEUpmUJi5hshmqpWZXLSuYUrYPucqJSKJHpqPdzcTBWg3
-kH/82T5VCYWJ/lfsl7HcfZHxfeng8636ZYZsXMwUpX3mHEGA08fuUROuekN9konO
-xXxvmtmWZcyJz+eVHCL+gqyP4ecfOmkvIVin2mXSneA420lmxyzY36pox4iZbqm3
-a8NpmUd+envWlJjq7dCHIsGjBfFr3hGyjDsE3ZRuoMnGGVbwM98Nrkw5bsKWUfXQ
-N3PZFZKQT/cXxpUIW/g7TLXFmP4I7o2NycV/84/vfX2tlh6nFk67JdgX54m2Et9n
-M8RMNb6gU8AWfZY2kDaDd44Qx/i/7huNsEmJ5u4ze0+GoN3R+Bj6fbEKqar/SP2v
-9or8yK64+A1ZHXUf6W12n9VBFsALqDIbHKxRfWiYfLv2eTnpGtxzicGp1OZMBWD4
-b1wpzGz5QjkQ3OC8zNRqSmynIJcnTSviJbAlHBSogUmOK/NAeSe8OIznpAUCHzGU
-zZylmM/2O1Fpf75iuqOL6flPGbXoT5IRirmP5KevJWbadBX3O5DPP2irjO+RiGf9
-0NdbLNvZh5WWUXycjUbnS36uzPiBKD+ZclgqZBH1UYPg26/p4hR1m3cCswg1AbsL
-lwjF+8w73ULHSF5VsSAa9U7QZ1DiJXFzaOyCDuCBlzFYc9v1A+kYrQVpZ1fsSubd
-k14BbrDlOuSfYWL8jpRg3RBBh41zCXa297fFG0GtqVVYG90Ij2za5od+fy/Q/W1I
-SJYuZndyIpf1hvGfVwRCPKcXIr7mf+//SPHBKJe5aHrpVDznEpswG3Tjcz+qM7OZ
-qZG4mfNUNUa6xWcVFSdZfXRszXzJdY0N3P2JFolpmJO3oDkbZoa63ILtTf355S9Z
-UVMTwX1QxGsKFG0jz92s474R2Z58A7TyRiZLQw+JxiaIDCVxaW73tr+/pCjqQwkW
-RT3iHNd/BeQnbl3RV8o+jE6wKMz10mulml7yq38vmyjHtBMSwPZz668T6lb161ti
-vMh/B4/bQu22DRpdtQS3B5h3XATJ7bkoG+hQUHzowz0jiK93ICZumpCYBu5V58nr
-QsIKSU9+bBOlU8y28KJgNuALBZgSZ/fs
+MIIFNTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQQwiEZUeedUSaoAwvi
+LdxQMAICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEBD5CJSkgpaLtyah
+i4SHItIEggTQPIlGK9Ey2ypm48oToERyi+QbkkEW8g06GSkMQedJu0kfkO3J+2nL
+HeVxczxOReo3Sy43FigduAyJQPSykk/DXJMEbdaHAX3kR/Lq5DfiUv+esU8GUMBP
+nccVq6V838gFTQdlftLaZG7yK8vQe9FX+lo8BPzzzO6uE4S+WtEvS/BD7Al7BU8H
+ZltVfK7/XMvbsU7O1/GCzoLWXw1fcTtqmfUDFQR97nXfvFxG1sS72rVdt8zsWozs
+yRv8BI+xncCCNbUoSBguS19S9JjcElTYeRTedvty/4rpcYEyrjMaoZFC/YO3F6Hv
+ZSqwD1fwFvjKx7R/nHJo/ZXAyT00wYfIhQMcU+uwd4cguOREsNTGDYVGXvZrC/P5
+sW/B9Rl7bTTlryTlfB/FdgIu9iAETx4Xdzi5S+1lqfMPqG2Rv82fBzQPFHDxWkzg
+GOr88GXN71cfwEcHaEb1H2Cn0kvScPT4IfEAWFZ2Ct9Pf/gyNFC3+1awzEgcitFA
+kdES7ity7z3H24T2JUEpOMqnCmA4CrsemH9vRLOfsQdkvoTnHGhjMCFD+SYYjtvB
+30Felyrj597WWtN0hKgcSFX8zjs/tHwNQtMTn3Cy+3VnMQFOBPMHfcY5CGt5HGTL
+dEZK/yfndBjHoWONTPswBeT4gpZe8ze1Vl9oa0dj6R7J8nrM0OsH66gHQlCrzj2H
+bW198IgirJ8gGbVR2kK3l2mMpUV8en5MwLpnkWRmRxouzbFuUHu/vaIIPnBpyo7H
+35DkygtniZU5bA/3H8sjoguMUO3VY7sWZbKwKVDsYgybFejMm2wdEGOQdsud3DUi
+O7FroEGKw4bvG1Gag2hOVkgonyW4SmKBPNezcfYibEkLFdyqr9Z6DEboUJ2CmquM
+vTNLamD8uGsFLBx1Xv9NrylU0+7d+XafIEMntgklKrEF7c+M/oNblzxc6/UFNhvv
+ITDKsbgtvGsSuIUx/BwasIW6Sv0KgUVupeeKif8amyj7TMPncn0IjncsR/SAlY+T
+pq1rtL0AjZhW4PQqoTptvt0a/aiLCRbuHGRrs1dkWJglYlZ/68ontYgcGS0a/YMw
+OBoO89sdJppWP7ssD2QYEi5aix8iw6CZGSyIleCMAW1BL0EvNEHTuOG50YXKlL4W
+YpKjTo0Y2tdBKD35b1a3HYRHHYRm0mg8S8d63KL+Ix8djaU02swkOjpditQJA6tW
+4kz/+mm3oA1N3o5iLSu6p2A+EbJ5F160xgaYWa1nXmldvrB5I2v1e3d7+K42ufCx
+G9nCx20kDhQsVU1L8hmCEauGVj2EQizVqhGrwVpFhF8ZdFEYawOpvTkEcEkMxY8a
+I/zZeURNjR37FaTLTMEUDkpC1rNttykooT69RGCv2nhceLy856WAFupCNh47kA1f
+lb0uVud+69jG4je1vg0R64sudeebIorzP8F0zpY1fGmUvXVFu9TwPf2BQIqZUAXT
+GBJ1pSR9XKGifBhM7l5Yb5dXrYYj2F/AmrTLjC8GqvyOIvAHX+ueyms51QCuaE88
+JpOAvRZqF+uXF99+L+7VrCA/SfvYbv7lYNlImyNWDy/FDov/VHZl31DbRtwAF9my
+YviImOaN6FWzDSDx8afGeAp6a3M1LUxA0vx0qjYifmXSwzBrViSGrOI=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/passphrase.pem
b/tests/gold_tests/tls/ssl/passphrase.pem
index 8d9ea6b746..78fd8d3701 100644
--- a/tests/gold_tests/tls/ssl/passphrase.pem
+++ b/tests/gold_tests/tls/ssl/passphrase.pem
@@ -1,27 +1,25 @@
-----BEGIN CERTIFICATE-----
-MIIEfjCCAmagAwIBAgIUWqf2OgjUkTeH4qDkqxeaeOA9EVIwDQYJKoZIhvcNAQEL
+MIIEOzCCAiOgAwIBAgIUDXbvS+8Qz1gWOqO0q3gNSIdglJ8wDQYJKoZIhvcNAQEL
BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
-MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yNDA0
-MDIyMTU5MzNaFw0yNTA0MDIyMTU5MzNaMFoxCzAJBgNVBAYTAkFVMRMwEQYDVQQI
-DApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQx
-EzARBgNVBAMMCnBhc3NwaHJhc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDRSJlZF7fVu/8etpbSYDbPL0m2Q8DHKfwinK6nqbbF7OWbQoCeHpaEppyk
-9iQ/eIPCtnDD0rdA1cC9DwdOfaeaBhjXy2OaLrJGaeTUhhNcLhSwbfX26dKn5EEi
-B5bRaEruKsh/MmmSe691TT6kEfpFQCK4WO9B9UXejEtI7NZ4wskaO38UjVEYLguW
-wJ25mnzWQpjhYWR2G1+2Q3SCtZ82cXKJTQWuOPJHmJ5FjQQpldFJg0PKf6zAY9Vr
-vkggeHiLwNKTk5R+975EB9fLoV3R69zkqf2NoMVDTvG9jd974haT/iRO9fy2pGXt
-ACaxoYoVEyUbbZd9i9aR3gmczqEFAgMBAAGjQjBAMB0GA1UdDgQWBBRRijjaYGCs
-ZE5bO2i7l5JA+nlGtDAfBgNVHSMEGDAWgBS8vY4PSrVikT05kO3dCxqr9MMboTAN
-BgkqhkiG9w0BAQsFAAOCAgEAX2O9IBogwv+338jsvXb+ZVwHLUHFkXugqXNEI8hm
-A9JFcqHwsVfOJmYGuAEjGReyjzfZou5YuzPT14VvF+wnJPA6/PbWrAKxoioq4pho
-2/LRQSqe4O+T+QcSX32Nsu8h5bnv6i9MSAAWltErhOTmQkWEqYIzCh86YuHloBll
-txVJ/KvWu4xetHREo1OILV5w2a5jZ7AhTqe/Yx9NmRSvQIt4MRp4DBPS8nNaUwak
-3rgJV8QCIFk4+S1FqSb+4t5O7VQh4aPSmsEKHkP1Km4qFtUa4BKpDTWQTjtC/c+2
-V/ja6vFJFApniTHLpsRuu7Ma8xVulHiGuNwcvlgBtDcRAzdLcCPHCrhHpWTkrG6p
-OnqznwwlBFmZHa8yiu8EHZbxH8hrPdf8VguNOc2sPEaskllmebl+XJlD0d3ulwQj
-g1Gv3em0/eRWBs0sTcjTX6s852QLHPeTgsn5Z+/VVOnFQ4rY/obrrmd/44QHDN2l
-SoEHGWT6KWK+bUUytkm+uGdJjElsPYj2dXftTLc0n4AraRCEKATMHrH/dx3HuNez
-YjR8oYsSQp/OpzsaYFPoid/03n66rbtLm7DSeS4SdLdnrs8f7CbEhyyZPtG8VyoI
-/YMSkidOMhgfiOdGl2JcC4JDhJCOlH6cQwxU+jxLFBomqTkX03kZNzbXdiCb3SiG
-sk8=
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAgFw0yNTA0
+MDMyMDM1NDdaGA8yMTI1MDMxMDIwMzU0N1owFTETMBEGA1UEAwwKcGFzc3BocmFz
+ZTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAKmCnYyywBDXhaQk/Xaa
+BTb0u4JOw42kZV4fRYHL52CksohT7nozuyVdaGdF2Lr5fme3mjIhvPAOmeFXyBwx
+WpBafGKWfTg/9VLGtDZKCGD+PoHfzMUWqi+x3AAu9IHRwqKYaR+39ts4RjC/KXnf
+ebKm60z4Grap7kyFHaTLum0mzsMQOEo//Vl4TbGrizyNskw7PVNBi7GcE+JEND/y
+dXOlSkFOhhsB1KVkrTaLIw9+mmT43o4XZsz9rdyX1y8hM0GMKIv7sALwYMyL4Ptk
+cwu6kbCDrw7H1qOG53jSOVdgbdvTG7YV7ZhirxccUXhgj3RYUyR3TUqGJiVf5x5k
+tR8CAwEAAaNCMEAwHQYDVR0OBBYEFA+iWK92m0E3advwzGIPosweeT4vMB8GA1Ud
+IwQYMBaAFLy9jg9KtWKRPTmQ7d0LGqv0wxuhMA0GCSqGSIb3DQEBCwUAA4ICAQAw
+OYCt2vjl1WUSFICPf6QJFGnwtF1zkqpEvjjh3XUh8+TfP2mi57sq5mCqYx/37diZ
+HLWi1uOxQY1Dd3oihngP0W0QHZpP7FoRfWAUd06cq13uLE+H6z2Ee+oEKKyOnaRo
++mTfXwBHPEREE2LZX3sGn9nO7notSMXBVEbsDzyBYu9V0+98npEuqdb2n8lUvNKQ
+2Ta2L5dlQdbiBHfgCJieJGxKGClqlKhGFt0YpEqda9YduT99tCRrqUCkomzOalIk
++w8RfJ62d3ubD9/Czg4Vz8r027j0QG9kUxzeEQbSMKmFPN8X5G5OreSx1TT7I/dW
+WqoYXz5CS98naQO9yAQOoHwM8veub9kQpQ46VhoHlC2oFSI8PF2Tw/DYSypbN29L
+KIWNkZ+5UrM9tooCMzcrnNma8qY8X6wsBeUWL+v/aESi2oOmYlmIrdMrcfFepaCQ
+ibh9GJXJ/RRZttT/aRi1oxoaD4/3a+9I+P3scBIWQrxXTzdta4qdskZmSfZsY0mW
+99+8dQZw4+W/MREGoJE16aaiD06x+L3LHUqI7BQ2UUehyjrL2lO4vAfAsCqjqR2H
+J4CZKrt57alyx/MgutJcAK+3hlvROgXjg9nL6WTzNuPPh68A1k1cnucF9n+FTy+b
+kvavubFvnKIN8y324q6QS73BhkBzofOS/zjfJXFTJQ==
-----END CERTIFICATE-----
diff --git a/tests/gold_tests/tls/ssl/passphrase2.key
b/tests/gold_tests/tls/ssl/passphrase2.key
index 152197bf99..0316141cb7 100644
--- a/tests/gold_tests/tls/ssl/passphrase2.key
+++ b/tests/gold_tests/tls/ssl/passphrase2.key
@@ -1,30 +1,30 @@
-----BEGIN ENCRYPTED PRIVATE KEY-----
-MIIFJDBWBgkqhkiG9w0BBQ0wSTAxBgkqhkiG9w0BBQwwJAQQBZQrPgU+cHs3Ls4O
-gfcPBwICCAAwDAYIKoZIhvcNAgkFADAUBggqhkiG9w0DBwQIBRDrt5DRnIoEggTI
-S5O31tiNE8pgNMZ9MAoiNfGGJHcnvQcOnP/bosrxfXRVrumLzxLhpXhPREtBiIUk
-ksuPmvobWS7AcZIPD72RpCN8NZw3lTANHnN3N7HP7qgUDbXsYhT2ssuT+BQsNRhA
-y8uh0tKysVCbVNClYJvgrM2xzU7JFghaeHkJkabYJ2FKnHVRIZwkwbJWDeW0Ce/V
-r858mzdmbJGack2Rg3FT5xDAqmzUc6PWSZgBXkrOwbmHJehoWTzfMSl4uBsrFKnd
-KGHQJ6m24DP4Am79BOce6YoM1P36i56Rwo/q7LHI5AAadVSTLMaoD8gey6Ny9ZO9
-eflyKDW80wqmJxDevEhCKqOQbunogBuVfyo4dc2G4XPfwBhN4Vp+dVcfx9TBTdGo
-gxNEd8+Nr8Ihzoff6brst9iJrBx/uWkEblSQXlp1cI9qfv8w/ji4PeLJilRaHfwV
-VSr2BupIseW2GDjOOiziFvgl7Crj2kOevThunNl/IdNf8LmidUCIRJimwh38KsLx
-VyG8+VFpISnkgPd89S9UEUpmUJi5hshmqpWZXLSuYUrYPucqJSKJHpqPdzcTBWg3
-kH/82T5VCYWJ/lfsl7HcfZHxfeng8636ZYZsXMwUpX3mHEGA08fuUROuekN9konO
-xXxvmtmWZcyJz+eVHCL+gqyP4ecfOmkvIVin2mXSneA420lmxyzY36pox4iZbqm3
-a8NpmUd+envWlJjq7dCHIsGjBfFr3hGyjDsE3ZRuoMnGGVbwM98Nrkw5bsKWUfXQ
-N3PZFZKQT/cXxpUIW/g7TLXFmP4I7o2NycV/84/vfX2tlh6nFk67JdgX54m2Et9n
-M8RMNb6gU8AWfZY2kDaDd44Qx/i/7huNsEmJ5u4ze0+GoN3R+Bj6fbEKqar/SP2v
-9or8yK64+A1ZHXUf6W12n9VBFsALqDIbHKxRfWiYfLv2eTnpGtxzicGp1OZMBWD4
-b1wpzGz5QjkQ3OC8zNRqSmynIJcnTSviJbAlHBSogUmOK/NAeSe8OIznpAUCHzGU
-zZylmM/2O1Fpf75iuqOL6flPGbXoT5IRirmP5KevJWbadBX3O5DPP2irjO+RiGf9
-0NdbLNvZh5WWUXycjUbnS36uzPiBKD+ZclgqZBH1UYPg26/p4hR1m3cCswg1AbsL
-lwjF+8w73ULHSF5VsSAa9U7QZ1DiJXFzaOyCDuCBlzFYc9v1A+kYrQVpZ1fsSubd
-k14BbrDlOuSfYWL8jpRg3RBBh41zCXa297fFG0GtqVVYG90Ij2za5od+fy/Q/W1I
-SJYuZndyIpf1hvGfVwRCPKcXIr7mf+//SPHBKJe5aHrpVDznEpswG3Tjcz+qM7OZ
-qZG4mfNUNUa6xWcVFSdZfXRszXzJdY0N3P2JFolpmJO3oDkbZoa63ILtTf355S9Z
-UVMTwX1QxGsKFG0jz92s474R2Z58A7TyRiZLQw+JxiaIDCVxaW73tr+/pCjqQwkW
-RT3iHNd/BeQnbl3RV8o+jE6wKMz10mulml7yq38vmyjHtBMSwPZz668T6lb161ti
-vMh/B4/bQu22DRpdtQS3B5h3XATJ7bkoG+hQUHzowz0jiK93ICZumpCYBu5V58nr
-QsIKSU9+bBOlU8y28KJgNuALBZgSZ/fs
+MIIFNTBfBgkqhkiG9w0BBQ0wUjAxBgkqhkiG9w0BBQwwJAQQlXOSZRCeU+dbkyHW
+0gFB5QICCAAwDAYIKoZIhvcNAgkFADAdBglghkgBZQMEASoEEEjSPj/bU+to24MF
+qTwd1qAEggTQafkGeZkVF8oxdBjEAHZ2yVsO7M2sXF99X5/FpjmW7EhELU7/KWXM
+at6zARi48BaF7KApkBD4SqazTISI+9mJWc4+ms0VqQgqcPy3XH0rZpF9Ielgi0Pb
+9QwaPvo0qz1tg3oqf4Po804n+kMYNYWuU85b/qyagrgFuGkvmqSKOUxwB0M2wCjH
+4/KhhVxKuVExEvb5Ern1K91IQBn7ZMi4WKuhCSyZq6VGoA3zP0u9jOa9CYoshqn3
+GGSaab1kaMIigkmOyOpd6l9zNareYFuvSIPG5PBB/ShlDZd8SgWHJNYg6kDd35s7
+l3qc1k2ZtpGbzvRX23OBgT+NfvW6R7vBHOvOJlDAxYYzkOQ6LIQdznlYyFwgePsq
+bnlQ7lw77c3yaUcTxQd+PXkXflxJbq9lAvREip5ayEAV/JVn1BVNBkvXgz6gepbh
+1USUMsaFFAlwEQ/6eUbbgpWA6hPng6fgniC2ZDfZaZxqq3yAsS2kH3CV8HcEUoI9
+ejkxEmSLHU9yaqhLgesZksg+aMmmdhMUssWfCp8eJ/Czq/i6/hsWGlWdjih8N/AU
+vZo5IKplMauM1s8nf4Ijm/E/eH+w004prOucsT0eAL59PPeVBcUhFQIydAeZ4znO
+/qDo8GN+/PRKnu0+D0B34wK1c3RvTpcVOEGiXaFM9m63THoR33xmJkY/uiTaDcbm
+C8qAaMv8uo8cuuXXwUAS7IfMgCjzFGtXdGZ5D1/UZL2X0c19+nL8oiy97FDdyqYK
+lVStgv/9SSCtH8K1SBLVU7KNQANqKGAJ07VbwvvEp0cgwqnCYAfVq4Ryo1TBdvWn
+HibUL4DfQh311cpM2Th6SRllLYaTuwBErWzL8BSUjSjvUgJsRsCnl/mEvzf5CsHE
+SK8vfv/ut2KmMOKNrZwM1GDQerGIRH/2spX7uW8IpvEvXvJ4o5w+vuzNGZc4Wnbc
+eKPRUB8I3Dra9QyJ/6B6EuGbUxOnEG78MpDXMpM78zW1kk63ANvUapJ6iy334VA/
+X/UFgB2SNA22xQbA76mGRHd7v/OfwSJzpV7LZU8QL/YvbTIkYQDqxLlrep7M0Umw
+qJnkV1nH2FeDM/IOplWtuCDiS7OAqULthyZRv56XYzDW6hnVxMVfkpSzhPG5VIfZ
+Hnj1hylT7tRaIpdMA+nmPFCVtPNrAqQ8/BcyRVaw7YL+g/Rq8icywR4V9zJes8Cj
+GdnBe21F6FdY3/L+uHJbK6zbnOS53MT3OrLZbb90dU3wuJVL+DhofWBpdPysPE5L
+KEfyYEfGmNnRomKmwsfLcIlbQMeltXS8upHQO3lnYkmdtItiCHEq5aTQvpCk1gP6
+h+W8r+TZiUd17L7xGoH6UTh0yZSSYh1yNquNTurgWfkYBKiJcoBlpZcdFUf7VWTb
+lDPcPfTTBChBsJ31iXgOq/mxguVICzKACan4qADdQiaJzxrcqeb6jMzUE0PKUZcj
+T2yS/AkNuole4vhlppVuklUeyt1BjoOjRTQHnmrdKb67ZSshq9kAbWQ1tXYx2Eqb
+dg3PdQ+gs4KaY09t8qM6n5dNXM+gjNDhmprVVKCe30NR36H8u5WRsF/SGi6vIcSl
+KOue156Ok9/GpDSgCmrZLbpMOeVALSdEVce2x0/JkjpfDgd4DBt+oVc=
-----END ENCRYPTED PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/passphrase2.pem
b/tests/gold_tests/tls/ssl/passphrase2.pem
index 8d9ea6b746..b9f707444d 100644
--- a/tests/gold_tests/tls/ssl/passphrase2.pem
+++ b/tests/gold_tests/tls/ssl/passphrase2.pem
@@ -1,27 +1,25 @@
-----BEGIN CERTIFICATE-----
-MIIEfjCCAmagAwIBAgIUWqf2OgjUkTeH4qDkqxeaeOA9EVIwDQYJKoZIhvcNAQEL
+MIIEPDCCAiSgAwIBAgIUDXbvS+8Qz1gWOqO0q3gNSIdglKAwDQYJKoZIhvcNAQEL
BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
-MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yNDA0
-MDIyMTU5MzNaFw0yNTA0MDIyMTU5MzNaMFoxCzAJBgNVBAYTAkFVMRMwEQYDVQQI
-DApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0eSBMdGQx
-EzARBgNVBAMMCnBhc3NwaHJhc2UwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQDRSJlZF7fVu/8etpbSYDbPL0m2Q8DHKfwinK6nqbbF7OWbQoCeHpaEppyk
-9iQ/eIPCtnDD0rdA1cC9DwdOfaeaBhjXy2OaLrJGaeTUhhNcLhSwbfX26dKn5EEi
-B5bRaEruKsh/MmmSe691TT6kEfpFQCK4WO9B9UXejEtI7NZ4wskaO38UjVEYLguW
-wJ25mnzWQpjhYWR2G1+2Q3SCtZ82cXKJTQWuOPJHmJ5FjQQpldFJg0PKf6zAY9Vr
-vkggeHiLwNKTk5R+975EB9fLoV3R69zkqf2NoMVDTvG9jd974haT/iRO9fy2pGXt
-ACaxoYoVEyUbbZd9i9aR3gmczqEFAgMBAAGjQjBAMB0GA1UdDgQWBBRRijjaYGCs
-ZE5bO2i7l5JA+nlGtDAfBgNVHSMEGDAWgBS8vY4PSrVikT05kO3dCxqr9MMboTAN
-BgkqhkiG9w0BAQsFAAOCAgEAX2O9IBogwv+338jsvXb+ZVwHLUHFkXugqXNEI8hm
-A9JFcqHwsVfOJmYGuAEjGReyjzfZou5YuzPT14VvF+wnJPA6/PbWrAKxoioq4pho
-2/LRQSqe4O+T+QcSX32Nsu8h5bnv6i9MSAAWltErhOTmQkWEqYIzCh86YuHloBll
-txVJ/KvWu4xetHREo1OILV5w2a5jZ7AhTqe/Yx9NmRSvQIt4MRp4DBPS8nNaUwak
-3rgJV8QCIFk4+S1FqSb+4t5O7VQh4aPSmsEKHkP1Km4qFtUa4BKpDTWQTjtC/c+2
-V/ja6vFJFApniTHLpsRuu7Ma8xVulHiGuNwcvlgBtDcRAzdLcCPHCrhHpWTkrG6p
-OnqznwwlBFmZHa8yiu8EHZbxH8hrPdf8VguNOc2sPEaskllmebl+XJlD0d3ulwQj
-g1Gv3em0/eRWBs0sTcjTX6s852QLHPeTgsn5Z+/VVOnFQ4rY/obrrmd/44QHDN2l
-SoEHGWT6KWK+bUUytkm+uGdJjElsPYj2dXftTLc0n4AraRCEKATMHrH/dx3HuNez
-YjR8oYsSQp/OpzsaYFPoid/03n66rbtLm7DSeS4SdLdnrs8f7CbEhyyZPtG8VyoI
-/YMSkidOMhgfiOdGl2JcC4JDhJCOlH6cQwxU+jxLFBomqTkX03kZNzbXdiCb3SiG
-sk8=
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAgFw0yNTA0
+MDMyMDM1NThaGA8yMTI1MDMxMDIwMzU1OFowFjEUMBIGA1UEAwwLcGFzc3BocmFz
+ZTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDOvH9pOLBWrDgGTIx3
+/Pg8QMzY0iNfJLQ+kMjxvImT7QuT+Obx7JajrlU0cohaU9y6t996KiSgGvaGRojo
+bNIodog29dWRhGyGbo1AXsPCWW14CmhfRAiz07AsppkcGpwAN7ZXbN5yeZ0wSkh2
+ysVcjXspfEYkNkqWPP4w+LGnxD3ANTsNKeS1rbvtRy5QXs5qM5yM7riTGONJ+c+F
+oD8bfFRlOcrV/g4++OU7nhSwGgElKRCv1EhKBfykbZL3zV/38YKhstWF+F5YKvdY
+JXIvCr3qEjibgMOEb4d8ij25C7+J9B4gFQ2MdcPj4BKwjD3q5j6qngctU+u/1ASF
+J7oJAgMBAAGjQjBAMB0GA1UdDgQWBBQSI9YGuUg2/Da32+s0YiNDOyo4rzAfBgNV
+HSMEGDAWgBS8vY4PSrVikT05kO3dCxqr9MMboTANBgkqhkiG9w0BAQsFAAOCAgEA
+D+KMt5Dj9aR2S/DPPwzkXdyO0FF46ojv1BU4PYPk/eZwGpypDG4sgmjbzSx9Bv/k
+6bPQrKeA40wPKshX7hi5QXZcEj32bQeN5M9bRIAWwiXmX3qXdqXYNXAOT8lS60rC
+KIPSEYDFgd3ayp6zTRaF98rif+n7B16KFcLCv/5W8N4Gl3fv6Mnd27DoGnSlxEMe
+hwyFakwRIpbsYncuFv5BT/kSRQL5JMAApIrXtNuFX7ugNNI6w3kRtm+0tBiVqPai
+8aXxdVJeFbtoxIZEUnFLIaN3k6IYAmZoY6/dTwni1kkxqFBXc6YOtA7KdpO9lmly
+pVLB5uxM71rdnN9LmAxwZA+jChrmRPqq6PAacEAWo0ypQ006dLauKbf0ZIQfBtp9
+becfy5Q9NJjcIgGTDZ6PQ67/hrd0p07ukufBiJnKhSTsq4ggZFQ5yJ74mFzDZv39
+AfGDI/d2OTmRj5pev1xYAwWlTwgsdwtx5npEaiaKikxd8yu+sha37lX1uYIKZT5C
+7xXxFfvj3EIZaL/MNEup8z6+N4SC9EHjiIimD6p9mg1aaXAfA6sXlEBkpAAewqL0
+i4Xa74IFdARi2ToIiawD0Tq0sSi5IqxKNO8y9YQxW38maCSEc7LEg+DU/QqVSVYv
+ZigTKZLvKsnz/YW5hVhcaRWYnO2Ga72UHuQ5phz8wOk=
-----END CERTIFICATE-----
