From 5a607382c70e2cffbba64b64c8b21bf3b123e0eb Mon Sep 17 00:00:00 2001
From: Pierre Souchay
Date: Wed, 16 May 2018 18:59:57 +0200
Subject: [PATCH] Revert "Certificate for Alice was too old, updating it for
tests"
This reverts commit aeac0580acd4b5de977a4024417753a67f64820e.
---
test/hostname/Alice.crt | 32 +++++++++++------------
test/hostname/Alice.key | 55 ++++++++++++++++++++--------------------
test/hostname/certindex | 1 -
test/hostname/serialfile | 2 +-
4 files changed, 44 insertions(+), 46 deletions(-)
diff --git a/test/hostname/Alice.crt b/test/hostname/Alice.crt
index cd9be35c7a..1d2e9a7589 100644
--- a/test/hostname/Alice.crt
+++ b/test/hostname/Alice.crt
@@ -1,23 +1,23 @@
-----BEGIN CERTIFICATE-----
-MIIDyTCCArGgAwIBAgIBGTANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMCVVMx
+MIIDyTCCArGgAwIBAgIBGDANBgkqhkiG9w0BAQUFADCBmTELMAkGA1UEBhMCVVMx
EzARBgNVBAgTCkNhbGlmb3JuaWExFDASBgNVBAcTC0xvcyBBbmdlbGVzMRkwFwYD
VQQKExBIYWhpQ29ycCBUZXN0IENBMQ0wCwYDVQQLEwRUZXN0MREwDwYDVQQDEwhD
ZXJ0QXV0aDEiMCAGCSqGSIb3DQEJARYTamFtZXNAaGFzaGljb3JwLmNvbTAeFw0x
-ODA1MTYxMTA4NDZaFw0xOTA1MTYxMTA4NDZaMHwxDjAMBgNVBAMMBUFsaWNlMRMw
+NzA1MTIwNjE1NDhaFw0xODA1MTIwNjE1NDhaMHwxDjAMBgNVBAMMBUFsaWNlMRMw
EQYDVQQIDApDYWxpZm9ybmlhMQswCQYDVQQGEwJVUzEiMCAGCSqGSIb3DQEJARYT
amFtZXNAaGFzaGljb3JwLmNvbTESMBAGA1UECgwJRW5kIFBvaW50MRAwDgYDVQQL
-DAdUZXN0aW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwWOMeMou
-mi9RWzYqRTVFpES4jP5BhC71aMZxiQ912OVeFqnDfOyK2BNjoq2rk39vxkBXFn9o
-HkLh+6ITR/4waslF6zVhRrIHD/f3LrXzIL0KI0lkM8EJso+TG9AjTd4A9+/fKQ5C
-iIoFVggQfIKZ1thYC2vnQIUo3OZT+Awqbu0rBUuRUw+h8jOMk6DOsIrwTTCR1erw
-FyYWalTR4GMbaNiBb7rjuj0cbU1FFl80u+h5k1QrmYBklWR01fl33b9BLemSSVyX
-URU9Zxid7koarGI60PqwU1R/i3KJ4HoBEatZp72qsmiDWIE8bifBQAnpaTCNu7wI
-H63glOPzWmckwwIDAQABozgwNjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAcBgNV
-HREEFTATghFzZXJ2ZXIuZGMxLmNvbnN1bDANBgkqhkiG9w0BAQUFAAOCAQEAWCFW
-fkLO7BaMNpDA/0CAZsIol6eGBvcs96Cm2rUqKSsT/vNNY+HSk3Meq3YX9qUWEN/3
-Fy2i83cxW/+2OGcueg4cifk2j65Hl7D3e4KKny4Hgrfsx129+omlT7fsEfJfEeAk
-OYgi//We+0y7Acg2fMjxDIX8GWv7R2RmbdXfB0FHq7BKDwGNhArOa7EHImcn5GGW
-NS2jb/jvsQyRE7dIJfrWtbb4hzm9fSvZDa1aZ7k8QGGeDpRWnWw9lA7twE8mmo3+
-vLigpIfabIOkd0I3FxiRzDOnP0kaGppXfcL3s+rHA3GWkjOU5itUQ+WP+9+5N6re
-/DMUgsI/xzvxi5+dWg==
+DAdUZXN0aW5nMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvDVBeQvC
+7hVijs6jjWzgD2c2whjBvDDqAzUOs2Xk1JfD2TT+eVPP47cuK4ufB3EbfYwrgq/J
+v1NRvstEDXp1Croof8E3oBWbR3sXVK8BAiwwRVLuY95ApvqL8VkxXTSkp7hcE+dK
+AGJH3+m4T+0nxgasHhWYJO2wsJy9/dVL3cQN+tXvgzo7PZCX83dmiTDh2M9A+Uo8
+lSWb5YAhf8n2b3C4K+qLNhtGRpO33GfQ5XNkuRMTLbwu7eUP0IjYdrt8LmUpgrWB
+WyGaQDUutisi5kv47yuK1d4o6q1LVHjvaFRtKKpiFQVZJCJMmdB9SI6QiOqFuyVC
+EM4MgzRtkRW4UwIDAQABozgwNjAJBgNVHRMEAjAAMAsGA1UdDwQEAwIF4DAcBgNV
+HREEFTATghFzZXJ2ZXIuZGMxLmNvbnN1bDANBgkqhkiG9w0BAQUFAAOCAQEAJsFF
+Bj7rz0z/GDGtaAth5SIsRG9dmA9Lkyfpbjz351jp8kmFCma/rVBBP3yQ/O4FcvbY
+DImmqEnotS/o5CcJI1jtjFcqW+QllFCWhY1ovkkEmyAFE9g5gLGKXxPX/uuvdVly
+LgLNu7wgE2SHcUpDGPRt/xfon7syb/ZWUDU43xNkGFmgZyb9xTIWkmxYDuXYSPUY
+Zb5YS2GWrX28HOrkkm4DY/Gf71w7eM4FKe/q/8hXQqkDooHPYE1aFZX2mgLhnr+Y
+cdLsR5AlF7PgE4WmOHWVm0WyH1c8Df39AlgFXPyZEOl6Zt00m6PWbqHnkojcaaNj
+jq7ykWgpRkdSgQSa+Q==
-----END CERTIFICATE-----
diff --git a/test/hostname/Alice.key b/test/hostname/Alice.key
index 834b4017bb..db4ab769d3 100644
--- a/test/hostname/Alice.key
+++ b/test/hostname/Alice.key
@@ -1,28 +1,27 @@
------BEGIN PRIVATE KEY-----
-MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDBY4x4yi6aL1Fb
-NipFNUWkRLiM/kGELvVoxnGJD3XY5V4WqcN87IrYE2OirauTf2/GQFcWf2geQuH7
-ohNH/jBqyUXrNWFGsgcP9/cutfMgvQojSWQzwQmyj5Mb0CNN3gD3798pDkKIigVW
-CBB8gpnW2FgLa+dAhSjc5lP4DCpu7SsFS5FTD6HyM4yToM6wivBNMJHV6vAXJhZq
-VNHgYxto2IFvuuO6PRxtTUUWXzS76HmTVCuZgGSVZHTV+Xfdv0Et6ZJJXJdRFT1n
-GJ3uShqsYjrQ+rBTVH+LcongegERq1mnvaqyaINYgTxuJ8FACelpMI27vAgfreCU
-4/NaZyTDAgMBAAECggEBAJJhDYSoVNn0EvqdZyV3iz0pnx9pnKG3AZ7LBkkeYK9J
-/gvdd9DpIrcnBfWuyv4cKbjAHqsyyNaO/YqARWPq7S8HJltAzl66hkn6ASlkI6GW
-NUQ8WxIpfXOg5VLaGr7n2YfSEvJ6jrXW8u8Jr6DvIg7TNuF+TU4y/Jkn5ksMulm2
-7lDM0ccemYPt6EGS8CNh9UxGGEuDFpz5C+FOYNu0l2TEP7dyxBBsQgKQ/ni53EVS
-mfSKFB42XqVp6uNFl4nuQGaRfJQTz+HoqM9yvGXx+4VbCwpvbWStuoPM9SSOjilG
-9sZrsT4BWfaN+k4bF6vkiPFTG9re8UXw7KuwldZWUrECgYEA3wLGp28GDZ4jdhhJ
-CU8PD4xqrJxGp/thGPL8PPeJK1ESdwePNcG8ejsDZtixgk6lkOuZaW0ISXTC2mCO
-YYCesass9zVfWkM3DgLWFO1DMlOLdu+qSHNA1/TaDG2P1C4q4C48Nlg7P6bvRv5q
-0lhzMe5HHxGY02LaHAaFgeeV3l0CgYEA3f8DsAT15LKmh9VWtZuvdd/ai6NV2WbM
-CQDtlF9X0kxqC0vOG+BemhcGVI5JUR8ajl5dhcLuV7xGJ6CxdDp6xG8rBx0cezs3
-kGwDeP368AeONudcJv6vHmOkWCkRMlQx1gTUt+rRIEV0WkvNYFIX73wBcaXHHkti
-am/596mPnZ8CgYBbJ6NTpQnwXwdXqi2QZIRfcqHX1Dj9SL8zl36K3RNwZT8K8EgV
-TQ9hVuXZEBHelY8PYX3fnfWZMOTEplsMd6pmLPXARkyndHn4fChNfX3OAGAtSWFt
-I88Jdsf59H6p2AUmhT+PZxkwt2duuWeoewb7Dc58YJD7Npi4g+Hma2bS8QKBgE/M
-iYDOZ62L4nzVXVPu4MWYcDDdx9BcOV/LK5u4IhOAUGY7G529q4PsXuQqOYSlj6A5
-n5ijl5WGIhnAk8lZ9COEao0mE8TgZnrNuPnXIksCDEcEJ4YE6uIbo0nliT70MO3j
-0qtCB2Z4UPjcYrkLCXuWsdYuZ0MmifwEwHAcTXm1AoGAW5OQ6WYm6dtfoO6XeGt7
-tphAIiKwtiIm2iyWr/wPOHF15F57X5RTq2G5QYvXLu6WVe6NIKY0/LT7Aa6h+E98
-bFk7yX/JgMIA8o81sFTeyjHrukl0JvlvyqO2y5KuQq8omMDoiGV83T+dJuD77HpF
-cZA3Drn6DYCB/ApOVxRIQYM=
------END PRIVATE KEY-----
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAvDVBeQvC7hVijs6jjWzgD2c2whjBvDDqAzUOs2Xk1JfD2TT+
+eVPP47cuK4ufB3EbfYwrgq/Jv1NRvstEDXp1Croof8E3oBWbR3sXVK8BAiwwRVLu
+Y95ApvqL8VkxXTSkp7hcE+dKAGJH3+m4T+0nxgasHhWYJO2wsJy9/dVL3cQN+tXv
+gzo7PZCX83dmiTDh2M9A+Uo8lSWb5YAhf8n2b3C4K+qLNhtGRpO33GfQ5XNkuRMT
+Lbwu7eUP0IjYdrt8LmUpgrWBWyGaQDUutisi5kv47yuK1d4o6q1LVHjvaFRtKKpi
+FQVZJCJMmdB9SI6QiOqFuyVCEM4MgzRtkRW4UwIDAQABAoIBAQCPfFqKGjlmoc8d
+6NQwAg1gMORCXfV1sCT4hP7MLqainYGmmwxXG1qm1QTSFgQL/GNk9/REEhjRUIhF
+2VnsnKuWng46N+hcl5xmhqVm3nT6Xw3+DBfK86p+ow0F12YXFQdjBt7MHc0BNext
+/RWTec6U3olh9jykCsJmI1mFp5PLYVg4OjJz6v0GdnkBv6CCuwv0Talz8vEX4js9
+AZvPAlCFR2rqmdAwpeHV/dk4x4ls04Hv8g1L40EhToBetfKOeT4PWA3Svg/71uGg
+6QqQi642quWXZQL255fP9crMYfj12AUbFe4+ET6/3wZkpFeNgifAbLY1lOfEhjD3
+ey7OjNhhAoGBAPUyoEpu8KDYgHM2b68yykmEjHXgpNGizsOrAV5kFbk7lTRYqoju
+jKDROzOOH79OU+emCz9WlVatCrSXZoVMEfCIVtSsuL19z492sk2eX3qGz0fRN6Os
+/z8K9QZ1fIAw+8W1QnwRRqZhRd7SiFLKrGY7huoq9KL8hqHx2Jw9KSlPAoGBAMR/
+5ERVShxS+ADfFtRoUMEd9kcFEleQiq4tWosyAxB27+f+Q8lAIKNjmVNE1F1RC/Fi
+h6BeQBbM6n9j5Q8+r8st7OYBpEu260teAKiE8GlB8s1D2s4oDvB5usvWnsl53gTU
+WdpP5/M2Ioze5fl/8dZXshGPb6gHMXqwSNPr+fe9AoGAG9yn2C1pDG3tkqnx4O+d
+iuMT7uUa9XNRmWxaGHa4/TZnCu60WiD5O+DqoD4bH2rwH9d/WbAmAhZhrAm0LZtq
+QnHLpBkIWQftyPiM5EMFyG9/KEL+1ot26Zv+IcDB5/Mo+NtS9bQk2g0dmmdD9Fxx
+YKCNARjmeYrGZaqMmZxdjAMCgYEAhXE8uVMaYyXNGfpmbJTy0lLgntZI4IJeS26t
+YH30Ksg6n9fCfPc5svu+chf6B+00KRb6d+PJrjI2xZA3TCUMCPUFPiW7R1fPbn1G
+AStWgISyuMbt3rbBfnmMa0UyzCwgpDL5WhKNuFL5H6V3k/pZZ3Bikx5Pe1J3PZRd
+wN0uAhkCgYEAm6PvhIWY8dtOIJZOKB+GcuSfFKJrvfWPL7Lb6gfq45ojsl7EoMiW
+h/uetqAYaAr4kQCZApSfrtwc5GeB8o93Xl6gFqM3Qo32wCITMaSrNRMuEtq1G9AX
+Q+rGXgPFsMMA8nV3QOMftBNWan5O74w24+4LDu4WQex7EAaiH8J+jkk=
+-----END RSA PRIVATE KEY-----
diff --git a/test/hostname/certindex b/test/hostname/certindex
index 764b6477a5..a84dae0793 100644
--- a/test/hostname/certindex
+++ b/test/hostname/certindex
@@ -1,2 +1 @@
V 180512061548Z 18 unknown /CN=Alice/ST=California/C=US/emailAddress=james@hashicorp.com/O=End Point/OU=Testing
-V 190516110846Z 19 unknown /CN=Alice/ST=California/C=US/emailAddress=james@hashicorp.com/O=End Point/OU=Testing
diff --git a/test/hostname/serialfile b/test/hostname/serialfile
index 268de3f3ec..d6b24041cf 100644
--- a/test/hostname/serialfile
+++ b/test/hostname/serialfile
@@ -1 +1 @@
-1A
+19