diff --git a/tests/gold_tests/tls/ssl/combo-signed-foo.pem b/tests/gold_tests/tls/ssl/combo-signed-foo.pem
index e3bf4cd29f1..aea6c764d10 100644
--- a/tests/gold_tests/tls/ssl/combo-signed-foo.pem
+++ b/tests/gold_tests/tls/ssl/combo-signed-foo.pem
@@ -1,47 +1,85 @@
 -----BEGIN CERTIFICATE-----
-MIIDCzCCAnQCCQC81MtBCwmQtzANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAklMMRIwEAYDVQQHEwlDaGFtcGFpZ24xDjAMBgNVBAoTBVlh
-aG9vMQ0wCwYDVQQLEwRFZGdlMSgwJgYDVQQDEx9qdWljZXByb2R1Y2UuY29ycC5u
-ZTEueWFob28uY29tMSQwIgYJKoZIhvcNAQkBFhVwZXJzaWEuYXppekB5YWhvby5j
-b20wHhcNMTgxMDE1MTU1NjMzWhcNMjgxMDEyMTU1NjMzWjByMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCSUwxEjAQBgNVBAcMCUNoYW1wYWlnbjEQMA4GA1UECgwHRXhh
-bXBsZTEQMA4GA1UEAwwHZm9vLmNvbTEeMBwGCSqGSIb3DQEJARYPYm9iQGV4YW1w
-bGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyYXjrK9KOAtE
-FXpaPL4mJfyI1r5I+GOmKI5zvxPU+R0n1sZEYpEU/F+8qrPQpa4zXGKDzTUD+b4J
-dagCHosVK22WZJXGd5BxfzF3c7mFf/7k92H1q7Dk3X23LumnR7Qa/0HNMPRkmwaa
-eNmQC8c42doWWaudV5ir3M+ef4Jv/WL5RhK877D85Ho3R+lNRini6hmmTqpFezdi
-eMypicoj88K5kf/Mu5PvYwx0F/gNsGuYGogDBnSDPGk1fl7DTQL3rKb18l+1IcMQ
-7MNHq9Bi7+LLGAq7uYRfrVHI3jgh8UpwqBAuOW9sw2RwEyy46+wCCedk3EqNZE2k
-4qwDgIh0SwIDAQABMA0GCSqGSIb3DQEBCwUAA4GBALr2gm+KgveEcTXwURM0wxJC
-m0yOR8w6MX8fxHKaekhJH1U84G64Ub0gbn2beOdLBQkG+4czLiOOOgyeukPaJJ81
-od2ooE7DrGUPGnbHYxW/70EtVF5nQEctcqpKNF/d04mVKrqI90919MJSxJ5KedHK
-2H11+gUPwDWy/mAwJzEJ
+MIIFqDCCA5CgAwIBAgIUQ8IzibYNFuyESAQtZ15ZXGjddoEwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yMTAy
+MDUyMjIxMzdaFw0zMTAyMDMyMjIxMzdaMEsxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJJTDEOMAwGA1UECgwFWWFob28xDTALBgNVBAsMBEVkZ2UxEDAOBgNVBAMMB2Zv
+by5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC3d1SPofH6gTTQ
+2/DTX0XQ6J6I0pGa+feDGvl0dye1MzKt3BsvZq30QA/q/87pu7bYkw8P40nLnsNH
+B9lgR1XwcMuU7i7psqaxXRdwl2akNz21O++5rY8YC0Nal5Fxd6lLCLQQkWlFynO4
+bBd/OOUo55mAHTrh9l97YGHY3HW2X+ykFrZpqY+DP3FQNDVoPSLW/AUj+zpy91SD
+xZhDEWy4owGuUywv79xuTSJGhgKjPJuAtL6M5Q/ElMN7JDy6J+qWegoxcUBwhTE2
+GGFt6bpoQpLME45SbVr7Ws1xijrV1zC6cK9tHtAkCzSkcd18pGTnHcTSas8H1UPL
+cf2m9/bSaqfsIT0LQu9PTklIzALeb39sqOEe8dU77ZjBHSF6LyjBJl8rFl4qcPfn
+FErOpANwtfJEklQ7Oqw7xDKKeu8oEVJn/SpjpczObFArTgWy1BwA9Ta3rNHHYQnM
++1cj4k2JHlbISfDw3aUyykDIdsbCILQTyWlCIZk0foieBRv229mfiaXXZEYjxK8u
+u5aa3UlmMb2G7zzEuM+xCPVUD97st5n4MTlaQc2dzL4LqP7W75W1ZRcEaU6eZGeO
+ElXGQfLS+ychURIg0Z9YmBwoNvvJoITA5Lhc2WzuQspz4cm8yoNkuh/xPkLB8TST
+UwCG0iXCdqANoxyx4P1dhsKC3Ggy7QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+FgQUcZcJW8zXBnFSWlOlzEDu8IVgutEwHwYDVR0jBBgwFoAUvL2OD0q1YpE9OZDt
+3Qsaq/TDG6EwDQYJKoZIhvcNAQELBQADggIBAJABxDsGXPLb19W2W/dae29LwNwh
+YJOGqF6N8JPaVRfx15dOdvF+mJAQc550C1/+GbBlBcy4ZQEeOK8Ln3UAyq70/L0G
+1yfdHo+HqHWmGFj41m7gQg96xB7XhInoWiuORTta8AyNQ5YBN3Yppk1Z1gpy17tI
+M6cD8mTPIAgG1RJYkpoXlQ7NzMCWtZWXSfng/WWIJDkkrBS/3Bukl7yj2d2UW7wd
+q4VYPGbaluoQoc1yQVFWajMAQ+WH5Gk7sqjPbxzJF2Q8xB3d71ejDnEBr6uyIDUi
+b1sb3MaprYnePkCWqnOUWSLh6XOLLY0eaEOmXaPp0lci73U20YUe31OSU6ecLMCK
+YpZ9suvFmGdtsX7Gk3PozhZmSlehGvMRMmws1E7Tda9VosfWUHs0KafSfLP4xl7v
+bLwEPcy+CIk46h2Z2fA9QEGElPNqDCFk+pgnvFDn7SzyL16z/uTNHPGwMoYqplF7
+aPI6a7NdTbOjCC2yi9zS3kAHHzR7YXSRNFMbIq3G8GL2yxc9IAq5IL7nX+61qk6D
+QwWIKG07uJi8Jh7ZUlMrIFhjMm0Rh+cQkTPctcOUIxyV26ixW8fi9sUigQN3Lvhu
+NXEn5YTDF3Ks4kjNeurNFhrlHgEIwwl4brZLjnW3JgziQwUBPQUBs/fTyC1ad7DU
+z5TnUeA80eQCbuQa
 -----END CERTIFICATE-----
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDJheOsr0o4C0QV
-elo8viYl/IjWvkj4Y6YojnO/E9T5HSfWxkRikRT8X7yqs9ClrjNcYoPNNQP5vgl1
-qAIeixUrbZZklcZ3kHF/MXdzuYV//uT3YfWrsOTdfbcu6adHtBr/Qc0w9GSbBpp4
-2ZALxzjZ2hZZq51XmKvcz55/gm/9YvlGErzvsPzkejdH6U1GKeLqGaZOqkV7N2J4
-zKmJyiPzwrmR/8y7k+9jDHQX+A2wa5gaiAMGdIM8aTV+XsNNAvespvXyX7UhwxDs
-w0er0GLv4ssYCru5hF+tUcjeOCHxSnCoEC45b2zDZHATLLjr7AIJ52TcSo1kTaTi
-rAOAiHRLAgMBAAECggEAB7fXBnAYOZlE3EW5WwY1U9MeMotLJCg83uTFzhWmXHwf
-YHxrdhL0aM4J3cfRP+cyFGG5hox3QINkvVrX6e+NugISdnu+BCpGDocIeigq0sIi
-Zs8bp524xjrgXy2XuIlPV2NfxnY1vDI+jE5Y0/qnVMCjhn+qIQa53lUdTujh/SRR
-3U7di+QMK4mdGwRnInos++ENy33A+2LqtUK8i0ERkzPFa1yMQEE4DOFPzZcW+jhK
-arvzBwPIn37PZmL5oyiQB1YiGPGt4XNfPBwACTMYM8LlYBfEBHG77k3bMtUf0WqE
-GctoT5SIe5+YbyrWkpfHgoKPxggH3I3TrFnVvqrKQQKBgQDmcV1YbuNEQLeif521
-iGqMgPQYmnpO6k27RsZrM9ikhIgm9bVJsOqnaYzQFeSfJ3eNLXYUL6IF8g46xddw
-fDBtrEjDAA9OUkNRcizbeKF+GJRMtX11d4ZNbnG1wyMZYkArZGfraZBLHPEF1pya
-2iFdVfokQCBpLmX7BMQEPePyuwKBgQDf33H9njf9oO0l9GfuWDvSoaV8GwqV9x55
-sFjggQYD/xqwEprrzr524X5Y2ZiTUpBu+kqqM8GYfm3bzBKkZU1rnjwxADUwBw8U
-L2U/Z7Id3om8tAdzHOSI9d7mxWA8uTsScMm0IFv2l/XBQo1+AAJSD03pcsabr4Lf
-SuJGmoFTsQKBgQDVzPASEC+DL5gwh75Gop5YZXwTJ5+6f+BGlM+avquNV/kKTIU6
-LY5IbMFcfjNzBicBMOCQsfDdG0rgdJYBovc7idCoOvH4dJJIimnb5fvPBfbxhKE1
-zwMn7ARL4xQ5hNKMb8eKvpJFXkCwbgE2GpNCCXbfEy/+5jFvx2gll1ZZ6QKBgG3J
-OzJ/w796irHBQLKOzI+HvAq3jCJs9KICjCNUwql1EhZkmVqooZjVDkvuMbeVlsUF
-s1XyWa852RAf7Mh38VakW6pACtVJsOhaMdG9PYkOWAeVVc3qzlwoDy6mfoJo6AIs
-E45lDBRLAzbKN28h/AFYBgJEygcRNCHirEKphGCRAoGAEhcaxbmMo2fHBYuvOR1Q
-ZAIq1EPvysDROUBHhdTJqN1wHsuJsmVJxX42+YHcZdjtgeCdjU3HMoyCnTaRxDee
-K3VeB4PobN1WpQwFklFoqcvAhW6eicdZXme7ktK120NPQsXrmjgN6Lfg3PNjosn0
-tqSxQhQ4DrSf60fxx0/M/rw=
+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
+JEBBio3QuomlZkE7TlAqoi9iDb14emNH
 -----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/combo.pem b/tests/gold_tests/tls/ssl/combo.pem
index 54420c69dcb..c7978ee5127 100644
--- a/tests/gold_tests/tls/ssl/combo.pem
+++ b/tests/gold_tests/tls/ssl/combo.pem
@@ -1,49 +1,84 @@
 -----BEGIN CERTIFICATE-----
-MIIDZDCCAkygAwIBAgIJANod1+h9CtCaMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJJTDEPMA0GA1UECgwGQXBhY2hlMRowGAYDVQQDDBFy
-YW5kb20uc2VydmVyLmNvbTAeFw0xODExMTkxNzEwMTlaFw0yODExMTYxNzEwMTla
-MEcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJJTDEPMA0GA1UECgwGQXBhY2hlMRow
-GAYDVQQDDBFyYW5kb20uc2VydmVyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJmQRdKVn5kUoWAI+lwMbf17vcG4roTm4TfyrY8eHgNXTFywmchT
-HnW+Kos/Bi6CHF8/RysfIF1egdV1b/dZfiCmIat2Iz928Ki6F6jQM9qpRQnadkpV
-iHYznujJ6K4mJ2UpvsEaR/DcdY/1NXt1XIZaiT9yjCOimposclbGD+SHYqq9QEPQ
-Ie30p3Ve+BdWYfATu8K/SPmjC/YxoTFOwVvXq5aZUuGXWA0cjZGoJfbItp5sfUO+
-1suuK3VcSuO1pJh4kT1yVVFqpPq+y8s6HIHm0D1Z9mp8Fiv8wcN5dB+tsh/7gKnd
-pOmrmCtzkicgwwfR46Tr9//i1b6erWV+zNkCAwEAAaNTMFEwHQYDVR0OBBYEFI2y
-qm0+UAChDAnLrAINeFOuyUlhMB8GA1UdIwQYMBaAFI2yqm0+UAChDAnLrAINeFOu
-yUlhMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAA3ZNFbqxcOX
-szS5A4EXCepyBJBFejEYy0CsvwQX/ai/pMrw5jqVeF0GAOTpBCVLddyY+ZV1arD2
-Pqi7Qwot9OxEZOzbCBiuMJGotruKgnWFQDHzJ9HA7KDQs270uNESAOG/xW9os9zN
-MXApzqfBSR5EIQU5L3RtaiPzoKdQenGQUOj86s0Kon7snDSUzaA2VcfstMWgGvXP
-JHtaVusULm0gry32cEap5G5UK+gII6DfLWgFwFGhHHmTz3mKjyGiJQ+09XBtu4lb
-ENE+HGRBBA49dUKSr3kwErO4HyHnS0YrsTDnbYURCsGUDma12oijX2sCos6Q4zn8
-3svaouRrucw=
+MIIFizCCA3OgAwIBAgIUPgQC3SwfRyZda+NR453wsAvIOiowDQYJKoZIhvcNAQEL
+BQAwVTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEaMBgGA1UEAwwRcmFuZG9tLnNlcnZlci5jb20wHhcNMjEw
+MjA1MjIyMTM1WhcNMzEwMjAzMjIyMTM1WjBVMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCSUwxDjAMBgNVBAoMBVlhaG9vMQ0wCwYDVQQLDARFZGdlMRowGAYDVQQDDBFy
+YW5kb20uc2VydmVyLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AKj+QcpcvqriRQnsHYPa2IAd4UiUv5rx5PtlSj9ommumBIjUR5+E/teIlXHH8AED
+mwAmbj1jhJzHVy8nuTjhwZ1t6P38WZjumi8K53wXCt0e7GnMkk/viEaQIa175+U0
+LEAb+vTtgD6hoKgYuhAreHndN/92POhKcIzHisqH1EG5d10zrvODLgX0E7IYMt7q
+zEBGTGGqsxAVexUM/Tsrdvn5iN8pYr2Wlu3U4qWu779DNfzvqBoe0gUi+cHVNvo+
+WbfFV8Zjqrs8f+AF67zi1e5rVVDUBHDoy2W2JBzc+XkFnRbRxg46z1/5UQ5W+wyu
+ty5C27BFBSwmYo7smgZut0aCoRClPEVUka9oMtAkua0QkoHgFiSjhuAIXD2gC3+B
+aq2gGcOAT3YH3GWxCullOJCvH5bQDrXf13oLReczGI1Bp6Qt30N4rAE3RAMsjLuv
+SuokbCBM3lu+Wpq6wH6K8UqrahoTtU7t2Z7gx/9I5WjzeygShOZgAFndp9fWQq20
+YJxGb5qr6xHxjLhq4dBBKVSbTm3SYtErOFg2yK3htWcz1jmXNsy7KCdR+UWZeQOD
+AGSeyrHZVPysO0ixIoUNWHXD1/92VJb5IeDByn09n8lePLJBByQwokXvUInqv5GN
+a9iHUkX2z3gNGFadXzF1P4PVnEefD+zetTalXf+1RVJFAgMBAAGjUzBRMB0GA1Ud
+DgQWBBTX5VwDCBrd4iN/isYG8dLgHOIc7DAfBgNVHSMEGDAWgBTX5VwDCBrd4iN/
+isYG8dLgHOIc7DAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAp
++GO2i9cAP5EftiwjHW92mMT14MAwWhC21ioeDOnhKJEHYf8aAgvd++v14R8XvOhM
+GnLleyxduJH5ObGG5nwAsr62f72/CJOXnPhv/uDQwLHH8G62GJydlT9WxTMumBh5
+fo3HwE3RlFT8sWtAmerYvNq3AXgWeGWmlFIzXPeDLnmX1jVWNy77IRLsiCI+FKVW
+9wS3DoVzwgb1yqdHE9uCofap6AGEi/51sqPNqmL0sEvAVLV+c/YRDjB+YmyhUx8X
+Xe5oQXTW4NauYH4lNgqnigJt7A5ZTgy/89//aZ4cpKCWkQbpvxl/Kz0lMqBra/OX
+ffRI+Buirj4PVtx2AsPDvetjwp/ykmxK+uAYqu6tx0ZmfV6DL9NPsmG7DibafMth
+4i3aSO5c4BSX1XSoma+I29vzcheC0n6WwitgB/NMhwgFXrm+g63FPETr9h9VZAuT
+EA1AZSfLXvQgAYryCWo2OJXblJiz7f3F/rmQQL6uHAAQIJMXof/Rg+/v/oaex9+h
+BZiZKZ4ILNbE6cz7oVErbF+XKiZQoCKr6mwMd5w5s2U1U4ZRDiITvqW7ikCUU+3Z
+7ZwDqjkOwJOKJtc/NwQ/n2cCH+y7o8/l+wi7LNb3pZxZjfWbPE6s6UXprlogxNlg
+ypW32zF4+uiiEIL02O2224EPQ7LeIxtspnTlrei+sQ==
 -----END CERTIFICATE-----
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCZkEXSlZ+ZFKFg
-CPpcDG39e73BuK6E5uE38q2PHh4DV0xcsJnIUx51viqLPwYughxfP0crHyBdXoHV
-dW/3WX4gpiGrdiM/dvCouheo0DPaqUUJ2nZKVYh2M57oyeiuJidlKb7BGkfw3HWP
-9TV7dVyGWok/cowjopqaLHJWxg/kh2KqvUBD0CHt9Kd1XvgXVmHwE7vCv0j5owv2
-MaExTsFb16uWmVLhl1gNHI2RqCX2yLaebH1DvtbLrit1XErjtaSYeJE9clVRaqT6
-vsvLOhyB5tA9WfZqfBYr/MHDeXQfrbIf+4Cp3aTpq5grc5InIMMH0eOk6/f/4tW+
-nq1lfszZAgMBAAECggEAYvYAqRbXRRVwca0Xel5gO2yU+tSDUw5esWlow8RK3yhR
-A6KjV9+Iz6P/UsEIwMwEcLUcrgNfHgybau5Fe4dmqq+lHxQA3xNNP869FIMoB4/x
-98mbVYgNau8VRztnAWOBG8ZtMZA4MFZCRMVm8+rL96E8tXCiMwzEyPo/rP/ymfhN
-3GRunX+GhfIA79AYNbd7HMVL+cvWWUGUF5Bc5i1wXcLy4I7b9NYtv920BeCLzSFK
-BypFB7ku/vKgTcBxe4yxThxPeXPwm4WFzGYKk/Afl1j8tVXCE2U4Y3yykfC0Qk6S
-ECZbCKLO2Rxi9fclIDZBHWuKejZhdjHfjeNvZ2vLoQKBgQDJzLmkVLvWAxgl1yvF
-U7gwqj/TzYqtVowbjEvTNEnPU1j/hIVI343SVV/EvJmif/iRUop6sRYfLsUjpMsH
-CmPysNKL3UtgSYOxLs+0xLhG4OOQRpPSf/uvl9YyWY9G3AqiC7ScthkQjEhZa4c1
-eycYy0jr42kX0OL9MuIH9q0ENQKBgQDCzvGKMs8r5E/Qd3YB9VYB60dx+6G83AHZ
-YqIelykObhCdxL9n4K+p4VKKLvgTcCOLYYIkBSWRJWR+ue3s3ey9+XWd2/q4Xvfh
-TCjAuO2ibMV+y5ClNlW0fQ/doIVWSDbjO2tZW1jh7YWZ4CtuVrsEisv1sk3KltMB
-MguhpTUylQKBgG6TfrncMFzxrx61C+gBmvEXqQffHfkjbnx94OKnSTaQ3jiNHhez
-X9v8KhD8o1bWtpay2uyl8pA9qYqBdzqxZ9kJKSW4qd/mCIJjOy87iBpWint5IPD8
-biZmldlbF9ZlJnJq5ZnlclCN/er5r8oPZHoCkj+nieOh8294nUBt25ptAoGAMnPA
-EIeaKgbmONpHgLhWPwb9KOL/f1cHT5KA5CVH58nPmdyTqcaCGCAX7Vu+ueIIApgN
-SWDf2thxT3S9zuOm5YiO0oRfSZKm5f2AbHE4ciFzgKQd4PvSdH0TN9XT0oW/WVhR
-NAI5YcHPIQvyk4/4vXNo4Uf9Z6NqIFwisQmFXoUCgYBK/ZI/HsFsvnR5MV0tFdGM
-AdNe6bsQRSZkowoaPxuWbklE4Hn6QvwEmQg3ST2O+vCQV1f1yI6YiWYoptOYscJc
-MSs/HxhhaaO5ZsiuPUO6WEPzpNb2CxuIGDDtl83VtUQyjxCmOb6pqqjwzFmZ2bsw
-JNMaBCzokrJTxknvauCuSQ==
+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
+hdu94fGFZRmgB8lbt44zfdmiFC8S9Eo=
 -----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/server.key b/tests/gold_tests/tls/ssl/server.key
index 9cdfc36aa5f..51f08e4a39a 100644
--- a/tests/gold_tests/tls/ssl/server.key
+++ b/tests/gold_tests/tls/ssl/server.key
@@ -1,28 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCZkEXSlZ+ZFKFg
-CPpcDG39e73BuK6E5uE38q2PHh4DV0xcsJnIUx51viqLPwYughxfP0crHyBdXoHV
-dW/3WX4gpiGrdiM/dvCouheo0DPaqUUJ2nZKVYh2M57oyeiuJidlKb7BGkfw3HWP
-9TV7dVyGWok/cowjopqaLHJWxg/kh2KqvUBD0CHt9Kd1XvgXVmHwE7vCv0j5owv2
-MaExTsFb16uWmVLhl1gNHI2RqCX2yLaebH1DvtbLrit1XErjtaSYeJE9clVRaqT6
-vsvLOhyB5tA9WfZqfBYr/MHDeXQfrbIf+4Cp3aTpq5grc5InIMMH0eOk6/f/4tW+
-nq1lfszZAgMBAAECggEAYvYAqRbXRRVwca0Xel5gO2yU+tSDUw5esWlow8RK3yhR
-A6KjV9+Iz6P/UsEIwMwEcLUcrgNfHgybau5Fe4dmqq+lHxQA3xNNP869FIMoB4/x
-98mbVYgNau8VRztnAWOBG8ZtMZA4MFZCRMVm8+rL96E8tXCiMwzEyPo/rP/ymfhN
-3GRunX+GhfIA79AYNbd7HMVL+cvWWUGUF5Bc5i1wXcLy4I7b9NYtv920BeCLzSFK
-BypFB7ku/vKgTcBxe4yxThxPeXPwm4WFzGYKk/Afl1j8tVXCE2U4Y3yykfC0Qk6S
-ECZbCKLO2Rxi9fclIDZBHWuKejZhdjHfjeNvZ2vLoQKBgQDJzLmkVLvWAxgl1yvF
-U7gwqj/TzYqtVowbjEvTNEnPU1j/hIVI343SVV/EvJmif/iRUop6sRYfLsUjpMsH
-CmPysNKL3UtgSYOxLs+0xLhG4OOQRpPSf/uvl9YyWY9G3AqiC7ScthkQjEhZa4c1
-eycYy0jr42kX0OL9MuIH9q0ENQKBgQDCzvGKMs8r5E/Qd3YB9VYB60dx+6G83AHZ
-YqIelykObhCdxL9n4K+p4VKKLvgTcCOLYYIkBSWRJWR+ue3s3ey9+XWd2/q4Xvfh
-TCjAuO2ibMV+y5ClNlW0fQ/doIVWSDbjO2tZW1jh7YWZ4CtuVrsEisv1sk3KltMB
-MguhpTUylQKBgG6TfrncMFzxrx61C+gBmvEXqQffHfkjbnx94OKnSTaQ3jiNHhez
-X9v8KhD8o1bWtpay2uyl8pA9qYqBdzqxZ9kJKSW4qd/mCIJjOy87iBpWint5IPD8
-biZmldlbF9ZlJnJq5ZnlclCN/er5r8oPZHoCkj+nieOh8294nUBt25ptAoGAMnPA
-EIeaKgbmONpHgLhWPwb9KOL/f1cHT5KA5CVH58nPmdyTqcaCGCAX7Vu+ueIIApgN
-SWDf2thxT3S9zuOm5YiO0oRfSZKm5f2AbHE4ciFzgKQd4PvSdH0TN9XT0oW/WVhR
-NAI5YcHPIQvyk4/4vXNo4Uf9Z6NqIFwisQmFXoUCgYBK/ZI/HsFsvnR5MV0tFdGM
-AdNe6bsQRSZkowoaPxuWbklE4Hn6QvwEmQg3ST2O+vCQV1f1yI6YiWYoptOYscJc
-MSs/HxhhaaO5ZsiuPUO6WEPzpNb2CxuIGDDtl83VtUQyjxCmOb6pqqjwzFmZ2bsw
-JNMaBCzokrJTxknvauCuSQ==
+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
+hdu94fGFZRmgB8lbt44zfdmiFC8S9Eo=
 -----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/server.pem b/tests/gold_tests/tls/ssl/server.pem
index 2b56cc83ea2..8506e58b0c8 100644
--- a/tests/gold_tests/tls/ssl/server.pem
+++ b/tests/gold_tests/tls/ssl/server.pem
@@ -1,21 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIDZDCCAkygAwIBAgIJANod1+h9CtCaMA0GCSqGSIb3DQEBCwUAMEcxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJJTDEPMA0GA1UECgwGQXBhY2hlMRowGAYDVQQDDBFy
-YW5kb20uc2VydmVyLmNvbTAeFw0xODExMTkxNzEwMTlaFw0yODExMTYxNzEwMTla
-MEcxCzAJBgNVBAYTAlVTMQswCQYDVQQIDAJJTDEPMA0GA1UECgwGQXBhY2hlMRow
-GAYDVQQDDBFyYW5kb20uc2VydmVyLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
-ADCCAQoCggEBAJmQRdKVn5kUoWAI+lwMbf17vcG4roTm4TfyrY8eHgNXTFywmchT
-HnW+Kos/Bi6CHF8/RysfIF1egdV1b/dZfiCmIat2Iz928Ki6F6jQM9qpRQnadkpV
-iHYznujJ6K4mJ2UpvsEaR/DcdY/1NXt1XIZaiT9yjCOimposclbGD+SHYqq9QEPQ
-Ie30p3Ve+BdWYfATu8K/SPmjC/YxoTFOwVvXq5aZUuGXWA0cjZGoJfbItp5sfUO+
-1suuK3VcSuO1pJh4kT1yVVFqpPq+y8s6HIHm0D1Z9mp8Fiv8wcN5dB+tsh/7gKnd
-pOmrmCtzkicgwwfR46Tr9//i1b6erWV+zNkCAwEAAaNTMFEwHQYDVR0OBBYEFI2y
-qm0+UAChDAnLrAINeFOuyUlhMB8GA1UdIwQYMBaAFI2yqm0+UAChDAnLrAINeFOu
-yUlhMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAA3ZNFbqxcOX
-szS5A4EXCepyBJBFejEYy0CsvwQX/ai/pMrw5jqVeF0GAOTpBCVLddyY+ZV1arD2
-Pqi7Qwot9OxEZOzbCBiuMJGotruKgnWFQDHzJ9HA7KDQs270uNESAOG/xW9os9zN
-MXApzqfBSR5EIQU5L3RtaiPzoKdQenGQUOj86s0Kon7snDSUzaA2VcfstMWgGvXP
-JHtaVusULm0gry32cEap5G5UK+gII6DfLWgFwFGhHHmTz3mKjyGiJQ+09XBtu4lb
-ENE+HGRBBA49dUKSr3kwErO4HyHnS0YrsTDnbYURCsGUDma12oijX2sCos6Q4zn8
-3svaouRrucw=
+MIIFizCCA3OgAwIBAgIUPgQC3SwfRyZda+NR453wsAvIOiowDQYJKoZIhvcNAQEL
+BQAwVTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEaMBgGA1UEAwwRcmFuZG9tLnNlcnZlci5jb20wHhcNMjEw
+MjA1MjIyMTM1WhcNMzEwMjAzMjIyMTM1WjBVMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCSUwxDjAMBgNVBAoMBVlhaG9vMQ0wCwYDVQQLDARFZGdlMRowGAYDVQQDDBFy
+YW5kb20uc2VydmVyLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+AKj+QcpcvqriRQnsHYPa2IAd4UiUv5rx5PtlSj9ommumBIjUR5+E/teIlXHH8AED
+mwAmbj1jhJzHVy8nuTjhwZ1t6P38WZjumi8K53wXCt0e7GnMkk/viEaQIa175+U0
+LEAb+vTtgD6hoKgYuhAreHndN/92POhKcIzHisqH1EG5d10zrvODLgX0E7IYMt7q
+zEBGTGGqsxAVexUM/Tsrdvn5iN8pYr2Wlu3U4qWu779DNfzvqBoe0gUi+cHVNvo+
+WbfFV8Zjqrs8f+AF67zi1e5rVVDUBHDoy2W2JBzc+XkFnRbRxg46z1/5UQ5W+wyu
+ty5C27BFBSwmYo7smgZut0aCoRClPEVUka9oMtAkua0QkoHgFiSjhuAIXD2gC3+B
+aq2gGcOAT3YH3GWxCullOJCvH5bQDrXf13oLReczGI1Bp6Qt30N4rAE3RAMsjLuv
+SuokbCBM3lu+Wpq6wH6K8UqrahoTtU7t2Z7gx/9I5WjzeygShOZgAFndp9fWQq20
+YJxGb5qr6xHxjLhq4dBBKVSbTm3SYtErOFg2yK3htWcz1jmXNsy7KCdR+UWZeQOD
+AGSeyrHZVPysO0ixIoUNWHXD1/92VJb5IeDByn09n8lePLJBByQwokXvUInqv5GN
+a9iHUkX2z3gNGFadXzF1P4PVnEefD+zetTalXf+1RVJFAgMBAAGjUzBRMB0GA1Ud
+DgQWBBTX5VwDCBrd4iN/isYG8dLgHOIc7DAfBgNVHSMEGDAWgBTX5VwDCBrd4iN/
+isYG8dLgHOIc7DAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAp
++GO2i9cAP5EftiwjHW92mMT14MAwWhC21ioeDOnhKJEHYf8aAgvd++v14R8XvOhM
+GnLleyxduJH5ObGG5nwAsr62f72/CJOXnPhv/uDQwLHH8G62GJydlT9WxTMumBh5
+fo3HwE3RlFT8sWtAmerYvNq3AXgWeGWmlFIzXPeDLnmX1jVWNy77IRLsiCI+FKVW
+9wS3DoVzwgb1yqdHE9uCofap6AGEi/51sqPNqmL0sEvAVLV+c/YRDjB+YmyhUx8X
+Xe5oQXTW4NauYH4lNgqnigJt7A5ZTgy/89//aZ4cpKCWkQbpvxl/Kz0lMqBra/OX
+ffRI+Buirj4PVtx2AsPDvetjwp/ykmxK+uAYqu6tx0ZmfV6DL9NPsmG7DibafMth
+4i3aSO5c4BSX1XSoma+I29vzcheC0n6WwitgB/NMhwgFXrm+g63FPETr9h9VZAuT
+EA1AZSfLXvQgAYryCWo2OJXblJiz7f3F/rmQQL6uHAAQIJMXof/Rg+/v/oaex9+h
+BZiZKZ4ILNbE6cz7oVErbF+XKiZQoCKr6mwMd5w5s2U1U4ZRDiITvqW7ikCUU+3Z
+7ZwDqjkOwJOKJtc/NwQ/n2cCH+y7o8/l+wi7LNb3pZxZjfWbPE6s6UXprlogxNlg
+ypW32zF4+uiiEIL02O2224EPQ7LeIxtspnTlrei+sQ==
 -----END CERTIFICATE-----
diff --git a/tests/gold_tests/tls/ssl/signed-bar.key b/tests/gold_tests/tls/ssl/signed-bar.key
index a95ccd619be..dc4fd6fb35f 100644
--- a/tests/gold_tests/tls/ssl/signed-bar.key
+++ b/tests/gold_tests/tls/ssl/signed-bar.key
@@ -1,28 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQDuzA6e4MZp98m/
-XuhRAZMCaq9fM5zRBDsY5fpx3zUkJwJtZa4ALk6Adusovfh3t6qYJJ47TItnNG9Z
-nAvYQhOccZNkj8xbPytuj5pQzu3CAR/IsBBWtG8O0SLRHNVOmgu3bdXuJca+3LKR
-X3qFJbReqd9OI9vGxrxKg9NPUeGpzAuUTplmfs8O70g8l0ZBJ7l/0VmsA5lUDZxV
-NjcacVYHc+ApujuLz5drVRKeLxTrtc6DksP7uruT5ZVrWbL35hoviwUilugz9ZDI
-SQl0T6cIus8CyUjs8/iJEln9AnxAZ8Muz5+pQ3G/4BsabKlEHf0+GYinXxiTMT1V
-Cr9botZ/AgMBAAECggEANwfhiq2kLAGFhcuaYCirt0/csGTVi7mc4OUG7T0SIw22
-Wn2nNrV1M9ez48S7wOMbtkoiCOpf6d3El3MFq8W2fUQTQoZ9Ar4xBR6k4mB9nErk
-BzzD1ydnvJNnoacyZRXNA22VcndUMOHtaOEG/C4vPe2J35kV6d4cwFNW3B2zkoxY
-VYyFZq+KdYgFixBQQ7kgMdUyPQiSmXsmfb5afXLUHWC6waeAwq6DYkz+UHt4fNhk
-vzknjsvpCfRDzkIAuZABbG2s2QbnjZaPgE2k3Uj5+jMymfB3vKCY/URospWQlOoT
-WbDsB5bQkwqjhp1zKyk47hFrzvsWSRxwbloHY/MhUQKBgQD9B8W6oAwQoLPKFK2J
-ydt8ax5gx5Ew+Y6pxNDfajDa0KImVhrEWbHoKmso2o6QvIETQ4Ey1noEEZTJtuDA
-9vDEC6nYRTly2VMmdEZ+vssNaPVQbGBbp6W6huKl85sU4g1J3auouyGXIGEMPwS5
-iQd+st0jzqlRp4eLBmJ4iDJnyQKBgQDxmYVhGjNUl4PehEthk/iXI2waGBSlGjUu
-LhHoyUPcn7XOdzBMdgOdK7gwA9aa7SLFZJ12F/1gTVuY3LuLEnSiHvIE5qh0G7rj
-2NRvKoLvPKkFebqU8PSU7o0Zkamo2zcGwQZOazpYKMGLWj7NQrNMvTMKGtoQJHNy
-SiQI9TIABwKBgBJ4bsagyECuenFV8RUN1yfN6fnGl6KrlO5vn4+vgMF4WV3TC0Eq
-CwKXlhr1WVLXb9SoKNY9Mcr6PZI790weupSVBWD0LK1lj9xOwJaf9tKTxtSIFMCc
-DE0Ba6oRjlCH79BkjhNTFbCifHMYZo/koNdu1xW2EEYVpJ9RZ/7EcmmBAoGASKkB
-QijdEy3WTQ/AlAIqm1nd4yMm4li1ccQNQtN1A19NEGEsN3Kut5A0fsxIuKNk97TA
-3olsfJAHYjvQc40DYtantu2f7/t/A5NsoFpKsqStuKXZhX3KMRhlezEhs1Tqga9/
-tAnvrB/lxYFIrfbHcebc+McGmiA8UD0YBVGozfUCgYBxFvVUtzMgJ/ul/RGDDiEZ
-Hijr7QqAqd9xEDBRjb3fuZUy7OLRHKTmLf5XQVmWXy37PCncoaD9Wb6Z+FNLvf+l
-HXwRL9ZgY2KFVimbYcY2BHy0ojb4axUJDe78MAxFcnZDZMZ2W5XBzHWM3F54Hezc
-I2ivPTm03ZFpA+8koiiqdw==
+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
+Ql2MmqRQAA4gxhHcxrn20XgQnjFZaMk=
 -----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signed-bar.pem b/tests/gold_tests/tls/ssl/signed-bar.pem
index e620980ed85..dbc775470c1 100644
--- a/tests/gold_tests/tls/ssl/signed-bar.pem
+++ b/tests/gold_tests/tls/ssl/signed-bar.pem
@@ -1,19 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIDDTCCAnYCCQC81MtBCwmQuDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAklMMRIwEAYDVQQHEwlDaGFtcGFpZ24xDjAMBgNVBAoTBVlh
-aG9vMQ0wCwYDVQQLEwRFZGdlMSgwJgYDVQQDEx9qdWljZXByb2R1Y2UuY29ycC5u
-ZTEueWFob28uY29tMSQwIgYJKoZIhvcNAQkBFhVwZXJzaWEuYXppekB5YWhvby5j
-b20wHhcNMTgxMDE1MTU1NzQxWhcNMjgxMDEyMTU1NzQxWjB0MQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCSUwxFDASBgNVBAcMC1NwcmluZ2ZpZWxkMRAwDgYDVQQKDAdF
-eGFtcGxlMRAwDgYDVQQDDAdiYXIuY29tMR4wHAYJKoZIhvcNAQkBFg9ib2JAZXhh
-bXBsZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDuzA6e4MZp
-98m/XuhRAZMCaq9fM5zRBDsY5fpx3zUkJwJtZa4ALk6Adusovfh3t6qYJJ47TItn
-NG9ZnAvYQhOccZNkj8xbPytuj5pQzu3CAR/IsBBWtG8O0SLRHNVOmgu3bdXuJca+
-3LKRX3qFJbReqd9OI9vGxrxKg9NPUeGpzAuUTplmfs8O70g8l0ZBJ7l/0VmsA5lU
-DZxVNjcacVYHc+ApujuLz5drVRKeLxTrtc6DksP7uruT5ZVrWbL35hoviwUilugz
-9ZDISQl0T6cIus8CyUjs8/iJEln9AnxAZ8Muz5+pQ3G/4BsabKlEHf0+GYinXxiT
-MT1VCr9botZ/AgMBAAEwDQYJKoZIhvcNAQELBQADgYEAo0i/UvFWEtNFLsNUcEmK
-ZMOidghBaQV0c8pKxzlv3HsSqccMqkvBXmShzltI+YYABfqqZTTBLSQwdAwBp1cR
-U3X5huPKN/6yk1p1KZaLasBAuxOiLPDvQY8djXXe+KSmIVeHqhTvC76SrkptPgm6
-yCX1PeYMHTv2P+0IZ3t/NW4=
+MIIFqDCCA5CgAwIBAgIUQdYSyRlW3ktm9O1wnfA5X8+JRYQwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yMTAy
+MDUyMjIxMzhaFw0zMTAyMDMyMjIxMzhaMEsxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJJTDEOMAwGA1UECgwFWWFob28xDTALBgNVBAsMBEVkZ2UxEDAOBgNVBAMMB2Jh
+ci5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDNXylirwUjia7b
+qJ/kbWTFX8wKv7g0cIk+ZhnobaVU/7nfKHpYcs2oOTX+SySCcoVBhUZCqZLjZmWG
+6A5XtIZBA9DOFCp2bJJFVwtIgJGSqsxLSh0YfmWbtAwNJsVr8m3sritfLbtJ80cR
+Bwi7dsmNohWn9zWqegPU2PkteoNvg9QvRHqthcZzMkQ91+f+JBUckqv0umxcID5m
+Vl4gulKTiJZHGcWM2r9j8Oe91+5pyCm/zpMzDslK2mQfOfLelQYGz+Hb+KwEYjB/
+0A9W4h8a8idfiI31Je35XFNnWOloSE0I2PtGDMT/oqLWgmbDxf4gHzHpPuF2TtDs
+2qo0ZtM8StG8ewenozeLQNSIzJQII7tDtX8VvLq8exx7mLq3j/CXQAsKZ39rR7DY
+qufACpmrhApLY2sz3AeAnxHcY/7JPsWZtOLlV7Qqj/54ElnOLv5jOv9spF05BCnG
+lMFL/Cm/6wyYZWLBuyRYtNWBeGo6305jQB773xOXHWbWXJHu2OIqvjmiWBsxdqqa
+Bccgbbt8bipZFJeoXBmfl74we6AmZZAzRYHWobjc3g0VqiODHTHPsu6Z+ES3xIgT
+f77fnPEkSo0SzaUsHHitBCZUjm8irbXL6NhpCIct2BQj9sEL3CUye9+GOlyTPVuO
+ysoFE9PNtNBYShb+GibuV0pHBPd3CQIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+FgQUGP0BQzJCKihsan9Nnzb3gLj+37kwHwYDVR0jBBgwFoAUvL2OD0q1YpE9OZDt
+3Qsaq/TDG6EwDQYJKoZIhvcNAQELBQADggIBAIE3Vn0iqHvAEuaYweePJwjw7mlS
+wqlsq8liTUbTwtJPkmdzKCYeU0c2RoQUTH4JH3K+rF3dNNcMX6v92S9v8vETqqup
+ZBvWOOZyhJRcot5VwMp2ST0at3bLraCUBGhAJ1fz06PXEl5Qg/4zHnSYYZU+YnQY
+iSQoh6gpxRgoE4bfOzsRqkIyDK9SpNQfZFaZUdSbjH9WYt80CIQrAMnj+EVg72At
+/9j/6xTjbuLnU7RobtGWZLossWqJ0usP1LVXwnuqhDtpdrLRn7H41JYG6I4yX9YV
+W6USuvZMYuminZPv3I9zlk6zRcAmJ7TQ5dlJmHiVWjOaLsFrvrx2asR1HDiDUeNf
+zORnsMA4yAMS4CElnamRparpDq1aiXY2bhS1ESz4iyEOCS3NfI5ZS6PvevD1uCEL
+7MboczE5UEbyfmLd6+JfpvbJahROW7z2KHWEuedaR34P7CSfsWb5u+Uv7CZKa8Ib
+ryYubEOz9ToWr7/O7/2eJZTpOAuYuVoE2UbiN4x4GUpxrS9cPh4SMIZo0IMu/InG
+/1F2Ow0J8MsC+fV77OqCH8CyMe1FHgKJnEGStTpyJqQRBEbywYE4qzE/x9pqGHrj
+lgbGYUzWOHaish2k+jvZ7Gxv8JYO01FOaxDQxT+Pz4ON5tJisdidRT5/10H4jF7k
+p0JMrHbFL1YsMjzx
 -----END CERTIFICATE-----
diff --git a/tests/gold_tests/tls/ssl/signed-bob-bar.pem b/tests/gold_tests/tls/ssl/signed-bob-bar.pem
index cca4c2fe93c..69935bd19f0 100644
--- a/tests/gold_tests/tls/ssl/signed-bob-bar.pem
+++ b/tests/gold_tests/tls/ssl/signed-bob-bar.pem
@@ -1,18 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIC2jCCAkMCCQC81MtBCwmQuTANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAklMMRIwEAYDVQQHEwlDaGFtcGFpZ24xDjAMBgNVBAoTBVlh
-aG9vMQ0wCwYDVQQLEwRFZGdlMSgwJgYDVQQDEx9qdWljZXByb2R1Y2UuY29ycC5u
-ZTEueWFob28uY29tMSQwIgYJKoZIhvcNAQkBFhVwZXJzaWEuYXppekB5YWhvby5j
-b20wHhcNMTgxMTIwMTQ1NDEyWhcNMjgxMTE3MTQ1NDEyWjBBMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCSUwxDzANBgNVBAoMBkFwYWNoZTEUMBIGA1UEAwwLYm9iLmJh
-ci5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDuzA6e4MZp98m/
-XuhRAZMCaq9fM5zRBDsY5fpx3zUkJwJtZa4ALk6Adusovfh3t6qYJJ47TItnNG9Z
-nAvYQhOccZNkj8xbPytuj5pQzu3CAR/IsBBWtG8O0SLRHNVOmgu3bdXuJca+3LKR
-X3qFJbReqd9OI9vGxrxKg9NPUeGpzAuUTplmfs8O70g8l0ZBJ7l/0VmsA5lUDZxV
-NjcacVYHc+ApujuLz5drVRKeLxTrtc6DksP7uruT5ZVrWbL35hoviwUilugz9ZDI
-SQl0T6cIus8CyUjs8/iJEln9AnxAZ8Muz5+pQ3G/4BsabKlEHf0+GYinXxiTMT1V
-Cr9botZ/AgMBAAEwDQYJKoZIhvcNAQELBQADgYEAnPW5NsSCI95ETnx9b1ZJv8wo
-EIWqxzD7Wm9CIL8gUmVGrEJpHrsfpuXEN/jKqVFxUr3d2ZI40P8BrO73BGHo2F0M
-ISDxiRSs7tR5xl5WmmErzK8TpDHU9fhkCqlblk7lzPLalIXCQ0y8qDjACBbh3tfj
-0grbVmTy66u6TxI5FTE=
+MIIFrDCCA5SgAwIBAgIUNTOeDVQcXNgSSDTKvqwzFkwkWOAwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yMTAy
+MDUyMjIxMzhaFw0zMTAyMDMyMjIxMzhaME8xCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJJTDEOMAwGA1UECgwFWWFob28xDTALBgNVBAsMBEVkZ2UxFDASBgNVBAMMC2Jv
+Yi5iYXIuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzV8pYq8F
+I4mu26if5G1kxV/MCr+4NHCJPmYZ6G2lVP+53yh6WHLNqDk1/kskgnKFQYVGQqmS
+42ZlhugOV7SGQQPQzhQqdmySRVcLSICRkqrMS0odGH5lm7QMDSbFa/Jt7K4rXy27
+SfNHEQcIu3bJjaIVp/c1qnoD1Nj5LXqDb4PUL0R6rYXGczJEPdfn/iQVHJKr9Lps
+XCA+ZlZeILpSk4iWRxnFjNq/Y/Dnvdfuacgpv86TMw7JStpkHzny3pUGBs/h2/is
+BGIwf9APVuIfGvInX4iN9SXt+VxTZ1jpaEhNCNj7RgzE/6Ki1oJmw8X+IB8x6T7h
+dk7Q7NqqNGbTPErRvHsHp6M3i0DUiMyUCCO7Q7V/Fby6vHsce5i6t4/wl0ALCmd/
+a0ew2KrnwAqZq4QKS2NrM9wHgJ8R3GP+yT7FmbTi5Ve0Ko/+eBJZzi7+Yzr/bKRd
+OQQpxpTBS/wpv+sMmGViwbskWLTVgXhqOt9OY0Ae+98Tlx1m1lyR7tjiKr45olgb
+MXaqmgXHIG27fG4qWRSXqFwZn5e+MHugJmWQM0WB1qG43N4NFaojgx0xz7LumfhE
+t8SIE3++35zxJEqNEs2lLBx4rQQmVI5vIq21y+jYaQiHLdgUI/bBC9wlMnvfhjpc
+kz1bjsrKBRPTzbTQWEoW/hom7ldKRwT3dwkCAwEAAaN7MHkwCQYDVR0TBAIwADAs
+BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+VR0OBBYEFBj9AUMyQioobGp/TZ8294C4/t+5MB8GA1UdIwQYMBaAFLy9jg9KtWKR
+PTmQ7d0LGqv0wxuhMA0GCSqGSIb3DQEBCwUAA4ICAQB3APZjiDu8FCfPsFEx51D8
+ViKz5Hu1UVQO7JzwRQ5WBcRJMCd/R5vP3Ui6JsvlzwwdH60gk7xBqbkwV/ODWc3r
+OrtexKQ5l/xLXl4y6nmA3f2BvKYq4IvNolEwIxy2FBG/AbeesPSHqtKux/6t+cIB
+I/IhRiAGRyP0EvwDmrJVAA5TDOFjlphwLgnkpMgwuhzVMjIQl0Fy6K3ZekXYpKVN
+wCT9cOxaXqn0KDSDstH+7Bom9BdcW+8czm+2fUCmbQaC1ZnmPuKmSOC5ih7CW9tV
+yK1CfLdWMa9/hBpAcMoA1Rae9UVhg9BJnhqz4cZVaAJy6SnRY8K9Q1NgPnUJGzE8
+hu39TJBI54D4Ab5CGllZvHJyzweP1BWXQ4bSkIy41L8yb9QD9gXv48Pr0B9HyBQC
+Cn88IBO6CJQT7nLn/OSXPCmDSa3Hk4Mez9DK2bwd210uJludN1ZVXAictu8GP9eg
+VnTkBcfeesEkM74hwJ+FAnrSmn/5KH4XbuC6nqOmd9lPBzVZ6717kGh2Ffbnrz+S
+3Pp2ESH2CSbY/pUt6Yf2U2Q2rTA+7peRya5rn46dbX2Cmfczrgj+hE70b6uo4gNR
+NG/exuyKcXhVLmMbfDyljef7d4IDFweIC8w0rkAcMZd29NuHwPIMG7DqZTwzUYkN
+ur3hUv6wCNA6gPxkXUvydA==
 -----END CERTIFICATE-----
diff --git a/tests/gold_tests/tls/ssl/signed-bob-foo.pem b/tests/gold_tests/tls/ssl/signed-bob-foo.pem
index 05db399165d..7570b5b9c4c 100644
--- a/tests/gold_tests/tls/ssl/signed-bob-foo.pem
+++ b/tests/gold_tests/tls/ssl/signed-bob-foo.pem
@@ -1,18 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIC2jCCAkMCCQC81MtBCwmQujANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAklMMRIwEAYDVQQHEwlDaGFtcGFpZ24xDjAMBgNVBAoTBVlh
-aG9vMQ0wCwYDVQQLEwRFZGdlMSgwJgYDVQQDEx9qdWljZXByb2R1Y2UuY29ycC5u
-ZTEueWFob28uY29tMSQwIgYJKoZIhvcNAQkBFhVwZXJzaWEuYXppekB5YWhvby5j
-b20wHhcNMTgxMTIwMTQ1NTA4WhcNMjgxMTE3MTQ1NTA4WjBBMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCSUwxDzANBgNVBAoMBkFwYWNoZTEUMBIGA1UEAwwLYm9iLmZv
-by5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDJheOsr0o4C0QV
-elo8viYl/IjWvkj4Y6YojnO/E9T5HSfWxkRikRT8X7yqs9ClrjNcYoPNNQP5vgl1
-qAIeixUrbZZklcZ3kHF/MXdzuYV//uT3YfWrsOTdfbcu6adHtBr/Qc0w9GSbBpp4
-2ZALxzjZ2hZZq51XmKvcz55/gm/9YvlGErzvsPzkejdH6U1GKeLqGaZOqkV7N2J4
-zKmJyiPzwrmR/8y7k+9jDHQX+A2wa5gaiAMGdIM8aTV+XsNNAvespvXyX7UhwxDs
-w0er0GLv4ssYCru5hF+tUcjeOCHxSnCoEC45b2zDZHATLLjr7AIJ52TcSo1kTaTi
-rAOAiHRLAgMBAAEwDQYJKoZIhvcNAQELBQADgYEAvrrtNDsSbjVhwOlAm7MFwbxp
-EUh1jYk07C6vxz7dFAcEXh33Sx4LsD0sI2TSbV5swGtPqMVTxbA+Ok6S/2lfxUeT
-h7B6GrWvHtzQdPZbkoTEyehH5fOFLchbwGbecugYLjAK9wtatDZhFnuKRq8aiqml
-GuDJPQLfKB9APLyxIbA=
+MIIFrDCCA5SgAwIBAgIUdI/V3SZNAe8vgWiamgp+0xl1aQQwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yMTAy
+MDUyMjIxMzhaFw0zMTAyMDMyMjIxMzhaME8xCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJJTDEOMAwGA1UECgwFWWFob28xDTALBgNVBAsMBEVkZ2UxFDASBgNVBAMMC2Jv
+Yi5mb28uY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAt3dUj6Hx
++oE00Nvw019F0OieiNKRmvn3gxr5dHcntTMyrdwbL2at9EAP6v/O6bu22JMPD+NJ
+y57DRwfZYEdV8HDLlO4u6bKmsV0XcJdmpDc9tTvvua2PGAtDWpeRcXepSwi0EJFp
+RcpzuGwXfzjlKOeZgB064fZfe2Bh2Nx1tl/spBa2aamPgz9xUDQ1aD0i1vwFI/s6
+cvdUg8WYQxFsuKMBrlMsL+/cbk0iRoYCozybgLS+jOUPxJTDeyQ8uifqlnoKMXFA
+cIUxNhhhbem6aEKSzBOOUm1a+1rNcYo61dcwunCvbR7QJAs0pHHdfKRk5x3E0mrP
+B9VDy3H9pvf20mqn7CE9C0LvT05JSMwC3m9/bKjhHvHVO+2YwR0hei8owSZfKxZe
+KnD35xRKzqQDcLXyRJJUOzqsO8QyinrvKBFSZ/0qY6XMzmxQK04FstQcAPU2t6zR
+x2EJzPtXI+JNiR5WyEnw8N2lMspAyHbGwiC0E8lpQiGZNH6IngUb9tvZn4ml12RG
+I8SvLruWmt1JZjG9hu88xLjPsQj1VA/e7LeZ+DE5WkHNncy+C6j+1u+VtWUXBGlO
+nmRnjhJVxkHy0vsnIVESINGfWJgcKDb7yaCEwOS4XNls7kLKc+HJvMqDZLof8T5C
+wfE0k1MAhtIlwnagDaMcseD9XYbCgtxoMu0CAwEAAaN7MHkwCQYDVR0TBAIwADAs
+BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+VR0OBBYEFHGXCVvM1wZxUlpTpcxA7vCFYLrRMB8GA1UdIwQYMBaAFLy9jg9KtWKR
+PTmQ7d0LGqv0wxuhMA0GCSqGSIb3DQEBCwUAA4ICAQCOr6jRRJuVk6fJvipZ9BdR
+CX/2+YrdAfOC2R0CH/mls4Tg4KIyV0ojSu2xLbXi37jhhK28QQ3gPoGdDXpEv3Iw
+ebjH72oRDMxO9RGNgztqpQC7L8A5nQtnZIGvEM/TpzKfoHbop7J1B/NbHKd4reTg
+4JyCHXlXmqjhsZQ07eVzujR4/rVwgL3kytQMe4a0YfHbl0y+AG0u55YR3eSOo6Fg
+sWIc9tfa7uzkoh8qzch+rqj0zGbUsxgQzTnUEcFVqjSspM4f2zI45CQvky2pe6FR
+aLa/cnP5J70H6dFVCWOJ+8olBsuzQV3jWBEMXw3A/dKAC8RF72EOCdfdXYG+x/8H
+mB+l9deZ4vM+0QtWBHPRa2MkNp3yKkyx99L8DWej59VYtBNZ5b4YGAictPe+6RFS
+XLTc69OJqkFfQG0l6Y4vKcg9l7k+cCFXVzXIweitlA05OBMYnfo9CvNmhU8aCx5A
+j1/AorPZJLNDZnyEmYICp+E+VahE59YKi017TulQrvxA3ji6eQvk4KuPFBLwi13K
+Wr0SYrRLlGcHSJ9X09Uasazz5QVvktl7UWK/kl17SiNQDPUFAq4gcgkoXmyQrHpC
+G6jYb+Ar7SCutX5+LlK/QmxjEH3sIYGYiely/I0yopaL5IKTgCUlohZqA2IuAofz
+44V6u1PpUH5xpEE+MVh/2A==
 -----END CERTIFICATE-----
diff --git a/tests/gold_tests/tls/ssl/signed-foo-ec.key b/tests/gold_tests/tls/ssl/signed-foo-ec.key
index cbf1418298c..e9016370588 100644
--- a/tests/gold_tests/tls/ssl/signed-foo-ec.key
+++ b/tests/gold_tests/tls/ssl/signed-foo-ec.key
@@ -1,8 +1,5 @@
------BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIG2eKyPB3C9Efe1s7MQm6wdbFpAsIbpovesRCIJnYMb4oAoGCCqGSM49
-AwEHoUQDQgAEpz5axf97f4X/kx6PN8nyjkx5ree8nPmRI/TB0rq3e0ldH32hCrVQ
-chq/mZzJCD3D/uuS27xJhl6t29JyABfAlw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0df37jtDQnTOn9xJ
+S50AztApRKX5aZARB0y3efPDQiihRANCAASpxn76BYsyFxh047+h8IA7IeBi8TJA
+RHAVMhUV2di/NbSpiczjsjbBIpoRbCV/Kf3IcNmsveMYsKQRWc3ecFAb
+-----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signed-foo-ec.pem b/tests/gold_tests/tls/ssl/signed-foo-ec.pem
index c6f362b0733..063f2cf2bb0 100644
--- a/tests/gold_tests/tls/ssl/signed-foo-ec.pem
+++ b/tests/gold_tests/tls/ssl/signed-foo-ec.pem
@@ -1,22 +1,28 @@
 -----BEGIN CERTIFICATE-----
-MIICHjCCAYcCCQC81MtBCwmQvDANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAklMMRIwEAYDVQQHEwlDaGFtcGFpZ24xDjAMBgNVBAoTBVlh
-aG9vMQ0wCwYDVQQLEwRFZGdlMSgwJgYDVQQDEx9qdWljZXByb2R1Y2UuY29ycC5u
-ZTEueWFob28uY29tMSQwIgYJKoZIhvcNAQkBFhVwZXJzaWEuYXppekB5YWhvby5j
-b20wHhcNMjAwMjE3MjIzOTEyWhcNMzAwMjE0MjIzOTEyWjBQMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCSUwxEjAQBgNVBAcMCUNoYW1wYWlnbjEOMAwGA1UECgwFeWFo
-b28xEDAOBgNVBAMMB2Zvby5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASn
-PlrF/3t/hf+THo83yfKOTHmt57yc+ZEj9MHSurd7SV0ffaEKtVByGr+ZnMkIPcP+
-65LbvEmGXq3b0nIAF8CXMA0GCSqGSIb3DQEBCwUAA4GBAALTvnMS/uh2BmORNzh/
-MdxfJxmgJiAPGCclJGiAdAnRAUhR0i2XlSnkFiCzxbIc8rwv84beztmeRnnLUcJK
-Qc4eSdrsHyfH3g8eFmzNW0sVDaYOiXVRReif4wQzO0mf8a3m5tBWcwBt2VucO0bL
-Qh8dytlcF7egrVhXMVGHVwzk
+MIID3TCCAcWgAwIBAgIURz5nSVzYhaLBl4WFHZ7axcOM0lswDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yMTAy
+MDUyMjIxMzlaFw0zMTAyMDMyMjIxMzlaMEsxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJJTDEOMAwGA1UECgwFWWFob28xDTALBgNVBAsMBEVkZ2UxEDAOBgNVBAMMB2Zv
+by5jb20wWTATBgcqhkjOPQIBBggqhkjOPQMBBwNCAASpxn76BYsyFxh047+h8IA7
+IeBi8TJARHAVMhUV2di/NbSpiczjsjbBIpoRbCV/Kf3IcNmsveMYsKQRWc3ecFAb
+o3sweTAJBgNVHRMEAjAAMCwGCWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRl
+ZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUqJWBB14SWgo9FT4fY3PAC60ZyhkwHwYD
+VR0jBBgwFoAUvL2OD0q1YpE9OZDt3Qsaq/TDG6EwDQYJKoZIhvcNAQELBQADggIB
+AJhgwrsfoozeXgzasHtjSdMhJxsr3J2lcdMh3yDS82U1bZtUv7bo7OzTLnD4edmJ
+ap4H0pYAQsEydW57EKjMvC0/Rr2N8mIfmw9IfVwjgyFvqGXMOAl92O2XoCCsPEbR
+qIiwMyRLO0fua/sA2LaX3cdxIUIadVVGkwHP5T52BzMlK+qDZeDc6fx45nlFqe76
+5qW3LgSPWmMMojJw5jRRddsMwb3e3LAlILJWJvXQbRIcYHfvccphSBHjQhfWzm7B
+7Ii3BVbVIAN+WSj/eZML9rZ6UuVYS921QSFXmszsA8eqVWzzN1r38wUv2FXsHDnh
+47pNKznzapGznxj0A+HihciGpeAKO/ldrs88WHYQDmbF3F0azn7SbEVrmDITh4zG
+QRLptv+ODgO8xX44wZ9Q+x9SaYuHu8R296bHOTPG/qmVXbvvFNE3533BvGW6BScl
+gwiGNU87/yI4lNFy4IqXgjnVsSyLisHsVQlAzRrKP9sByirzWq2eMjIWmjTvkqQ8
+qTWMcNrmVXRBOmn6LAFDSI9MkmtmkSTTJxG/g4Hp3HTKaIScJhJy0aMhx+GP/4QN
+C8XgtxxLKGVpuglQ84047fPqD52uBBrS+h/VyX5x2Vu0r0Eq/3nCV8G25S9+l3FC
+SlORVosWbqK0cLIBpKxEv2tF2GVWO13QAXISUS06pdiE
 -----END CERTIFICATE-----
------BEGIN EC PARAMETERS-----
-BggqhkjOPQMBBw==
------END EC PARAMETERS-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIG2eKyPB3C9Efe1s7MQm6wdbFpAsIbpovesRCIJnYMb4oAoGCCqGSM49
-AwEHoUQDQgAEpz5axf97f4X/kx6PN8nyjkx5ree8nPmRI/TB0rq3e0ldH32hCrVQ
-chq/mZzJCD3D/uuS27xJhl6t29JyABfAlw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQg0df37jtDQnTOn9xJ
+S50AztApRKX5aZARB0y3efPDQiihRANCAASpxn76BYsyFxh047+h8IA7IeBi8TJA
+RHAVMhUV2di/NbSpiczjsjbBIpoRbCV/Kf3IcNmsveMYsKQRWc3ecFAb
+-----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signed-foo.key b/tests/gold_tests/tls/ssl/signed-foo.key
index e2c7066f679..e3ac639af4e 100644
--- a/tests/gold_tests/tls/ssl/signed-foo.key
+++ b/tests/gold_tests/tls/ssl/signed-foo.key
@@ -1,28 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDJheOsr0o4C0QV
-elo8viYl/IjWvkj4Y6YojnO/E9T5HSfWxkRikRT8X7yqs9ClrjNcYoPNNQP5vgl1
-qAIeixUrbZZklcZ3kHF/MXdzuYV//uT3YfWrsOTdfbcu6adHtBr/Qc0w9GSbBpp4
-2ZALxzjZ2hZZq51XmKvcz55/gm/9YvlGErzvsPzkejdH6U1GKeLqGaZOqkV7N2J4
-zKmJyiPzwrmR/8y7k+9jDHQX+A2wa5gaiAMGdIM8aTV+XsNNAvespvXyX7UhwxDs
-w0er0GLv4ssYCru5hF+tUcjeOCHxSnCoEC45b2zDZHATLLjr7AIJ52TcSo1kTaTi
-rAOAiHRLAgMBAAECggEAB7fXBnAYOZlE3EW5WwY1U9MeMotLJCg83uTFzhWmXHwf
-YHxrdhL0aM4J3cfRP+cyFGG5hox3QINkvVrX6e+NugISdnu+BCpGDocIeigq0sIi
-Zs8bp524xjrgXy2XuIlPV2NfxnY1vDI+jE5Y0/qnVMCjhn+qIQa53lUdTujh/SRR
-3U7di+QMK4mdGwRnInos++ENy33A+2LqtUK8i0ERkzPFa1yMQEE4DOFPzZcW+jhK
-arvzBwPIn37PZmL5oyiQB1YiGPGt4XNfPBwACTMYM8LlYBfEBHG77k3bMtUf0WqE
-GctoT5SIe5+YbyrWkpfHgoKPxggH3I3TrFnVvqrKQQKBgQDmcV1YbuNEQLeif521
-iGqMgPQYmnpO6k27RsZrM9ikhIgm9bVJsOqnaYzQFeSfJ3eNLXYUL6IF8g46xddw
-fDBtrEjDAA9OUkNRcizbeKF+GJRMtX11d4ZNbnG1wyMZYkArZGfraZBLHPEF1pya
-2iFdVfokQCBpLmX7BMQEPePyuwKBgQDf33H9njf9oO0l9GfuWDvSoaV8GwqV9x55
-sFjggQYD/xqwEprrzr524X5Y2ZiTUpBu+kqqM8GYfm3bzBKkZU1rnjwxADUwBw8U
-L2U/Z7Id3om8tAdzHOSI9d7mxWA8uTsScMm0IFv2l/XBQo1+AAJSD03pcsabr4Lf
-SuJGmoFTsQKBgQDVzPASEC+DL5gwh75Gop5YZXwTJ5+6f+BGlM+avquNV/kKTIU6
-LY5IbMFcfjNzBicBMOCQsfDdG0rgdJYBovc7idCoOvH4dJJIimnb5fvPBfbxhKE1
-zwMn7ARL4xQ5hNKMb8eKvpJFXkCwbgE2GpNCCXbfEy/+5jFvx2gll1ZZ6QKBgG3J
-OzJ/w796irHBQLKOzI+HvAq3jCJs9KICjCNUwql1EhZkmVqooZjVDkvuMbeVlsUF
-s1XyWa852RAf7Mh38VakW6pACtVJsOhaMdG9PYkOWAeVVc3qzlwoDy6mfoJo6AIs
-E45lDBRLAzbKN28h/AFYBgJEygcRNCHirEKphGCRAoGAEhcaxbmMo2fHBYuvOR1Q
-ZAIq1EPvysDROUBHhdTJqN1wHsuJsmVJxX42+YHcZdjtgeCdjU3HMoyCnTaRxDee
-K3VeB4PobN1WpQwFklFoqcvAhW6eicdZXme7ktK120NPQsXrmjgN6Lfg3PNjosn0
-tqSxQhQ4DrSf60fxx0/M/rw=
+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
+JEBBio3QuomlZkE7TlAqoi9iDb14emNH
 -----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signed-foo.pem b/tests/gold_tests/tls/ssl/signed-foo.pem
index e3bf4cd29f1..aea6c764d10 100644
--- a/tests/gold_tests/tls/ssl/signed-foo.pem
+++ b/tests/gold_tests/tls/ssl/signed-foo.pem
@@ -1,47 +1,85 @@
 -----BEGIN CERTIFICATE-----
-MIIDCzCCAnQCCQC81MtBCwmQtzANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAklMMRIwEAYDVQQHEwlDaGFtcGFpZ24xDjAMBgNVBAoTBVlh
-aG9vMQ0wCwYDVQQLEwRFZGdlMSgwJgYDVQQDEx9qdWljZXByb2R1Y2UuY29ycC5u
-ZTEueWFob28uY29tMSQwIgYJKoZIhvcNAQkBFhVwZXJzaWEuYXppekB5YWhvby5j
-b20wHhcNMTgxMDE1MTU1NjMzWhcNMjgxMDEyMTU1NjMzWjByMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCSUwxEjAQBgNVBAcMCUNoYW1wYWlnbjEQMA4GA1UECgwHRXhh
-bXBsZTEQMA4GA1UEAwwHZm9vLmNvbTEeMBwGCSqGSIb3DQEJARYPYm9iQGV4YW1w
-bGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyYXjrK9KOAtE
-FXpaPL4mJfyI1r5I+GOmKI5zvxPU+R0n1sZEYpEU/F+8qrPQpa4zXGKDzTUD+b4J
-dagCHosVK22WZJXGd5BxfzF3c7mFf/7k92H1q7Dk3X23LumnR7Qa/0HNMPRkmwaa
-eNmQC8c42doWWaudV5ir3M+ef4Jv/WL5RhK877D85Ho3R+lNRini6hmmTqpFezdi
-eMypicoj88K5kf/Mu5PvYwx0F/gNsGuYGogDBnSDPGk1fl7DTQL3rKb18l+1IcMQ
-7MNHq9Bi7+LLGAq7uYRfrVHI3jgh8UpwqBAuOW9sw2RwEyy46+wCCedk3EqNZE2k
-4qwDgIh0SwIDAQABMA0GCSqGSIb3DQEBCwUAA4GBALr2gm+KgveEcTXwURM0wxJC
-m0yOR8w6MX8fxHKaekhJH1U84G64Ub0gbn2beOdLBQkG+4czLiOOOgyeukPaJJ81
-od2ooE7DrGUPGnbHYxW/70EtVF5nQEctcqpKNF/d04mVKrqI90919MJSxJ5KedHK
-2H11+gUPwDWy/mAwJzEJ
+MIIFqDCCA5CgAwIBAgIUQ8IzibYNFuyESAQtZ15ZXGjddoEwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yMTAy
+MDUyMjIxMzdaFw0zMTAyMDMyMjIxMzdaMEsxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJJTDEOMAwGA1UECgwFWWFob28xDTALBgNVBAsMBEVkZ2UxEDAOBgNVBAMMB2Zv
+by5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC3d1SPofH6gTTQ
+2/DTX0XQ6J6I0pGa+feDGvl0dye1MzKt3BsvZq30QA/q/87pu7bYkw8P40nLnsNH
+B9lgR1XwcMuU7i7psqaxXRdwl2akNz21O++5rY8YC0Nal5Fxd6lLCLQQkWlFynO4
+bBd/OOUo55mAHTrh9l97YGHY3HW2X+ykFrZpqY+DP3FQNDVoPSLW/AUj+zpy91SD
+xZhDEWy4owGuUywv79xuTSJGhgKjPJuAtL6M5Q/ElMN7JDy6J+qWegoxcUBwhTE2
+GGFt6bpoQpLME45SbVr7Ws1xijrV1zC6cK9tHtAkCzSkcd18pGTnHcTSas8H1UPL
+cf2m9/bSaqfsIT0LQu9PTklIzALeb39sqOEe8dU77ZjBHSF6LyjBJl8rFl4qcPfn
+FErOpANwtfJEklQ7Oqw7xDKKeu8oEVJn/SpjpczObFArTgWy1BwA9Ta3rNHHYQnM
++1cj4k2JHlbISfDw3aUyykDIdsbCILQTyWlCIZk0foieBRv229mfiaXXZEYjxK8u
+u5aa3UlmMb2G7zzEuM+xCPVUD97st5n4MTlaQc2dzL4LqP7W75W1ZRcEaU6eZGeO
+ElXGQfLS+ychURIg0Z9YmBwoNvvJoITA5Lhc2WzuQspz4cm8yoNkuh/xPkLB8TST
+UwCG0iXCdqANoxyx4P1dhsKC3Ggy7QIDAQABo3sweTAJBgNVHRMEAjAAMCwGCWCG
+SAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNVHQ4E
+FgQUcZcJW8zXBnFSWlOlzEDu8IVgutEwHwYDVR0jBBgwFoAUvL2OD0q1YpE9OZDt
+3Qsaq/TDG6EwDQYJKoZIhvcNAQELBQADggIBAJABxDsGXPLb19W2W/dae29LwNwh
+YJOGqF6N8JPaVRfx15dOdvF+mJAQc550C1/+GbBlBcy4ZQEeOK8Ln3UAyq70/L0G
+1yfdHo+HqHWmGFj41m7gQg96xB7XhInoWiuORTta8AyNQ5YBN3Yppk1Z1gpy17tI
+M6cD8mTPIAgG1RJYkpoXlQ7NzMCWtZWXSfng/WWIJDkkrBS/3Bukl7yj2d2UW7wd
+q4VYPGbaluoQoc1yQVFWajMAQ+WH5Gk7sqjPbxzJF2Q8xB3d71ejDnEBr6uyIDUi
+b1sb3MaprYnePkCWqnOUWSLh6XOLLY0eaEOmXaPp0lci73U20YUe31OSU6ecLMCK
+YpZ9suvFmGdtsX7Gk3PozhZmSlehGvMRMmws1E7Tda9VosfWUHs0KafSfLP4xl7v
+bLwEPcy+CIk46h2Z2fA9QEGElPNqDCFk+pgnvFDn7SzyL16z/uTNHPGwMoYqplF7
+aPI6a7NdTbOjCC2yi9zS3kAHHzR7YXSRNFMbIq3G8GL2yxc9IAq5IL7nX+61qk6D
+QwWIKG07uJi8Jh7ZUlMrIFhjMm0Rh+cQkTPctcOUIxyV26ixW8fi9sUigQN3Lvhu
+NXEn5YTDF3Ks4kjNeurNFhrlHgEIwwl4brZLjnW3JgziQwUBPQUBs/fTyC1ad7DU
+z5TnUeA80eQCbuQa
 -----END CERTIFICATE-----
 -----BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDJheOsr0o4C0QV
-elo8viYl/IjWvkj4Y6YojnO/E9T5HSfWxkRikRT8X7yqs9ClrjNcYoPNNQP5vgl1
-qAIeixUrbZZklcZ3kHF/MXdzuYV//uT3YfWrsOTdfbcu6adHtBr/Qc0w9GSbBpp4
-2ZALxzjZ2hZZq51XmKvcz55/gm/9YvlGErzvsPzkejdH6U1GKeLqGaZOqkV7N2J4
-zKmJyiPzwrmR/8y7k+9jDHQX+A2wa5gaiAMGdIM8aTV+XsNNAvespvXyX7UhwxDs
-w0er0GLv4ssYCru5hF+tUcjeOCHxSnCoEC45b2zDZHATLLjr7AIJ52TcSo1kTaTi
-rAOAiHRLAgMBAAECggEAB7fXBnAYOZlE3EW5WwY1U9MeMotLJCg83uTFzhWmXHwf
-YHxrdhL0aM4J3cfRP+cyFGG5hox3QINkvVrX6e+NugISdnu+BCpGDocIeigq0sIi
-Zs8bp524xjrgXy2XuIlPV2NfxnY1vDI+jE5Y0/qnVMCjhn+qIQa53lUdTujh/SRR
-3U7di+QMK4mdGwRnInos++ENy33A+2LqtUK8i0ERkzPFa1yMQEE4DOFPzZcW+jhK
-arvzBwPIn37PZmL5oyiQB1YiGPGt4XNfPBwACTMYM8LlYBfEBHG77k3bMtUf0WqE
-GctoT5SIe5+YbyrWkpfHgoKPxggH3I3TrFnVvqrKQQKBgQDmcV1YbuNEQLeif521
-iGqMgPQYmnpO6k27RsZrM9ikhIgm9bVJsOqnaYzQFeSfJ3eNLXYUL6IF8g46xddw
-fDBtrEjDAA9OUkNRcizbeKF+GJRMtX11d4ZNbnG1wyMZYkArZGfraZBLHPEF1pya
-2iFdVfokQCBpLmX7BMQEPePyuwKBgQDf33H9njf9oO0l9GfuWDvSoaV8GwqV9x55
-sFjggQYD/xqwEprrzr524X5Y2ZiTUpBu+kqqM8GYfm3bzBKkZU1rnjwxADUwBw8U
-L2U/Z7Id3om8tAdzHOSI9d7mxWA8uTsScMm0IFv2l/XBQo1+AAJSD03pcsabr4Lf
-SuJGmoFTsQKBgQDVzPASEC+DL5gwh75Gop5YZXwTJ5+6f+BGlM+avquNV/kKTIU6
-LY5IbMFcfjNzBicBMOCQsfDdG0rgdJYBovc7idCoOvH4dJJIimnb5fvPBfbxhKE1
-zwMn7ARL4xQ5hNKMb8eKvpJFXkCwbgE2GpNCCXbfEy/+5jFvx2gll1ZZ6QKBgG3J
-OzJ/w796irHBQLKOzI+HvAq3jCJs9KICjCNUwql1EhZkmVqooZjVDkvuMbeVlsUF
-s1XyWa852RAf7Mh38VakW6pACtVJsOhaMdG9PYkOWAeVVc3qzlwoDy6mfoJo6AIs
-E45lDBRLAzbKN28h/AFYBgJEygcRNCHirEKphGCRAoGAEhcaxbmMo2fHBYuvOR1Q
-ZAIq1EPvysDROUBHhdTJqN1wHsuJsmVJxX42+YHcZdjtgeCdjU3HMoyCnTaRxDee
-K3VeB4PobN1WpQwFklFoqcvAhW6eicdZXme7ktK120NPQsXrmjgN6Lfg3PNjosn0
-tqSxQhQ4DrSf60fxx0/M/rw=
+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
+JEBBio3QuomlZkE7TlAqoi9iDb14emNH
 -----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signed-san-ec.key b/tests/gold_tests/tls/ssl/signed-san-ec.key
index 8dd236ebce9..9e91e0d3f05 100644
--- a/tests/gold_tests/tls/ssl/signed-san-ec.key
+++ b/tests/gold_tests/tls/ssl/signed-san-ec.key
@@ -1,5 +1,5 @@
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBh9PX40P1qCTpRxqbrxRyHsy1dAlEMZmUJpOZjgS2eXoAoGCCqGSM49
-AwEHoUQDQgAEBwvhzslwxPu7OdDlJFHpFoCTfa2zxqD7MI9AI5263g5Dov8Kcs1t
-Kr1GTz3sunVCEOjVv5ASNokITXFu7+Bvcw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgtMJF9eOvYG6eKBh2
+xZZfigBkCz8qIUENOV7Umz+Rha+hRANCAAT7LIsiaQcc+iEzBOXc+zvL0argiEHp
+yQUQMSm6ZQY06Nvb992y9EXM+wYbIxWJB1EBkETU9lPvwP0ws5K8Q3HK
+-----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signed-san-ec.pem b/tests/gold_tests/tls/ssl/signed-san-ec.pem
index 1030f0affe6..61124c67071 100644
--- a/tests/gold_tests/tls/ssl/signed-san-ec.pem
+++ b/tests/gold_tests/tls/ssl/signed-san-ec.pem
@@ -1,20 +1,29 @@
 -----BEGIN CERTIFICATE-----
-MIICVTCCAb6gAwIBAgIJALzUy0ELCZDBMA0GCSqGSIb3DQEBCwUAMIGdMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCSUwxEjAQBgNVBAcTCUNoYW1wYWlnbjEOMAwGA1UE
-ChMFWWFob28xDTALBgNVBAsTBEVkZ2UxKDAmBgNVBAMTH2p1aWNlcHJvZHVjZS5j
-b3JwLm5lMS55YWhvby5jb20xJDAiBgkqhkiG9w0BCQEWFXBlcnNpYS5heml6QHlh
-aG9vLmNvbTAeFw0yMDAyMTgxNjM4MTZaFw0zMDAyMTUxNjM4MTZaMFkxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJJTDESMBAGA1UEBwwJQ2hhbXBhaWduMRUwEwYDVQQK
-DAxWZXJpem9uTWVkaWExEjAQBgNVBAMMCWdyb3VwLmNvbTBZMBMGByqGSM49AgEG
-CCqGSM49AwEHA0IABAcL4c7JcMT7uznQ5SRR6RaAk32ts8ag+zCPQCOdut4OQ6L/
-CnLNbSq9Rk897Lp1QhDo1b+QEjaJCE1xbu/gb3OjJzAlMCMGA1UdEQQcMBqCB29u
-ZS5jb22CB3R3by5jb22CBmVjLmNvbTANBgkqhkiG9w0BAQsFAAOBgQCRgoh5YGCc
-V++/kil6USZaQ0TTNhAtCeao9p5WCN1NdHNtnulacu0cYPCI0cbpy2CVZC6JMrNE
-21SFssxKaeM1yoyIDEjIkr5IaCCOnr5XdOAO6/eISapkIPE/1GEbxyEgk1yqTJkr
-KB22uwprz1abKaQNBfTR2bV+57JlmnNuzg==
+MIIEBjCCAe6gAwIBAgIUCcLyZxlUQnKv6awG1csgy/dMaMIwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yMTAy
+MDUyMjIxMzlaFw0zMTAyMDMyMjIxMzlaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJJTDEOMAwGA1UECgwFWWFob28xDTALBgNVBAsMBEVkZ2UxEjAQBgNVBAMMCWdy
+b3VwLmNvbTBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABPssiyJpBxz6ITME5dz7
+O8vRquCIQenJBRAxKbplBjTo29v33bL0Rcz7BhsjFYkHUQGQRNT2U+/A/TCzkrxD
+ccqjgaEwgZ4wCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5l
+cmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFITs8WlLCvuLKTN7zQilSP8q0AaM
+MB8GA1UdIwQYMBaAFLy9jg9KtWKRPTmQ7d0LGqv0wxuhMCMGA1UdEQQcMBqCB29u
+ZS5jb22CB3R3by5jb22CBmVjLmNvbTANBgkqhkiG9w0BAQsFAAOCAgEAb/Yc+QMW
+W6kPOEasjNKl1IZO0ACoXzOIdZRfbmnMf21UgaaQza9XaIOYVw6lYJDTFegaLeFB
+axhTZySXosV1ztVMV1y5kOr1UpcZgho6ImoMdqzJw9XaOTRZ6c+E9CWao0vGYjNF
+ExSiGxAsQvb2A8xWFhWCgoaeQ8ySbg1fL2qWG20f8QrLraWY7lKUw7kbefbUqXyc
+D+R7CbkfRNMVXvr3WOaeAcRoNBLOzOIdap5s2ocGtbsuey/45CoET7gFEr/G+qHY
+L0XK3X/WCKnk5aBwgCy9bGix1cDcEu+4JLJY5Ls2GijOrNQcwxR190e4qz7sA1cJ
+4bPJzlrp69+sXeBdB01BrAksFZ5FXBv5KzOukYFM7/Qhk9MvLcHTZqq3CqwrJHjk
+Lf+hDA58HfxEdGIj5NkdrlAYpxrYUGJkXdqZUoklGkX4blC+XPXo5B5h4YqPtS+m
+bTykdiHvns59wkUaGDXeIcGU4vUC1gKzZ4aZE4jVGOL9eSEJIQVvcne1U6e1eUAy
+tUK14x82D09Qf92ZQxu96EghT2YAIXWblytpcEcQZiTsMTtVQgFe8ywmd3ApLQtb
++WaN2hi0LdPwEiKp5G/MmdaKu/KoueFnwOVutKUSbbCPS/FOhRlVCMJI7Z2ldapM
+lUKsr4Y8KDjWJPL2CkO+5iob8nspneYJ4AM=
 -----END CERTIFICATE-----
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIBh9PX40P1qCTpRxqbrxRyHsy1dAlEMZmUJpOZjgS2eXoAoGCCqGSM49
-AwEHoUQDQgAEBwvhzslwxPu7OdDlJFHpFoCTfa2zxqD7MI9AI5263g5Dov8Kcs1t
-Kr1GTz3sunVCEOjVv5ASNokITXFu7+Bvcw==
------END EC PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgtMJF9eOvYG6eKBh2
+xZZfigBkCz8qIUENOV7Umz+Rha+hRANCAAT7LIsiaQcc+iEzBOXc+zvL0argiEHp
+yQUQMSm6ZQY06Nvb992y9EXM+wYbIxWJB1EBkETU9lPvwP0ws5K8Q3HK
+-----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signed-san.key b/tests/gold_tests/tls/ssl/signed-san.key
index aee6da6528a..139ec66b6c8 100644
--- a/tests/gold_tests/tls/ssl/signed-san.key
+++ b/tests/gold_tests/tls/ssl/signed-san.key
@@ -1,28 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCtQayAL7EHSxEP
-uclHEa4mMh/pO5N8VULdVA6sHN9k5mUAEnL3p3nNsdVE9pLtHIxgcoXCcLAPG+eL
-bSAk+C/l+pubz8GAWHdOC/3xpdrzQjOiYzi2Megl6M+VpwaMOd0s14zdFZloS37y
-M7GnjLKIRO8dMz744SSAPZYIvnx1XAJ/zA9uLbYzvFWbwkuT8G2+Jo+IHl4FyMX2
-wTTXLeYf66RKUnTFcNG7ysNbUr7hDJR8E/lek00K3t8YGzYrqCtHIH3OLkpKNU3l
-HhWRQ0zrNRwfF+hWfYXq3SZ5+C1eo2RZe8SHPbNPbpJxGMMkxNRkCyWuMywoc2dA
-nm1HyI2nAgMBAAECggEAKkhOyvHYqEj/nvDeWEPOVnABLbBma/960/0Bn6tkMYGw
-wHXALQRoS3TM8Ymjjc5by+XnEu7haK6MsZAuOhd/yQaCF2J6fNIaO6fdj63EY32S
-kFzaqExBtY69qm4awPoWKi1oqUPuLm/OSVmoT5WctHjuShgJlD+N4uYkyXmDcjhd
-cED+Uy6LCK0TelhkN2J3TBMD1yI2bccORTVtihXWQhr7ROzXiyV5O143LFvSTNdr
-l8FlOQbJhIxThUmydecONi1PYAkP/ySYFqLjLfCmonoVJFdjdgJsiXBEtUJ/8CQY
-+ar2vqRL4/4Y+9eerlZFy3e6lidofPu0YGTWdCTcUQKBgQDSvBW5+61DZ8p9f3UX
-04an8CyKgHDcH/lqKQMB8GvEhWCQG2nnrs6fQieiKj4P5bwuf01oNu4txxIg1GnS
-r5MTZfzCEe89X06vcwzcTOQsMfUlzx7qMpQaqzshwchFLpCD2pj2vGIlL+g6piN0
-+X7RjRykBe0Nx5wYx3RYI78DCwKBgQDSeLuz2Q3n8Oqz+m9Zl+g1jMNgY861+zv5
-fZb43xXegef82RUata9ZGaRelODYdWmNiRGGAgfe1ddOW0xc3Ve1W9lonFLE84je
-Oc57S2q9LiVuKJbhDQ6br1eGLv8RywsUhNdWRBIH9Mn3+1nIXAtlHt7Jp3lDeVO/
-WJa3vvyBVQKBgFDTMsISdXHU7SUVLaPlzU+8HllAygijetXsxOqJe8v0HAUpfoUN
-1tHeXbUk3ojaZEKxMM83wkJsh9dvoObd0FswUrFcj5XKaDOCvPwBwcHxp0TJG+JX
-Y9aWtidMW7OtGGB6BxEbT8lTho54CkFjL/DPXpzKaRFP7d7TIRxtGWXhAoGANjTw
-KvbZNQaAfFAgw5NzM++IFlg+UfJd1Pj6nChgqokMpbuHSvTGL42CHvX7HuTGhbRq
-tffp7QNoS38KINTFFSmNyfqQ+ra6Znm+61RWLlknPMLpcRb6zzAOu7l46i1AMk2w
-ZEBt4Gy0Y9Dxo7/JE4cq3AbtHWqvHhYD41kmEW0CgYB2gL7IbeCeQG0wNOb0xHtu
-aXQzK5JUOut811QJLNPzxS+G70bbSRC9gkqFAizCSvCqzao7/3pw9unQzaR0h/3V
-OKEZF8angN9ORP5mOmlMQSvUtAZYfiuCMnZ4EeAhklA9hbAqGScevrdJUxnCN2c3
-DtR0mYMkmrdwISjW9aZnrg==
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQDBIQmhnqEDckw5
+8Gt6U0XqmxgUtRr1EUCzv03qRTgbhjYcGpSIcsgSFMvcsWM6V5XTNtzu0fGVjJpB
+nG/OfslcMNOEy2l0mCqHOUO+dZLKbrBBjmFIUHE2MWHLQQnN9xbsOCqlupSMqdvX
+Y597+ngDN6sQpU5sz2t0QORDkDi0iFkE42wm+wQtxp3roP1zo0huujKY+3EMUndO
+UErnRSJP3+WptJuJQY1cd1jEWf5Y064bfcLJJRtIyyjgJAF3nhK7ukTrnc6l5xav
+pDna5+h3+p+VJ5e7r/Cy9QYNXmKRt8AxMqzlEOOwgiDM3VKxIWGJRpN+0Gcp0qPL
+EgxlNct4ANT/YBUnfCxPxOqUW7NA9fHjr/C2TrUOrr+C8n28M/B65DkRA8RD4W/b
+5ThQk0twYhvFc0azSh/oyrxGqfIymWdctmG9vkJkJSikKy2jiAsar2XQSwUW0F9s
+TZvD3KSsm4Uh7FqoRsYtdljKM+VszQDdY3eR2vhgvYU7g/EHOTr5Ors2y890oJSo
+Can442KFwlXcYvh8D/d0FgLMy0ViHZrOjGVdc72/oDWZ/gDK6emZqqyTdvNiPBdN
+ZubezGQU0QWsgsKZchC5a+DoVgCCbLkPTpubsAGwMJxXPnVMgtN7lQXj6VEeMBwU
+LXpjVI8rdn8VbjAN6Ni8nxfhXdu2HwIDAQABAoICAFJHkgPiQjTmsCULEa8m5SWj
+d+nyko6QECHEQhyp6tKHJmxowpkzVZumcogOpvjHMdSvjgbNOQB+y4VicZvnFkCJ
+qMPtqXr8DTpZIkx1aNmHuN3lG/skEmeFOGXQyq2ONJzk/P5odDtNbpTgI6U9O34b
+bG0GEFh5Mg1wTA+g1RfM8ygLABvHW6to8ATgLLrkeMp712ynyyz1wVCDErZfFNQ0
+znKzuIQMgn4/dnkI4jzTylx6As+RWIN10m9Tx7A/jzmdjRlYvR6fSmIANInXvYnI
+I8729EUJGyITE8YETThJsb8EGPbqcCbV+cVuEXnXf+dtQw+HGDyQOiodAVzpQ0qa
+jv7ggJ1DsBMGe5rir1DqZnFuIeviAWFOwReMANI2DviN+XV0yAjjTBdH3cWB/oVP
+/PU37gHLg04dFKK1h6z8qNs27Dxaz9TyimPwGWrXYTBX5G4h6ZaJDK0TmiNDgUH6
+/FZzcT1WwcUi4p4hRehM8dO0uvbGK5RtAmtQ6E1Gmo01ASmtKmigp22mQTP2j36H
+F1aQGSg1k7HC5GXZnlTWfo/A3U1gX5PG44D77bjxf6MzKnxDCc8OcA7XYwBaE/nq
+J6ce+HISd5FFpw0F+nNJVwlBf7EJzkCOWvJWJXebJXvSpfjGcYCAOSXNyrqjBZQT
+8GH+QUD+CvW2v6PtyjzZAoIBAQDgp7s2TxD0Kv+MVFx9688i/kjdCI5oXPqFOp+N
+mENSptfSDZ45VKOwetx7K/v+K80TSayIB9o57QcuHM/KTaI5zEaQRea/qbPlHh02
+stc2BI0SHuyMqi3HWft8vGQdOtpuFCmj8B95UDRTjthvxChQI3lDARn8vhHNMOIy
+RbfTZwSLDwY+ML7TRDO5SqPpdFK3FKNtVTtn5FbX2SkF7jAlrSdMzJAv6MLLk9KF
+/QiJYy+31ABHDl0XMPnwazJ/Zn1ERUng0sC00ktnpRwO/a9pWTZ8/lJfkXU5GFhX
+CHMpsftOUDgFdl3zM6KFG1vjyKJCNogkMnkzYXG+luoQ1hC9AoIBAQDcE0Am4ZGe
+X6vd1Da6C/T+krYTw2FE6GtM7ykC6n6jm6LvFw2e72LEU36Vuj1HG0xdiLV+ifz2
+lu8RZeoIAlr0ETewqZOc9PurLwq0gZe6/4FFw3SpTA/gldHIJFenrg8zytQa58pU
+3ROU57Jf408m/58Fhy/3N+2d1KmIgG0kWLPNn5qa1yn1xCR+clPZx904JWYJxAAc
+dEWpkEuO8zcYayvAPiX+Y3MtHeNiNHlRkMb8SJOA0S/xBaJ5jlol8nhruHYCcRRW
+NYLPJyJ2kJtlyd5ewhy7NvfkXd/+0QBT9Xkflq1heQDvWlshdSroTmWwYxY6LnBT
+GrV8AuPLh9YLAoIBAHko3OXYVItq2THEmbFryOXVgFR89djBNHc/+6bw1HYx9zmZ
+EJlY1YMrb9eaDCizVMGvPTaMDZyqAfJTpZk0r2Y+jlvm5yC9FIFf8V97qme+opqA
+RRFEArZ+CAzoyZGeGQm/JAn/SeoyYFYkNwRoJVm7F/4UDQDrPUyNraBxS0ffSmr4
+6mQGBBSKtt6aq7YPf0CwB8fCbOyGEHQO8Xn6UMsxDH314VmFTfFfQu3yXnVCIg0h
+cBjiXUBRsKqCFdTx4GM+fy6aW0XqGLLIME7BcKX/cEyPGLvkBfWJ9LLTotB85c0B
+pIUFpnuwgFkLPU6m+SN+p4PmGMmmJyMj3w6/dH0CggEAVoh3PBKLuHMz1+h+kE7t
+SUAUudakI30j279aJ9xeaSRkP5CX+Xt1IW8XIfZ168SvFUQQ4S2OusMEQ5oIGJgc
+fUVb2WoEMb4eSuQXWHxwVcXrZawB7iOLRqqCLykjEjqdnabOGbo0U4QOFAm6mHt/
+fv0Z4QmT8agbFWkuNA8TWyxJnrt4BhQ+WnWCR/naQJKWyGHkKkjYJlgNoCutmgrG
+CiLxtAh71ffyrLXI1698WHcN1tsOrKMUL7ggd51ikvMxKGICfNlLvs4RnjRsF6Sq
+ha6HckjvFSn69N94mPBDKcAmnSYZDG+Qz4x+srwoX+mbkGyVq9Dgt7yTyaw1N600
+mwKCAQEA3L0YlDrLLT970PPMndOOz57dIcPUb/vlobmbgXyJwrcejcTaSjqp94AS
+GHDMZIAETSGW+3ELAkdo0Ll/oIQ3WNxfCTgueWf0YX0vRF+NO7h2pmDadxk015ut
+9nankQCDOhAuWprUi92magAP1z3BzBo2qkIoQsW5P57+CcV3nNzixTHd0ZqMEb1G
+F+YUW0cUh4Gmd9RjMAsTtJPJNwSDk7tC36uWgKy6MLrj7TjTOylEyVaYDoiuGrgl
+kSQXOyLIaI9Co//DeJCJc2Sy6/3VJ6Kq2VnfmYOsf+IN+friJKQKlB18WdbsCpFS
+F5aH0EA7QfSAzuofZVKtoamyuw68XQ==
 -----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signed-san.pem b/tests/gold_tests/tls/ssl/signed-san.pem
index 3ab771cb5a8..6f96cc91f8b 100644
--- a/tests/gold_tests/tls/ssl/signed-san.pem
+++ b/tests/gold_tests/tls/ssl/signed-san.pem
@@ -1,47 +1,86 @@
 -----BEGIN CERTIFICATE-----
-MIIDITCCAoqgAwIBAgIJALzUy0ELCZDAMA0GCSqGSIb3DQEBCwUAMIGdMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCSUwxEjAQBgNVBAcTCUNoYW1wYWlnbjEOMAwGA1UE
-ChMFWWFob28xDTALBgNVBAsTBEVkZ2UxKDAmBgNVBAMTH2p1aWNlcHJvZHVjZS5j
-b3JwLm5lMS55YWhvby5jb20xJDAiBgkqhkiG9w0BCQEWFXBlcnNpYS5heml6QHlh
-aG9vLmNvbTAeFw0yMDAyMTgxNjM2MTZaFw0zMDAyMTUxNjM2MTZaMFkxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJJTDESMBAGA1UEBwwJQ2hhbXBhaWduMRUwEwYDVQQK
-DAxWZXJpem9uTWVkaWExEjAQBgNVBAMMCWdyb3VwLmNvbTCCASIwDQYJKoZIhvcN
-AQEBBQADggEPADCCAQoCggEBAK1BrIAvsQdLEQ+5yUcRriYyH+k7k3xVQt1UDqwc
-32TmZQAScvenec2x1UT2ku0cjGByhcJwsA8b54ttICT4L+X6m5vPwYBYd04L/fGl
-2vNCM6JjOLYx6CXoz5WnBow53SzXjN0VmWhLfvIzsaeMsohE7x0zPvjhJIA9lgi+
-fHVcAn/MD24ttjO8VZvCS5Pwbb4mj4geXgXIxfbBNNct5h/rpEpSdMVw0bvKw1tS
-vuEMlHwT+V6TTQre3xgbNiuoK0cgfc4uSko1TeUeFZFDTOs1HB8X6FZ9herdJnn4
-LV6jZFl7xIc9s09uknEYwyTE1GQLJa4zLChzZ0CebUfIjacCAwEAAaMoMCYwJAYD
-VR0RBB0wG4IHb25lLmNvbYIHdHdvLmNvbYIHcnNhLmNvbTANBgkqhkiG9w0BAQsF
-AAOBgQA00nnSb9iqOa8EPJrkbEasuAqe5gw7ehDgaVHLxUrWeJUPwNJdnbYK4hLw
-qWeRKM6Qgxt8rjC/vqDjAxuNjHqFbdhL3supu2bHaBH5xFRqibY5rOY6AkL9SfMU
-r8Lj/NQvqtIzoFM81rhSTDRoHNazVv0TjbcZKTAT25ARX4HQIw==
+MIIF0jCCA7qgAwIBAgIUJhcqpNudDIb/rzkBM+ZL1S4+7NowDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yMTAy
+MDUyMjIxMzlaFw0zMTAyMDMyMjIxMzlaME0xCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJJTDEOMAwGA1UECgwFWWFob28xDTALBgNVBAsMBEVkZ2UxEjAQBgNVBAMMCWdy
+b3VwLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMEhCaGeoQNy
+TDnwa3pTReqbGBS1GvURQLO/TepFOBuGNhwalIhyyBIUy9yxYzpXldM23O7R8ZWM
+mkGcb85+yVww04TLaXSYKoc5Q751kspusEGOYUhQcTYxYctBCc33Fuw4KqW6lIyp
+29djn3v6eAM3qxClTmzPa3RA5EOQOLSIWQTjbCb7BC3Gneug/XOjSG66Mpj7cQxS
+d05QSudFIk/f5am0m4lBjVx3WMRZ/ljTrht9wsklG0jLKOAkAXeeEru6ROudzqXn
+Fq+kOdrn6Hf6n5Unl7uv8LL1Bg1eYpG3wDEyrOUQ47CCIMzdUrEhYYlGk37QZynS
+o8sSDGU1y3gA1P9gFSd8LE/E6pRbs0D18eOv8LZOtQ6uv4Lyfbwz8HrkOREDxEPh
+b9vlOFCTS3BiG8VzRrNKH+jKvEap8jKZZ1y2Yb2+QmQlKKQrLaOICxqvZdBLBRbQ
+X2xNm8PcpKybhSHsWqhGxi12WMoz5WzNAN1jd5Ha+GC9hTuD8Qc5Ovk6uzbLz3Sg
+lKgJqfjjYoXCVdxi+HwP93QWAszLRWIdms6MZV1zvb+gNZn+AMrp6ZmqrJN282I8
+F01m5t7MZBTRBayCwplyELlr4OhWAIJsuQ9Om5uwAbAwnFc+dUyC03uVBePpUR4w
+HBQtemNUjyt2fxVuMA3o2LyfF+Fd27YfAgMBAAGjgaIwgZ8wCQYDVR0TBAIwADAs
+BglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYD
+VR0OBBYEFKjBRdjSML5okxgfBHybIqtMAvzHMB8GA1UdIwQYMBaAFLy9jg9KtWKR
+PTmQ7d0LGqv0wxuhMCQGA1UdEQQdMBuCB29uZS5jb22CB3R3by5jb22CB3JzYS5j
+b20wDQYJKoZIhvcNAQELBQADggIBADXw8cQpaMUt5u+rP73je19VLmrZb9JCe8D2
+SVk73vMzMckSPwJFj8IhzLhuDkC9PaNnXcgc+xBhrqSO0QKi4zZdgIwYENuAdWSF
+3VGBJuPjtbIjOqbHyZpcYtqyUiDMvdvrX2n8m6gQvEm6XRpX2hDBpqbAJ2iqXwoT
+XRPxEZjh2i9ZYNwfiCly+luio7gRvBsODnZvSTmxYIUPLjp4FwjhI0YmoyBVoGE5
+uKClLhoy8T20QAvE0joNtuvZDhMuLx18CYD3m3XXDO4cHIW/RAN9YEBL0seDzWsv
+rm5lU06y2vLSaDX8AA/hYUOEQrYamBfWmGaU02YeG4HbDjWxNwRjBYB9dmCvtC3D
+BSPkeAy6jiyaGXp6Sf1ZxYZfmm6DoOYMbyDD1bIkgq0WfrIef56/bXDW8Lis84/2
+T6CBAhFH3rFcA6Tc2Rnuuq9YJ00/xnqRAcnF+l++gK5Up70jbsLapH6r2wLic1RQ
+jdGIoJD+XUPedoxt+79C3vt0e1KS6AGihjNHuNT+Gbpzadz5XSt7k9snfU4/3EM3
+NpLuGTxo21khSAWm0hiFoFgXXJm+Zu0tYLpCBIjO62bABEV9yKRFZKpvCs4RjwAd
+svKH0jdtLBOEjsd6fyCR17v3mCZgwdYIVRjFS6OJ8zUqeG3GA5qT4f3apuSE+Pa4
+W0dp3eMR
 -----END CERTIFICATE-----
 -----BEGIN PRIVATE KEY-----
-MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCtQayAL7EHSxEP
-uclHEa4mMh/pO5N8VULdVA6sHN9k5mUAEnL3p3nNsdVE9pLtHIxgcoXCcLAPG+eL
-bSAk+C/l+pubz8GAWHdOC/3xpdrzQjOiYzi2Megl6M+VpwaMOd0s14zdFZloS37y
-M7GnjLKIRO8dMz744SSAPZYIvnx1XAJ/zA9uLbYzvFWbwkuT8G2+Jo+IHl4FyMX2
-wTTXLeYf66RKUnTFcNG7ysNbUr7hDJR8E/lek00K3t8YGzYrqCtHIH3OLkpKNU3l
-HhWRQ0zrNRwfF+hWfYXq3SZ5+C1eo2RZe8SHPbNPbpJxGMMkxNRkCyWuMywoc2dA
-nm1HyI2nAgMBAAECggEAKkhOyvHYqEj/nvDeWEPOVnABLbBma/960/0Bn6tkMYGw
-wHXALQRoS3TM8Ymjjc5by+XnEu7haK6MsZAuOhd/yQaCF2J6fNIaO6fdj63EY32S
-kFzaqExBtY69qm4awPoWKi1oqUPuLm/OSVmoT5WctHjuShgJlD+N4uYkyXmDcjhd
-cED+Uy6LCK0TelhkN2J3TBMD1yI2bccORTVtihXWQhr7ROzXiyV5O143LFvSTNdr
-l8FlOQbJhIxThUmydecONi1PYAkP/ySYFqLjLfCmonoVJFdjdgJsiXBEtUJ/8CQY
-+ar2vqRL4/4Y+9eerlZFy3e6lidofPu0YGTWdCTcUQKBgQDSvBW5+61DZ8p9f3UX
-04an8CyKgHDcH/lqKQMB8GvEhWCQG2nnrs6fQieiKj4P5bwuf01oNu4txxIg1GnS
-r5MTZfzCEe89X06vcwzcTOQsMfUlzx7qMpQaqzshwchFLpCD2pj2vGIlL+g6piN0
-+X7RjRykBe0Nx5wYx3RYI78DCwKBgQDSeLuz2Q3n8Oqz+m9Zl+g1jMNgY861+zv5
-fZb43xXegef82RUata9ZGaRelODYdWmNiRGGAgfe1ddOW0xc3Ve1W9lonFLE84je
-Oc57S2q9LiVuKJbhDQ6br1eGLv8RywsUhNdWRBIH9Mn3+1nIXAtlHt7Jp3lDeVO/
-WJa3vvyBVQKBgFDTMsISdXHU7SUVLaPlzU+8HllAygijetXsxOqJe8v0HAUpfoUN
-1tHeXbUk3ojaZEKxMM83wkJsh9dvoObd0FswUrFcj5XKaDOCvPwBwcHxp0TJG+JX
-Y9aWtidMW7OtGGB6BxEbT8lTho54CkFjL/DPXpzKaRFP7d7TIRxtGWXhAoGANjTw
-KvbZNQaAfFAgw5NzM++IFlg+UfJd1Pj6nChgqokMpbuHSvTGL42CHvX7HuTGhbRq
-tffp7QNoS38KINTFFSmNyfqQ+ra6Znm+61RWLlknPMLpcRb6zzAOu7l46i1AMk2w
-ZEBt4Gy0Y9Dxo7/JE4cq3AbtHWqvHhYD41kmEW0CgYB2gL7IbeCeQG0wNOb0xHtu
-aXQzK5JUOut811QJLNPzxS+G70bbSRC9gkqFAizCSvCqzao7/3pw9unQzaR0h/3V
-OKEZF8angN9ORP5mOmlMQSvUtAZYfiuCMnZ4EeAhklA9hbAqGScevrdJUxnCN2c3
-DtR0mYMkmrdwISjW9aZnrg==
+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
+F5aH0EA7QfSAzuofZVKtoamyuw68XQ==
 -----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signed-wild.key b/tests/gold_tests/tls/ssl/signed-wild.key
new file mode 100644
index 00000000000..6f684bdbe61
--- /dev/null
+++ b/tests/gold_tests/tls/ssl/signed-wild.key
@@ -0,0 +1,52 @@
+-----BEGIN PRIVATE KEY-----
+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
+3uIMUao2Jd3eMiGwkafWtf+LbzNbp2M=
+-----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signed-wild.pem b/tests/gold_tests/tls/ssl/signed-wild.pem
new file mode 100644
index 00000000000..fa2d178df29
--- /dev/null
+++ b/tests/gold_tests/tls/ssl/signed-wild.pem
@@ -0,0 +1,33 @@
+-----BEGIN CERTIFICATE-----
+MIIFqzCCA5OgAwIBAgIUEWq9xY0uoWjhdGF/+GZTiite+NkwDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yMTAy
+MDUyMjIxMzhaFw0zMTAyMDMyMjIxMzhaME4xCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJJTDEOMAwGA1UECgwFWWFob28xDTALBgNVBAsMBEVkZ2UxEzARBgNVBAMMCiou
+d2lsZC5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDL3BH4bt/L
+ywi5Woryu0H0hA1d5IBs/2V1LVzteJgp5EG6ij0bVvhh5//xvHYC7snEW6XyS4bW
+prZITvu+gCLUNHFYhvJwHr/ZWfg3O5x95AC78JF/XgJgKs+ptQoUT1j7gozm6f7K
+llFjn7h8HdfMn0Qmo0Rl2jt83L75V0s5+7KkVbc67q/Uf15gxpsXBBL84/xq5kdW
+O3L+bPBb4VyhLsKFn2HCGZFy3SZbSNnX/qFpoy6bUts42SGOeHZJxqf8bqRCgvow
++ToQA/iKRQl6fEg/KcQXtD81R24L9nGVCC6WLNyJTeNy1eODbMGaWEwwlN5V7ScV
+AmaeUbkQMmL0YtlTvb3r8Uhq11aHqw73ZqcNnmLwSAxVTVyBZ9JcP3jldN2GVQyc
+87K+cTcFH2yhWJtPsn9TnwvHuCw5lnxKVWdl+yOrTyy4/cQRuezZPUoIIJ7URAGK
+VpuoCK4D2K/fPx73CWDQWOyF4B0KUSiiekcrY9+b93+/NKH55ZohV56DI/6ON+B6
+lHAxx4JvzG9nR4JzzmPYQ9xP6YRtl7HlOrqkwRH593uPXJclIRAxQkNhJtOXmwdZ
+FF6+de6LZ5Th+UoZdGIZG6vRFQdbePF96gzeLgXbmbyCXeIQlGA/kBX79jdh72qV
+3bG1ng8ozNxcffTaVEqLXlw/XPd3QvRA/QIDAQABo3sweTAJBgNVHRMEAjAAMCwG
+CWCGSAGG+EIBDQQfFh1PcGVuU1NMIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNV
+HQ4EFgQUCcdch+815jgS6b+Wm6VOXktVQuMwHwYDVR0jBBgwFoAUvL2OD0q1YpE9
+OZDt3Qsaq/TDG6EwDQYJKoZIhvcNAQELBQADggIBAJ+eTi7p4NC3INSYPHsm8VJ7
+qdsd9YNr8HNC5o5DW6UoQP1CGNRCDQtSm6uiy6k/5aH2IOG5bd91kL0yBZD2rwlC
+NwUuEjmldlrPyC4j01hgpbBC1CJPtpicnJPC8UNvIaHP/nSo0To4ywYpNtx0MPmy
++ewJzvy+t/32RG+VXpeUOLY6KH//H2ZVj4JL1jAchBmQuJ95pEP51RVPxgUg56lr
+S0oN9cpuCcu0Ua/3Cl0pFp5l1LPx7HgVyvBZ0GE7pvNmT6P/mG787m+SoM2lArJO
+DjPFSLHi+nB1NKbNs8IPtMH0Ttln1a7ngIK6k3mWSSEMDGoWXokDfMizrGxS+YOv
+Wo4p+cR6Y9bilOLYu3XXvtnZMMuPz5ln0f8eteFoHnrYaR4UnW+wmcU5TPf8rB/n
+MZ3F/ktHfp8PGe8YgH6gJlU8SFjbJKMneCwpgDvP0aFSTKbDdRRr8noP+Yh3T8ub
+mG9EKQPg3jHdDmxr9QfTsxJedP4r2flrI5boQKLMgzjTxdgS73+pW4TZgEZIFX84
+R5LwxpVPgAAkVfC5B9OUNkG3v22s6PcMdpwz+oa7hNj6/QEhqAENJlv3dutKFuwo
++0oSKRGu9NUr5o7lOfusAV+NEB9przaIwhXE9X0TrPNgZn68JgYLeHpeXauk/J64
+6LZt30G/O0mqrCyg9Erp
+-----END CERTIFICATE-----
diff --git a/tests/gold_tests/tls/ssl/signed2-bar.pem b/tests/gold_tests/tls/ssl/signed2-bar.pem
index 8810238277f..74965fff590 100644
--- a/tests/gold_tests/tls/ssl/signed2-bar.pem
+++ b/tests/gold_tests/tls/ssl/signed2-bar.pem
@@ -1,21 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIDbjCCAlYCCQC/n10Tbs/+tzANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCSUwxEjAQBgNVBAcMCUNoYW1wYWlnbjEOMAwGA1UECgwFWWFo
-b28xGjAYBgNVBAMMEXNpZ25lcjIueWFob28uY29tMSIwIAYJKoZIhvcNAQkBFhNz
-aGlucmljaEBhcGFjaGUub3JnMB4XDTE4MTAxOTE3MzUyNVoXDTI4MTAxNjE3MzUy
-NVowdDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMRQwEgYDVQQHDAtTcHJpbmdm
-aWVsZDEQMA4GA1UECgwHRXhhbXBsZTEQMA4GA1UEAwwHYmFyLmNvbTEeMBwGCSqG
-SIb3DQEJARYPYm9iQGV4YW1wbGUuY29tMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEA7swOnuDGaffJv17oUQGTAmqvXzOc0QQ7GOX6cd81JCcCbWWuAC5O
-gHbrKL34d7eqmCSeO0yLZzRvWZwL2EITnHGTZI/MWz8rbo+aUM7twgEfyLAQVrRv
-DtEi0RzVTpoLt23V7iXGvtyykV96hSW0XqnfTiPbxsa8SoPTT1HhqcwLlE6ZZn7P
-Du9IPJdGQSe5f9FZrAOZVA2cVTY3GnFWB3PgKbo7i8+Xa1USni8U67XOg5LD+7q7
-k+WVa1my9+YaL4sFIpboM/WQyEkJdE+nCLrPAslI7PP4iRJZ/QJ8QGfDLs+fqUNx
-v+AbGmypRB39PhmIp18YkzE9VQq/W6LWfwIDAQABMA0GCSqGSIb3DQEBCwUAA4IB
-AQA0SU1rpeJkryF7Vg/6cpUBMIrcSUGlQdut9M9jUygzer6FoEsfl/gm08KcCL17
-gXzeGX00BZ+iO9mhFcIYs9tMfVfZU8HpEpos1kRL/jIzrsTcqK9nklBenRaClpXv
-8yXKjZ5n1AOgCwH5iwZ48s65Pdk8h14jxDLYXpfHsyHPl4xqYwam0+cPYPf1YROz
-TzzKccMR3kIvGvNO+xqhx3fNrP76DeszABI9ADR6GotpFfQEg0Jjnsi+leQKh6HK
-ASZwq0NpgELBr/vQFONg5oUVcICG5TGZhswLWZD42n42N8OtegRDaL1vJ3S5yTOC
-k30i+j2hfxKHWMDJ14UB+zl1
+MIIFqTCCA5GgAwIBAgIUWmQ6LPZqKGfYbtU1+uIX9z6jfB0wDQYJKoZIhvcNAQEL
+BQAwVTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEaMBgGA1UEAwwRc2lnbmVyMi55YWhvby5jb20wHhcNMjEw
+MjA1MjIyMTM4WhcNMzEwMjAzMjIyMTM4WjBLMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCSUwxDjAMBgNVBAoMBVlhaG9vMQ0wCwYDVQQLDARFZGdlMRAwDgYDVQQDDAdi
+YXIuY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAzV8pYq8FI4mu
+26if5G1kxV/MCr+4NHCJPmYZ6G2lVP+53yh6WHLNqDk1/kskgnKFQYVGQqmS42Zl
+hugOV7SGQQPQzhQqdmySRVcLSICRkqrMS0odGH5lm7QMDSbFa/Jt7K4rXy27SfNH
+EQcIu3bJjaIVp/c1qnoD1Nj5LXqDb4PUL0R6rYXGczJEPdfn/iQVHJKr9LpsXCA+
+ZlZeILpSk4iWRxnFjNq/Y/Dnvdfuacgpv86TMw7JStpkHzny3pUGBs/h2/isBGIw
+f9APVuIfGvInX4iN9SXt+VxTZ1jpaEhNCNj7RgzE/6Ki1oJmw8X+IB8x6T7hdk7Q
+7NqqNGbTPErRvHsHp6M3i0DUiMyUCCO7Q7V/Fby6vHsce5i6t4/wl0ALCmd/a0ew
+2KrnwAqZq4QKS2NrM9wHgJ8R3GP+yT7FmbTi5Ve0Ko/+eBJZzi7+Yzr/bKRdOQQp
+xpTBS/wpv+sMmGViwbskWLTVgXhqOt9OY0Ae+98Tlx1m1lyR7tjiKr45olgbMXaq
+mgXHIG27fG4qWRSXqFwZn5e+MHugJmWQM0WB1qG43N4NFaojgx0xz7LumfhEt8SI
+E3++35zxJEqNEs2lLBx4rQQmVI5vIq21y+jYaQiHLdgUI/bBC9wlMnvfhjpckz1b
+jsrKBRPTzbTQWEoW/hom7ldKRwT3dwkCAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFBj9AUMyQioobGp/TZ8294C4/t+5MB8GA1UdIwQYMBaAFBdiPOwWF8aWZnKX
+4mnfbB2q7nijMA0GCSqGSIb3DQEBCwUAA4ICAQB7gRq/c000O4W2p4BPgprVgoDq
++5ABK8ZG2DYgD5ODsB3e3pMySUEzu3DTIYm1MjKXHfguyYLf7qyQ+CLhsQ/4ChMQ
+MPqF2tpxXQQ7m6iiSjhs+yeVlPeOTdtsLh5qK76Hx/zKqgVOUe6i+EiUcWdJtC7F
+iuROA7bG7fw1D+l1tK0pQP8KTYhnQ5DHNgwkU6o88J6J0yp0Mn2QC1MREzTaHPZT
+hB0H9mhf4GeUesLJjl9XzaT8+ZG0lIaQ7MY+HSorj8VRRqM4mtCZVie2pZkG83KW
+nLmU/ciJWUmUbdDoHCqVrdn2XxkJkHUDAIpD0qpowB+vtf+tM/j1tMR39es8IpeA
+u+QOsZOVTQopiUPB4Rh6BmXkg29In5jFYbjydtNx8skfVJHpASSbOsbC97V8D/sp
+82YAMUAaN10r9bQe798jATkbYDHPdrdzgEuWv5kRqpdgGOiSMzh/WWHKPypzlLD9
+6xwWGY3sgtmQb41aJaMhrzGGSRzFUclgrPrcTafxlTD6YhMTCsM8QW0dQaf7DVH9
+4bZ1b1b8uTUC17S84Wm7tbowpKy3yzoJlrBtYhRUZLRqPCFfAlhGkH5TNn20wR6u
+DKucznbeX2bQN26SWgxMA1yNGhLJwAidMrbref+WvAd5OB5dvvaUuEICY9XIZf4M
+lsk8bWDX+XHHkBCX3g==
 -----END CERTIFICATE-----
diff --git a/tests/gold_tests/tls/ssl/signed2-foo.pem b/tests/gold_tests/tls/ssl/signed2-foo.pem
index 7728f7a3504..93ee26ca2b2 100644
--- a/tests/gold_tests/tls/ssl/signed2-foo.pem
+++ b/tests/gold_tests/tls/ssl/signed2-foo.pem
@@ -1,21 +1,33 @@
 -----BEGIN CERTIFICATE-----
-MIIDbDCCAlQCCQC/n10Tbs/+tjANBgkqhkiG9w0BAQsFADB+MQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCSUwxEjAQBgNVBAcMCUNoYW1wYWlnbjEOMAwGA1UECgwFWWFo
-b28xGjAYBgNVBAMMEXNpZ25lcjIueWFob28uY29tMSIwIAYJKoZIhvcNAQkBFhNz
-aGlucmljaEBhcGFjaGUub3JnMB4XDTE4MTAxOTE3MzQ1N1oXDTI4MTAxNjE3MzQ1
-N1owcjELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMRIwEAYDVQQHDAlDaGFtcGFp
-Z24xEDAOBgNVBAoMB0V4YW1wbGUxEDAOBgNVBAMMB2Zvby5jb20xHjAcBgkqhkiG
-9w0BCQEWD2JvYkBleGFtcGxlLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCC
-AQoCggEBAMmF46yvSjgLRBV6Wjy+JiX8iNa+SPhjpiiOc78T1PkdJ9bGRGKRFPxf
-vKqz0KWuM1xig801A/m+CXWoAh6LFSttlmSVxneQcX8xd3O5hX/+5Pdh9auw5N19
-ty7pp0e0Gv9BzTD0ZJsGmnjZkAvHONnaFlmrnVeYq9zPnn+Cb/1i+UYSvO+w/OR6
-N0fpTUYp4uoZpk6qRXs3YnjMqYnKI/PCuZH/zLuT72MMdBf4DbBrmBqIAwZ0gzxp
-NX5ew00C96ym9fJftSHDEOzDR6vQYu/iyxgKu7mEX61RyN44IfFKcKgQLjlvbMNk
-cBMsuOvsAgnnZNxKjWRNpOKsA4CIdEsCAwEAATANBgkqhkiG9w0BAQsFAAOCAQEA
-aCMjyADDi6VB6by8B7ho59z1AtkjcEmPptrAIr/0pZLVaBK8lYNm1jWSJvSrR851
-6KEPE/pu7fExpQiShplY3RiujWqGYJK9oQPM5/YM8BEM5RF00CYDbRnb8NMYio6+
-zAsCK8nrodTglHIlsPc2NfL56z/XfVmkZYiyTQH1qbo8jGCGIs6iyydGnyItt+sz
-hWWsYJLco69PWcLofQYDC9WFEGbTxEGRtDSO5gEC81WCbR4BhslXKhpqqGOOXxMH
-AykUdSs4DQfWAjwbezRqaktMXWNhGPjWgIsE38p9sDzr18EyX2DGr4POQYjvcNCH
-xWuVAbRPyFp8h98+wbfwqQ==
+MIIFqTCCA5GgAwIBAgIUAvc1BIY6iZ8Oc6Kiz8vYfx9E/RMwDQYJKoZIhvcNAQEL
+BQAwVTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEaMBgGA1UEAwwRc2lnbmVyMi55YWhvby5jb20wHhcNMjEw
+MjA1MjIyMTM3WhcNMzEwMjAzMjIyMTM3WjBLMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCSUwxDjAMBgNVBAoMBVlhaG9vMQ0wCwYDVQQLDARFZGdlMRAwDgYDVQQDDAdm
+b28uY29tMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAt3dUj6Hx+oE0
+0Nvw019F0OieiNKRmvn3gxr5dHcntTMyrdwbL2at9EAP6v/O6bu22JMPD+NJy57D
+RwfZYEdV8HDLlO4u6bKmsV0XcJdmpDc9tTvvua2PGAtDWpeRcXepSwi0EJFpRcpz
+uGwXfzjlKOeZgB064fZfe2Bh2Nx1tl/spBa2aamPgz9xUDQ1aD0i1vwFI/s6cvdU
+g8WYQxFsuKMBrlMsL+/cbk0iRoYCozybgLS+jOUPxJTDeyQ8uifqlnoKMXFAcIUx
+Nhhhbem6aEKSzBOOUm1a+1rNcYo61dcwunCvbR7QJAs0pHHdfKRk5x3E0mrPB9VD
+y3H9pvf20mqn7CE9C0LvT05JSMwC3m9/bKjhHvHVO+2YwR0hei8owSZfKxZeKnD3
+5xRKzqQDcLXyRJJUOzqsO8QyinrvKBFSZ/0qY6XMzmxQK04FstQcAPU2t6zRx2EJ
+zPtXI+JNiR5WyEnw8N2lMspAyHbGwiC0E8lpQiGZNH6IngUb9tvZn4ml12RGI8Sv
+LruWmt1JZjG9hu88xLjPsQj1VA/e7LeZ+DE5WkHNncy+C6j+1u+VtWUXBGlOnmRn
+jhJVxkHy0vsnIVESINGfWJgcKDb7yaCEwOS4XNls7kLKc+HJvMqDZLof8T5CwfE0
+k1MAhtIlwnagDaMcseD9XYbCgtxoMu0CAwEAAaN7MHkwCQYDVR0TBAIwADAsBglg
+hkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2VydGlmaWNhdGUwHQYDVR0O
+BBYEFHGXCVvM1wZxUlpTpcxA7vCFYLrRMB8GA1UdIwQYMBaAFBdiPOwWF8aWZnKX
+4mnfbB2q7nijMA0GCSqGSIb3DQEBCwUAA4ICAQAovw+AK5ZDKBkvgRtYC0EtXRWF
+1Z1LXnUQrS7l+vv7HZ5JaRE+9D5lzNA3v9Gsf3C/OUMlgYtobLXXpB85EWGkelGh
+ZCah1v7pM8ETO6+j3k1J9UisS7ymhxMgaQNVDtAOK0ZSUAT6RmGZKEqeRFzfYqFw
+rGFaxinBj/M8a/+jkArWC8widCQZYu632T/4W5EfaADtbVuxPdEU9B/lImH1qmLq
+BUkq2zRAwFh1Pzmim0vP+6tw7Vl4hvLxGq41viVOpA1X0aTESVpQQX/V4BSfzxGI
+2MWTtBT8P5tQhl3gwGV3peqEg46iS5EbgYwm/lF1eC4hNdTsBsxCizLlHitQL3ld
+BNYqfLkRYa/tt+qoviP8fMNWErV95Dt6gk68V+Y8H91kEYsnjhYvXX0u8CXYzC7m
+Qx8PDvsn0szaa5BDsIiVk9piNfbOv+dZYwdeICdoOFxklndqXeU0Ddj8txlmiVkA
+WRZE+cjeLDTUJQ8qirkHrF/XHF1jkGOSS18yO89QN6n4xifJtS9dKMBTAfyVNYx6
+eRYAH1o+mmHePniY4h50fT3pKQ1g4NqZx4jq4EgWOLGMVQPiAK4t556oImUgwBO/
+rIIruFD9HSaKqA3OYpkFUtTg5NE3FBaT6Tf1d/tN9ZnHx58OcKPb7I+Qoejc8OrE
+1CrzdBtleFmEwjfvmA==
 -----END CERTIFICATE-----
diff --git a/tests/gold_tests/tls/ssl/signer.key b/tests/gold_tests/tls/ssl/signer.key
index 4c7a661a6bd..e4f232e8249 100644
--- a/tests/gold_tests/tls/ssl/signer.key
+++ b/tests/gold_tests/tls/ssl/signer.key
@@ -1,15 +1,52 @@
------BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDWMHOiUF+ORmZjAxI8MWE9dblb7gQSJ36WCXlPFiFx6ynF+S1E
-kXAYpIip5X0pzDUaIbLukxJUAAnOtMEO0PCgxJQUrEtRWh8wiJdbdQJF0Zs/9R+u
-SUgb61f+mdTQvhqefBGx+xrpfAcgtcWiZuSA9Q3fvpDj5WOWSPWXBUuxywIDAQAB
-AoGBAJPxRX2gjFAGWmQbU/YVmXfNH6navh8X/nx9sLeqrpE0AFeJI/ZPiqDKzMal
-B43eSfNxwVi+ZxN0L1ICUbL9KKZvHs/QBxWLA1fGVAXrz7sRplEVvakPpTfHoEnv
-sKaMWVKaK/S5WGbDhElb6zb/Lwo19DsIAPjGYqFvzFJBmobJAkEA9iSeTGkR9X26
-GywZoYrIMlRh34htOIRx1UUq88rFzdrCF21kQ4lhBIkX5OZMMy652i2gyak4OZTe
-YewIv8jw9QJBAN7EQNHG8jPwXfVp91/fqxVQEfumuP2i6uiWWYQgZCmla2+0xcLZ
-pMQ6sQEe10hhTrVnzHgAUVp50Ntn2jwBX78CQF09veGAI9d1Cxzj9cmmAvRd1r2Q
-tp8kPOLnUsALXib+6WtqewLCdcf8DtsdClyRJMIraq85tRzK8fryKNZNzkkCQEgA
-yS7FDj5JgCU15hZgFk1iPx3HCt44jZM2HaL+UUHAzRQjKxTLAl3G1rWVAWLMyQML
-lORoveLvotl4HOruSsMCQQCAx9dV9JUSFoyc1CWILp/FgUH/se4cjQCThGO0DoQQ
-vGTYmntY7j9WRJ9esQrjdD6Clw8zM/45GIBNwnXzqo7Z
------END RSA PRIVATE KEY-----
+-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCo/ZwiQY8pNL1J
+BIls5h2lHUbQ3p+Af4xccS+D+SN6yyWJE+kR63kq+HiYsMmLFA72pzBjH0GJQ4FX
+E5n5SiC33wKNYhxBo0ckEPZy3v0xIQGTldCKi+QKR9Rqg3MJqTasrsieVGglnhw3
+Igl384zYiq5yCFD+NLU7FFFF8Ug0Gj+MvX5MCCYv9kn/poWJG5o3Zp4eaMoCHIYQ
+YWQxGQyQ5DG6YkpMYhKP7mKNlAM0x2qY7yypo9qXV1XuCu5J86hbmGcZfiNWm/AT
+Sq49ysDmILvEqpFT3/y6rH3TFGFRTNAkMBRNZPnwo54UZEpW6ZKzMNz6PzFDZkLj
+QAeLocGRMgzy21WoJrG79A6cnNeHZ9YAXTTSlSV1+qbDcHgXs9rJ43cgZdi8j8OA
+gYasQWQ7Z4QBLnp7B241xHKyt0v2Xxc/PH8BRECYhxoodHQHEmTsHjVx5LK7l9K0
+SmEcBebxNnHKEyA3WqQq/xupDwJjGQpb0mqua3CGCFIiWDPEsSxlHWzUY5P7AZRr
+j156EtoHJ6ARuRNRamM7wFg3v7lh+yoo3JTDOLYsEuBqpkw61S4/RP0rI9gdmz9s
+BakwVc9u48ZrjbuaSKknxHfhjEhyfrtl1rp7H4w0LP6jW+pxat2T++YpHKQs3p81
+P6YD8wYPgmZ/dYBycpsiCRyCoKjc/wIDAQABAoICAHiI1AnXCx7QAEcJll/3TqPL
+2wv2Dnyf/WSeUs7mMDlQlshMTEy80SMmMRZv2oF54CZsH+ZDkAIxBRsv3v5hsi6U
+QYTIuvDSXlbKRo6uoJefPDmhfSqlFxWCIG+MrMvyRw4qaOwNtm9GdEea3ngRXp/B
+YyXw6pw2yiGGn2Ws8NxA8J0ZN/FRSrOhDyzrAIpIBtqHNjbodVXGNJWQcd9XR5A9
+Q372xpnuxeClnuPu8858gnrs9cVWGv8hiygL4eUbhzU14ivbvabz+Ow5s0hdyvMZ
+2/Qt2RSjSed4SxL4kWVkzX1SUdjWMjRC7+kJk8CkPz/SlXtlAWVallDzBa7BxIb7
+hsNLho4T2M5IZ7+7NquS8Y2pkWqjff79fKEqt5N7f2g5ZEgrKYSs8Z/KPhyTVgGA
+1uUyHdwN/D06y27Qbto3zbg9gZ1ruAptvRNL2sn/cUv39fFWYJ8BKM+cBOnAsLcw
+/fd+mLmmeU4Q3/ASpX4PuFxOCX3bGv4FDsTQzIkPGEMfJUWWKt7fxUlck5qg63+0
+eOefBB/FRR4FGNR6UmcTqIF9LnfOtfHvRGxz5BJSn7GgRiW0FTtPDSrSgPQbZXIO
+JC/jRu8wurrgHUuQPKhhzXOL/+C4op7v4ZNUe5/xmVf9nIU3BW4FVGq3EeKkTq4k
+Pk6TlftHIh7z0ewf3GTZAoIBAQDdkXrZ6MrHmzP8sql2tN92KB/jyDvWq4PiLo1U
+i4U3CF7tqsjRlDNZMvIZz6qT5mTUHdeypSGHGEfncW8DNoh1Z+ROCY2f1x3rUI+o
+5ue9Xkkxlt8vXSNOfIgcU9yBtFYuJg2GKlrTKJ/fNwLsZ6HkvQQDicZsfQk2GIfu
+tf1qPdxM1yUmyJOVIZPna5VPB32YvFEkpieA1lHEwScLHmE9lCMr47r3AP+Pn500
+wxdqn7NvUM7KdnaKqfz8F5JgegvNeCk+FPT1goZYlVPvMWOuqIb/nHgaMxWaC5H7
+iI+M4wPdDrDez93JAZvX1anReTsxPO7ikisQJzmq8AXjzuTdAoIBAQDDQHc4iUun
+yhsFSSoiKaaVIBNP7DOdMSphcNpSGALJ6mEN4ZUcZjp66l4BHkXY1F48TFypaKD3
+HUSUDzy6IxhdsGJxq+vupMzAiaRQCIf4g9EGNMrc4tJBtA7Pa4njxXhZ5/ZsZVLg
+Mm81s120eVrhO1/YcRC3Tt+lDkpBLT3Rg23NZpOy+bJh+2pJAg0vLCg9k48dxJ0u
+EsOaJa0bz6m2fDoc+TqzLr5fi1QcBFZF28qL5npLIys3mIokeefjs5uvC2gvKOQv
+qHK8JHhpPhzvKMvqnH/DJWP7D5Jvld5a/V/ql8Xx5jju57lFTvnvVYkzlMphFJZ+
+B8SQDJTTGu2LAoIBAG+VbYZCm6Tsv8C6hWe37XYG/RBs7d3NoOyOvzRd02gEujH9
+OYd6mGWKp6xiDijP9eVxZgic6warLsMbOGoo0441FSBL5VwjLPkuKDtKllijHD9y
+GNI0mKxVQQLrJPjZRjGVjmgL+pOvONxkSv+drUWR/2x8vUYzrijlL8gDNS2FG+ZC
+z335s4F+WItKffY/8nuyEzdeyjQzOxjYoX4S/avSZ+gZlzX/9bRyEOzad3eGGAqu
+aoZCJK7uru6SPHCD5l/C7RpL2ZWu91OzWIL0n5v9WYdvWHjxUyayPwGrI4gzZ+Wz
+GVYM30f0nHSVMSHCaRIB+th1/mPzLTKuEHlK360CggEAVUW8S7a6kecUcfSIMC9c
+j1hY1tjjmc01IyU0VBIkdaalCHjytFp5Q+FDeN2Nx6rIFTGMbnhBhGsF3lvhO7HE
+HHbCJ77b5XeX7KawWju/lmuLSFiaGGn/Ra6roS7oI8/ERg+mcaS20y9znlJdpEoz
+xJY3v8FxeX06800QZPKrQutRcxlPfCTNITm6K3R36ZgxYuMk5+1McCjFwHaf6buB
+9S6/+pNmbYcGoZep/ipuu0fIZ90an+IWJ8u42UFcYve4EHS85YvITIAWy9Bpvhzg
+ahq5JBeBPOsBhU5Bt/YODFMIJt5uFr1jNAODyJ87TKlgqGRdFpT1PMmLsRWtkZz7
+DQKCAQEAxZvdMh7eg1G9aiG7BOLp1x7KaP/1Sk5Y8nzfqyMDGjYyRp6mmvlpxS08
+1sEEEKQUiOsGnvo5e6mHhmNyWC+iJSPkhGPbGuANc1wo3CIa1h39yEt7zSo+CSCf
+rGblrKPfH14H9WzCALGry5ZfXlZYyb5TPC+AwdJtSzJVpqq7JmvrXAHdDvGk4pyc
+1MfV9jJt+RtlUfjAyGPoG0htmttSM9anq2fRH6CifdWklJ7rDS3bOjtKMa6gQ3B8
+7YQjaQf76piBAWBSaYzSdKQ2cSnjAJ+RTnnXoNpL622Nm8kS00uBT2UKqzCphKCJ
+zC46oUIXA1whJ3OBG35/NWBQxKlpkw==
+-----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signer.pem b/tests/gold_tests/tls/ssl/signer.pem
index 111cd079718..164638c25cb 100644
--- a/tests/gold_tests/tls/ssl/signer.pem
+++ b/tests/gold_tests/tls/ssl/signer.pem
@@ -1,17 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIICszCCAhwCCQD4jSkztmlO1TANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAklMMRIwEAYDVQQHEwlDaGFtcGFpZ24xDjAMBgNVBAoTBVlh
-aG9vMQ0wCwYDVQQLEwRFZGdlMSgwJgYDVQQDEx9qdWljZXByb2R1Y2UuY29ycC5u
-ZTEueWFob28uY29tMSQwIgYJKoZIhvcNAQkBFhVwZXJzaWEuYXppekB5YWhvby5j
-b20wHhcNMTcwODI4MDM0NDQ1WhcNMjcwODI2MDM0NDQ1WjCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAklMMRIwEAYDVQQHEwlDaGFtcGFpZ24xDjAMBgNVBAoTBVlh
-aG9vMQ0wCwYDVQQLEwRFZGdlMSgwJgYDVQQDEx9qdWljZXByb2R1Y2UuY29ycC5u
-ZTEueWFob28uY29tMSQwIgYJKoZIhvcNAQkBFhVwZXJzaWEuYXppekB5YWhvby5j
-b20wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANYwc6JQX45GZmMDEjwxYT11
-uVvuBBInfpYJeU8WIXHrKcX5LUSRcBikiKnlfSnMNRohsu6TElQACc60wQ7Q8KDE
-lBSsS1FaHzCIl1t1AkXRmz/1H65JSBvrV/6Z1NC+Gp58EbH7Gul8ByC1xaJm5ID1
-Dd++kOPlY5ZI9ZcFS7HLAgMBAAEwDQYJKoZIhvcNAQELBQADgYEATX7975NdhIbJ
-glda+sXI9a86GgOpiuKO+vKubRJQZA+UlPf2vHEONjC2+7Y1aZvZYaKYL74vxGky
-zkgp6ANSPl45lqD632x0e1Z7vzW5TkqK1JB2/xH2WgDcQZmP0FuQHzVNs4GjghDr
-HCp1+sQDhfPB4aLmLFeyN0TkhdH1N3M=
+MIIFiTCCA3GgAwIBAgIUdBPFv/tTzlWjeWRGc1oKEsW/GQowDQYJKoZIhvcNAQEL
+BQAwVDELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEZMBcGA1UEAwwQc2lnbmVyLnlhaG9vLmNvbTAeFw0yMTAy
+MDUyMjIxMzZaFw0zMTAyMDMyMjIxMzZaMFQxCzAJBgNVBAYTAlVTMQswCQYDVQQI
+DAJJTDEOMAwGA1UECgwFWWFob28xDTALBgNVBAsMBEVkZ2UxGTAXBgNVBAMMEHNp
+Z25lci55YWhvby5jb20wggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCo
+/ZwiQY8pNL1JBIls5h2lHUbQ3p+Af4xccS+D+SN6yyWJE+kR63kq+HiYsMmLFA72
+pzBjH0GJQ4FXE5n5SiC33wKNYhxBo0ckEPZy3v0xIQGTldCKi+QKR9Rqg3MJqTas
+rsieVGglnhw3Igl384zYiq5yCFD+NLU7FFFF8Ug0Gj+MvX5MCCYv9kn/poWJG5o3
+Zp4eaMoCHIYQYWQxGQyQ5DG6YkpMYhKP7mKNlAM0x2qY7yypo9qXV1XuCu5J86hb
+mGcZfiNWm/ATSq49ysDmILvEqpFT3/y6rH3TFGFRTNAkMBRNZPnwo54UZEpW6ZKz
+MNz6PzFDZkLjQAeLocGRMgzy21WoJrG79A6cnNeHZ9YAXTTSlSV1+qbDcHgXs9rJ
+43cgZdi8j8OAgYasQWQ7Z4QBLnp7B241xHKyt0v2Xxc/PH8BRECYhxoodHQHEmTs
+HjVx5LK7l9K0SmEcBebxNnHKEyA3WqQq/xupDwJjGQpb0mqua3CGCFIiWDPEsSxl
+HWzUY5P7AZRrj156EtoHJ6ARuRNRamM7wFg3v7lh+yoo3JTDOLYsEuBqpkw61S4/
+RP0rI9gdmz9sBakwVc9u48ZrjbuaSKknxHfhjEhyfrtl1rp7H4w0LP6jW+pxat2T
+++YpHKQs3p81P6YD8wYPgmZ/dYBycpsiCRyCoKjc/wIDAQABo1MwUTAdBgNVHQ4E
+FgQUvL2OD0q1YpE9OZDt3Qsaq/TDG6EwHwYDVR0jBBgwFoAUvL2OD0q1YpE9OZDt
+3Qsaq/TDG6EwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAgEAOPdw
+y0LlzqYnew0wyebjQTzGeExnd2ODmKAFj/lvQH4uqWSv1QKVbLCgu4HPJK+PVd6W
+vh/YI/8qz+OgKM2MmPjPJHtAtG8MJMMP5h3IrzOYCZ3qqRkyeodZ+B42//rm22e4
+5CgyVLat2gf4Qxyf/NB+ygXwGjStwu6Drepl5cc/Be6x6Q+ISrIbHEkteISq0v/O
+JYX4p1rtH2qcNxYDM2MYoiZJqBKdj779w+Yjd2+eJefUuzQRW110sYixXdq+0J15
+BaMik4NS+85OvqappdVTY8ccEL71ylapExpEALYB8ur+KFoTHorrQqPNk99JlImb
+GqGzbjNjkTHLnmC46764p83SRe0Mp9f+pQ1L0FaUa4ITSA3FrWkG7zlyFAtXx5HX
+wwcPNmNcG9LfwS/LYL+qZhOETN6oBqYBduxwmvqLtfuZJnmnHegDoIFjTT9gYe09
+YR9x3eoAAN48uEaRaJyZjzqqhUscScMyiWeqINxSTbyL2U9OxYG/s8Te79erN3B6
+17IruSqjWhy8VKz6sML3h5nuDwoqfFdwOMK+9q/sQjenLE+2/CmUX1VBgz7HJ9UH
+da+gV9Pzqr5M12pBiU2krUG6/WhTgO/KLRt3mEnnobvAS7GkjDRHrzkA+auAhZfX
+Zow3a5LMdyOea2JI9hl7sYnoj1qFU3VBg07vLuA=
 -----END CERTIFICATE-----
diff --git a/tests/gold_tests/tls/ssl/signer2.key b/tests/gold_tests/tls/ssl/signer2.key
index dea7a019495..f0a4270f7ca 100644
--- a/tests/gold_tests/tls/ssl/signer2.key
+++ b/tests/gold_tests/tls/ssl/signer2.key
@@ -1,28 +1,52 @@
 -----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQC/0ZxzgzZSY4rx
-+GBEGYKCvUbb8sDKn5dV/HC3WbwJzlwrYZuwimAGv+In0oDpFuCsRGMe8SgpfenF
-aUS7rfnCKYzDYJJLRqzlPnyXkJCEFLeM5PocZYMA9mWw6D7dmQUbVnbkBqbs28bp
-Veq3EqSwL6nYW/vAAbu9yryoqPEcS63qFoVFZ1TZJUgCVg/9C21U1oB3JMg9sOGi
-C2EotMLRp/IVgqjYMF8jZBPdoJUARgrsYUNuq9U4Yx/BKozBJSP/an175i1+TKTb
-s+ugGYyd31opdqRY7slNMvlJFsO8LsplO/75a8tHr+phVXs3dj674h8rx6Kr4tpr
-05H9vQFVAgMBAAECggEBAJNwRHctVeXCCZyvsx7lFMH1Rq/tSW71eFdpcCIeYUCQ
-U5wsrITn96N4fhbp4JhJM2x2LFIuPxaVZ8iLf39a3Gz3jvDmG8ysiFy0yQOe5NYB
-Loynu+9zv1xQCB4QhbHC2oAG19+xlUDeNWhI197b/6ZFHKHnIfyV2H6rhJOHN7zs
-v7uSplxdtUVkof++J1b0Y1xqwusyD2Rft0irDXAiFEXH6oK4VVxCirewvIRk9h7t
-xSO+IJbqg691ayS3DgDcqy34tQAAph5UGwyFYKHO7Z1wBVXQM5YnjEr9EvHPFECf
-sMwZBJMxtKvUYMM02gl7pdETo5hwEZ/WWoutRp4f+oECgYEA+VA1v3VJwYwrvKUL
-dkw3NBR99RoI/e5F8N4KtJK+m0rWB+aboAHv5VC5DSrdzvug+4pZHpx9YC/0ZufZ
-iYjqF/es/J/uiCSfJTMS8n80UsF5oa2GQyIEuD733awBZQ1ruc4+v1WYqpSAcfOj
-bU5f93jTo/UDLLmGuMjLdWPvZvECgYEAxPakhWDcPkNmm17qt9TZ/ClqUxYEScY/
-0QWHLwOXtW00r9GFkl9vfUw9/Gqw1NusocRXa8+ihtSHlxqUDO06Ls7flqB6uuSZ
-CBYnUypE0jT1OMuD3K9FNGc1o9Y8QcSF+Nul2FzbwfQoi7Yv25EO9r/aQ/uF+Oj1
-VL27vPX6KKUCgYEA5KQ51o8zCAyL4+Kc4228RsfwSAMLcg2+GMsZmEboBTUZmn9U
-A+ci4fQo8bl5WCSOm4Fif99WYAs6odFJQIfO4BIllDz8HeEwDoaLftdH3glPigXA
-lvqwx2QAH0xqrwki3XEXPJO8gdvU/CxLmagB/MvTlI7TzYWL1xVW+h6fZJECgYEA
-jcBsO0mweGcNq3guOMtJbr9ntBA+WdICD66I0f8l6f6EUpzaIrPoiyaZ3dXzGd5X
-abzipcazU5IVW1xXfM4md5WPONqaOXNX54f6GVJsYVSXv55IckT563L0GcuPZk3H
-lYiO3R5HUlkj7RjbbIwDVvZQYWjdzHvsRGagfKgSt7kCgYAnfGCYdehHwUGhd4oI
-wOYApT7g3Zfday2oHhOXWhxe2r9Zg/lIIv32PROhT9nIhiyiWrxEMkf5imUPNcRj
-C43cyirFPseuovSiS4V12MEbCBMpl8hmoxHzjmudGKKTdEWoTcx7H6jpQGgII6KU
-8+svtuHZeHaziA8eW6dq/XjAcQ==
+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
+2+QbGHpfTZT9OWQoEg7LTExjbkY3ifg=
 -----END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/ssl/signer2.pem b/tests/gold_tests/tls/ssl/signer2.pem
index 36901ddf21c..370e3c75f3d 100644
--- a/tests/gold_tests/tls/ssl/signer2.pem
+++ b/tests/gold_tests/tls/ssl/signer2.pem
@@ -1,23 +1,32 @@
 -----BEGIN CERTIFICATE-----
-MIIDzzCCAregAwIBAgIJAK1jQyJPinZQMA0GCSqGSIb3DQEBCwUAMH4xCzAJBgNV
-BAYTAlVTMQswCQYDVQQIDAJJTDESMBAGA1UEBwwJQ2hhbXBhaWduMQ4wDAYDVQQK
-DAVZYWhvbzEaMBgGA1UEAwwRc2lnbmVyMi55YWhvby5jb20xIjAgBgkqhkiG9w0B
-CQEWE3NoaW5yaWNoQGFwYWNoZS5vcmcwHhcNMTgxMDE5MTczMzUyWhcNMjgxMDE2
-MTczMzUyWjB+MQswCQYDVQQGEwJVUzELMAkGA1UECAwCSUwxEjAQBgNVBAcMCUNo
-YW1wYWlnbjEOMAwGA1UECgwFWWFob28xGjAYBgNVBAMMEXNpZ25lcjIueWFob28u
-Y29tMSIwIAYJKoZIhvcNAQkBFhNzaGlucmljaEBhcGFjaGUub3JnMIIBIjANBgkq
-hkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAv9Gcc4M2UmOK8fhgRBmCgr1G2/LAyp+X
-Vfxwt1m8Cc5cK2GbsIpgBr/iJ9KA6RbgrERjHvEoKX3pxWlEu635wimMw2CSS0as
-5T58l5CQhBS3jOT6HGWDAPZlsOg+3ZkFG1Z25Aam7NvG6VXqtxKksC+p2Fv7wAG7
-vcq8qKjxHEut6haFRWdU2SVIAlYP/QttVNaAdyTIPbDhogthKLTC0afyFYKo2DBf
-I2QT3aCVAEYK7GFDbqvVOGMfwSqMwSUj/2p9e+Ytfkyk27ProBmMnd9aKXakWO7J
-TTL5SRbDvC7KZTv++WvLR6/qYVV7N3Y+u+IfK8eiq+Laa9OR/b0BVQIDAQABo1Aw
-TjAdBgNVHQ4EFgQUQbZJDhAynmvgB4Ugim8qkfTqsSIwHwYDVR0jBBgwFoAUQbZJ
-DhAynmvgB4Ugim8qkfTqsSIwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOC
-AQEAhMh2BrVhhV3gcWv9sxK2TP5I//4iqnR3zxpdKMQ3z/wj2JQyagjHdLyHhyBc
-OyXZsO0WjPt5EPZxI+GpERVz6TiAW/IiiWuF2AtmNE7Kz9FouQCBHSXKGRNt6GWa
-PE5xrOfc/UhTpeDjfHPF4vmIJ7aBiHGt6xv91dLhvrCQZcf0jESS3ZCRvlouIgWW
-yKRPPIfxjJm0nwVzjmEhr1R4TVPSQRfQ8is/kYx2oRXjKuwftYlKlaj8wu0NoASs
-ZOv43f+lPei9QPKqN4Hawym6NMfJlKNBaIEqzw/8F+Td74QbCEsnf8AaZD2ccIph
-ea34ZvlNcntNiM9+4qqyS+V1IQ==
+MIIFizCCA3OgAwIBAgIUDi11tr0/bomGmXNDk75K+Eyo1KswDQYJKoZIhvcNAQEL
+BQAwVTELMAkGA1UEBhMCVVMxCzAJBgNVBAgMAklMMQ4wDAYDVQQKDAVZYWhvbzEN
+MAsGA1UECwwERWRnZTEaMBgGA1UEAwwRc2lnbmVyMi55YWhvby5jb20wHhcNMjEw
+MjA1MjIyMTM2WhcNMzEwMjAzMjIyMTM2WjBVMQswCQYDVQQGEwJVUzELMAkGA1UE
+CAwCSUwxDjAMBgNVBAoMBVlhaG9vMQ0wCwYDVQQLDARFZGdlMRowGAYDVQQDDBFz
+aWduZXIyLnlhaG9vLmNvbTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIB
+ALQEUc+OQnPNp62Run+B/4aCQc36rLePB+RmHWF3AUJsr2kjpivJt5Zl38WzJA6h
+s1WNRgjL55tqxxijYleGsfk66heAltItp+a8I9jrFWzMtexB3lt46DtN+S5vwyGf
+KHQOKwbH40Vp1gLS9XD2+0ChCu3zYW/UaKG5KwTh3rGYIjeOjrm0/27s46ARovKm
+5ReyIhu6JiPNFKAuUEM++pcAzAVE7p+jQqKZSlxx/NzqDcqjqTEoX3oM221iGp+a
+M+F0Hyqsm7Vq0PxPRMfa0iyyfDJgugN+D/Dbx/R1XdrNRrDogSejhDxHm+1p+h/L
+XAgvOjYf7H1hDubd/XlMIzGdvybq4B7Mqeh9GUykpbbr08/RBfOCVEOgDNbzdCLl
+LVzBVR9+ylDk/fQ9k7GvzSrX8QPlu9ml211j/DqJaqW2GeT7TXXNZiZFKTkKdPA9
+J4Ke+LHUwZDEYkmhpOvl7kBbgDYTlFi+jh93H/tNwbePn1SH1YLotuOCQb/woDm7
+ubQ/zAdPuylfFe3tjHPwLb+bPAvctOvyTmZ/bwZBnIWVWHX/aeadcKRSz+Xe67hf
+KIZRbPfBgjXo0QokxjN9awYwmduwhh4cWMgxOxbwHeryXVwGvyWpWqgv7K/4OmEx
+B+5cFoAT55VwNAzBVj30aiXT03d6vJ8pmIM2lAcu4U3ZAgMBAAGjUzBRMB0GA1Ud
+DgQWBBQXYjzsFhfGlmZyl+Jp32wdqu54ozAfBgNVHSMEGDAWgBQXYjzsFhfGlmZy
+l+Jp32wdqu54ozAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAt
+mHm1nUiWeILvuGzlEw0FzOuJJLGFDfxn5VRGPcGnEFxvwGX9Djt5YOAZyd4t/jDV
+fHWUZBiK7efqEkfiu3lSLtA9j9Q8BzN3F+CRBdMjpsspbrwDeeAQusjoAd+o/Xp9
+C6+y4AEHTIry+4GC7gRPgvag4sn/8zWtEMHa6WWHEdxMblx8eoNbIarPleW2FJy7
+sCYWrJRRGzNowtCxQ1jGeZxr0eouFSzA0Htk2Z2BNGqn2UgNSltBw0zVEspa96uB
+5dmhxqHzQc41zMiVHGspNjTqFEK7Rv6vQKHF423twwib9vBWC4VgcN1E0WyEZb6q
+80ejAWqbPxWmXhbS+QwabkHt9gXknmKY2VGrFejq0txL3b42bO/nEz5a5xBxxhro
+guS4RlSA9H88/iCFQSWe1JWSAnaoOJK+M+hmnhRACKW+qqVngKIiDDAFPaFEE+bB
+X1OSqGGywPIakuhtJSa99oXcMqIEp3MFMkgZl27/7jO0qF66dp0sJzyzIl6UifY9
+URpqcW3avVBc1hQVO1fNB/9oa2s+/TWdUiaHaGiSiJnT9xiSeP5WOuzIpc8DuBBB
+tEn3LkfokfTME0ngmna9ghVnep6dY3lXidx2jMzlUkd4cd9Nu71Ek/cxPUFUmre4
+2AZzqBIAIB54u8GOOJyToOxHsTEeriXViQ7E0ZyFWQ==
 -----END CERTIFICATE-----
diff --git a/tests/gold_tests/tls/ssl/wild-signed.pem b/tests/gold_tests/tls/ssl/wild-signed.pem
deleted file mode 100644
index d6f25ff7086..00000000000
--- a/tests/gold_tests/tls/ssl/wild-signed.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC2TCCAkICCQCTw2t3s0sIrjANBgkqhkiG9w0BAQsFADCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgTAklMMRIwEAYDVQQHEwlDaGFtcGFpZ24xDjAMBgNVBAoTBVlh
-aG9vMQ0wCwYDVQQLEwRFZGdlMSgwJgYDVQQDEx9qdWljZXByb2R1Y2UuY29ycC5u
-ZTEueWFob28uY29tMSQwIgYJKoZIhvcNAQkBFhVwZXJzaWEuYXppekB5YWhvby5j
-b20wHhcNMTkwMzExMTQ1ODEzWhcNMjkwMzA4MTQ1ODEzWjBAMQswCQYDVQQGEwJV
-UzELMAkGA1UECAwCSUwxDzANBgNVBAoMBmFwYWNoZTETMBEGA1UEAwwKKi53aWxk
-LmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAM51MZvJ4anfZkoF
-w+yLI+qtSamz/nOEeaNYvpJIzfH/qG04hxujCMfodknWoElBcJfzJ6I+RTDev4DZ
-QFiDaetwQv4/+H17fTc2RJR1PdOKA06rRfm76P6CrlRttWFYLfcUTooTUoQUBFGu
-EFTBGWUpFWU4fVXbYKLT63PzEkCeeHU5wf7Xz88pTYI21ZWnQQt2ll+zXLgSHFCP
-m9XO5Q/Dr++XpFI2joCYj1GL/y3mku26sdK6ZYxRo9oseYiVX8K9T6Oeo4O32CcT
-3ZE4QMa1jXcb5r4Y6VBdneZkur10CW2+yDT9MX5dKBeeuB9UUTYClt7lJdncl5DH
-GdLrV9kCAwEAATANBgkqhkiG9w0BAQsFAAOBgQCRpZoeIRSF83Iiy7COW59KG9qq
-T9pSCbJnqJr9ri1usmgcO9mfb7lQt94RXCtNz+tF85ciDE3zXcM6nJyosgStQEbb
-AkGcW0z29Lc+Owc6SYtN6o4fEgPM61SSABtdG26jhpzMjT8MZNXluqXJ6tR0HWki
-Rep/Bm0POzeUeKb8GA==
------END CERTIFICATE-----
diff --git a/tests/gold_tests/tls/ssl/wild.key b/tests/gold_tests/tls/ssl/wild.key
deleted file mode 100644
index a7b57205e2b..00000000000
--- a/tests/gold_tests/tls/ssl/wild.key
+++ /dev/null
@@ -1,28 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDOdTGbyeGp32ZK
-BcPsiyPqrUmps/5zhHmjWL6SSM3x/6htOIcbowjH6HZJ1qBJQXCX8yeiPkUw3r+A
-2UBYg2nrcEL+P/h9e303NkSUdT3TigNOq0X5u+j+gq5UbbVhWC33FE6KE1KEFARR
-rhBUwRllKRVlOH1V22Ci0+tz8xJAnnh1OcH+18/PKU2CNtWVp0ELdpZfs1y4EhxQ
-j5vVzuUPw6/vl6RSNo6AmI9Ri/8t5pLturHSumWMUaPaLHmIlV/CvU+jnqODt9gn
-E92ROEDGtY13G+a+GOlQXZ3mZLq9dAltvsg0/TF+XSgXnrgfVFE2Apbe5SXZ3JeQ
-xxnS61fZAgMBAAECggEARyRdFtjHGRkxDzrTW5RKqRhTdNXgTYANxjrTWGccCFLX
-f+NlsyFH6lLxR9pcW0HggYu5UY/xmbh39vdl09pcylNh0mjKwLqn2DmsAhgwWM+K
-+jXMpBSbYfA4EEHJqaSQGj72HWAxI/Ad2OOJHxt3G8O/aqS/k7FHqHQsA0V0Oa2D
-NFLscCQxzH3IzUhbhZhtoCrtNfFkxSgx7RQbHMHNxMqaNU3MtKafQ1KJqR+SuuQL
-donKPL6A0Xi8MKOc8qsyrGtKL/+EEY0W77SRJAkY8N29X1oMNPnGzLsicarwhHLX
-1KT+rxBISJ/tbGuTvaJNbCepvO6I6QLZshQZt3MuAQKBgQDvbdSoEzfDO3vcbphH
-QMGjASMkGP7T/goCvFQwUGN03GtMnoHuYbbfpZ6iOcYVGefU6v0LDOqhczTwKFVq
-44msdQt/T1k9A+wHp6/1SnxObJT8wJoGmJO9qryc0yoRYt3lv20jl3GSC5xMjrJL
-2Ko9DwNZaZNTlOFLJzzOOSUqwQKBgQDcvy7zupQivgK90gFId/iRjXz0UuVWseGo
-osDL+BV4w4jTltLUE6AMVRQCqF85O1spCcn3AKjU+kWj0fIcB38y2UZRv6Moy/u8
-w5fRAhHONqNPwb9yOLNplLdm7lOE6mm+nYVgauh13nca8bxeNKmRZe7tyEu2i/4o
-kZqTecvrGQKBgAm/QuUEw0Rja4txxSlBbaChLzkM+3LN6MJrwFGnNCVRw9x+p3N4
-7uTz7R1VlMbPIyz71AlbIUIpWoJcYf3T/YrTyQAJzuw4+KbnILavrZfTu8z+Wkbi
-d0FFbiBESHYkvDvaKytDww/bASXsuT11OJj7v3soXSMN8I4KruMGWIkBAoGBAMQl
-GNo2ylQIlDUIul0jRPpIR2RtmBytmH6Yh0l2GdYhoJ2qIZGSEp+CpXIrG9ml1T2k
-1hGlQ19jNqf27/NZ8ftDtskCyD6C6h9ziJ2OAjZCtGA1HyCmIz1IiKJsWEf9ZpKa
-Mx5WQFIjp5+IdsEaeCWa9m/Qjv4YbHCt2DT8f2ZZAoGBALzd1ju4Sf5k+eP4QDO9
-jWRRRyjHIrT8RX4Hb3YZWJmW8edxjlV63GKVyuwv+PNyaP0hrLpVEw7h9tAYaIoL
-DAjqph02ujDBe5oJrOMrO3IkxVqHj2PQFBnFR0MCbkQ9/+vyTt7ftmwXwQQFeDVW
-YcOEYXCqeaAzjN9t0xidlkX7
------END PRIVATE KEY-----
diff --git a/tests/gold_tests/tls/tls_verify.test.py b/tests/gold_tests/tls/tls_verify.test.py
index 08226a5c686..1e14b4e6870 100644
--- a/tests/gold_tests/tls/tls_verify.test.py
+++ b/tests/gold_tests/tls/tls_verify.test.py
@@ -32,8 +32,8 @@
                                             "--cert": "{0}/signed-bar.pem".format(Test.RunDirectory)})
 server_wild = Test.MakeOriginServer("server_wild",
                                     ssl=True,
-                                    options={"--key": "{0}/wild.key".format(Test.RunDirectory),
-                                             "--cert": "{0}/wild-signed.pem".format(Test.RunDirectory)})
+                                    options={"--key": "{0}/signed-wild.key".format(Test.RunDirectory),
+                                             "--cert": "{0}/signed-wild.pem".format(Test.RunDirectory)})
 server = Test.MakeOriginServer("server", ssl=True)
 
 request_foo_header = {"headers": "GET / HTTP/1.1\r\nHost: foo.com\r\n\r\n", "timestamp": "1469733493.993", "body": ""}
@@ -56,8 +56,8 @@
 ts.addSSLfile("ssl/server.key")
 ts.addSSLfile("ssl/signer.pem")
 ts.addSSLfile("ssl/signer.key")
-ts.addSSLfile("ssl/wild.key")
-ts.addSSLfile("ssl/wild-signed.pem")
+ts.addSSLfile("ssl/signed-wild.key")
+ts.addSSLfile("ssl/signed-wild.pem")
 
 ts.Disk.remap_config.AddLine(
     'map / https://127.0.0.1:{0}'.format(server.Variables.SSL_Port))
@@ -111,8 +111,8 @@
 tr.Setup.Copy("ssl/signed-foo.pem")
 tr.Setup.Copy("ssl/signed-bar.key")
 tr.Setup.Copy("ssl/signed-bar.pem")
-tr.Setup.Copy("ssl/wild-signed.pem")
-tr.Setup.Copy("ssl/wild.key")
+tr.Setup.Copy("ssl/signed-wild.pem")
+tr.Setup.Copy("ssl/signed-wild.key")
 tr.Processes.Default.Command = "curl -v -k -H \"host: foo.com\" https://127.0.0.1:{0}".format(ts.Variables.ssl_port)
 tr.ReturnCode = 0
 tr.Processes.Default.StartBefore(server_foo)