From 483dffb7ce6e668fb89ac373f6a6a9f6c6b5a060 Mon Sep 17 00:00:00 2001
From: Cedric Staub <cs@squareup.com>
Date: Tue, 27 Oct 2015 10:41:20 -0700
Subject: [PATCH] Add makefile for generating test keys, update test keys

---
 test-keys/Makefile    |  17 +++++++++++++++++
 test-keys/README.md   |  31 +++----------------------------
 test-keys/client.crt  |  20 ++++++++++----------
 test-keys/client.key  |  26 +++++++++++++-------------
 test-keys/client.p12  | Bin 1597 -> 1597 bytes
 test-keys/openssl.ext |   2 ++
 test-keys/root.crt    |  22 +++++++++++-----------
 test-keys/root.key    |  26 +++++++++++++-------------
 test-keys/server.crt  |  20 ++++++++++----------
 test-keys/server.key  |  26 +++++++++++++-------------
 test-keys/server.p12  | Bin 1597 -> 1597 bytes
 11 files changed, 92 insertions(+), 98 deletions(-)
 create mode 100644 test-keys/Makefile
 create mode 100644 test-keys/openssl.ext

diff --git a/test-keys/Makefile b/test-keys/Makefile
new file mode 100644
index 00000000000..dc3d79f0457
--- /dev/null
+++ b/test-keys/Makefile
@@ -0,0 +1,17 @@
+all: root client server
+
+root:
+	openssl genrsa -out root.key 1024
+	openssl req -x509 -new -key root.key -days 1000 -out root.crt -subj /C=US/ST=CA/O=ghostunnel/OU=root
+
+server:
+	openssl genrsa -out server.key 1024
+	openssl req -new -key server.key -out server.csr -subj /C=US/ST=CA/O=ghostunnel/OU=server
+	openssl x509 -req -in server.csr -CA root.crt -CAkey root.key -CAcreateserial -out server.crt -days 1000 -extfile openssl.ext
+	openssl pkcs12 -export -out server.p12 -in server.crt -inkey server.key -password pass:
+
+client:
+	openssl genrsa -out client.key 1024
+	openssl req -new -key client.key -out client.csr -subj /C=US/ST=CA/O=ghostunnel/OU=client
+	openssl x509 -req -in client.csr -CA root.crt -CAkey root.key -CAcreateserial -out client.crt -days 1000 -extfile openssl.ext
+	openssl pkcs12 -export -out client.p12 -in client.crt -inkey client.key -password pass:
diff --git a/test-keys/README.md b/test-keys/README.md
index 2514b9eb2c2..3363a4a562f 100644
--- a/test-keys/README.md
+++ b/test-keys/README.md
@@ -1,31 +1,6 @@
-Generate test keys
-==================
+Test keys
+=========
 
 The certificates and keys contained in this directory have been generated for
 test/development purposes only. Do not use these files in production
-deployments! See below for instructions on how these keys were generated.
-
-You must first generate a root certificate:
-
-    openssl genrsa -out root.key 1024
-    openssl req -x509 -new -key root.key -days 5 -out root.crt -subj /C=US/ST=CA/O=ghostunnel/OU=root
-
-Configure OpenSSL to set extensions and subject alt names:
-
-    cat >openssl.ext <<EOF
-    extendedKeyUsage = clientAuth, serverAuth
-    subjectAltName = IP:127.0.0.1,IP:::1
-    EOF
-
-Finally you can sign server and client certificates:
-
-    openssl genrsa -out server.key 1024
-    openssl req -new -key server.key -out server.csr -subj /C=US/ST=CA/O=ghostunnel/OU=server
-    openssl x509 -req -in server.csr -CA root.crt -CAkey root.key -CAcreateserial -out server.crt -days 5 -extfile openssl.ext
-    openssl pkcs12 -export -out server.p12 -in server.crt -inkey server.key -password pass:
-
-    openssl genrsa -out client.key 1024
-    openssl req -new -key client.key -out client.csr -subj /C=US/ST=CA/O=ghostunnel/OU=client
-    openssl x509 -req -in client.csr -CA root.crt -CAkey root.key -CAcreateserial -out client.crt -days 5 -extfile openssl.ext
-    openssl pkcs12 -export -out client.p12 -in client.crt -inkey client.key -password pass:
-
+deployments! You can regenerate them anytime by running `make all`.
diff --git a/test-keys/client.crt b/test-keys/client.crt
index 97b580f69e1..c01cc9a4fa3 100644
--- a/test-keys/client.crt
+++ b/test-keys/client.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICQDCCAamgAwIBAgIJAKNePtFE5+2GMA0GCSqGSIb3DQEBCwUAMD4xCzAJBgNV
+MIICQDCCAamgAwIBAgIJAKNePtFE5+2JMA0GCSqGSIb3DQEBCwUAMD4xCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTETMBEGA1UEChMKZ2hvc3R1bm5lbDENMAsGA1UE
-CxMEdGVzdDAeFw0xNTEwMTIyMDA4MzJaFw0xNTEwMTcyMDA4MzJaMEAxCzAJBgNV
+CxMEcm9vdDAeFw0xNTEwMjcxNzQzMjVaFw0xODA3MjMxNzQzMjVaMEAxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTETMBEGA1UEChMKZ2hvc3R1bm5lbDEPMA0GA1UE
-CxMGY2xpZW50MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDB18heghKA2B8J
-ndS0oPHkGL2frNMYJbwfX8rzX9vucIm/a1dbRPsHhIS4gS4REQnxmfDDLXLGNtkY
-j88sHhiUC35MZhqTVyE3vOq5ZDB7t4mQEr1HY5pU1pgeLfRb+cnZJABf4iISy/ry
-zoXa0zlb9wSkkrmsZeYLh/E4UUSIewIDAQABo0QwQjAdBgNVHSUEFjAUBggrBgEF
+CxMGY2xpZW50MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4W1PvR6RCPdMB
+4GZ7Q0mK8D1u8OBLA78ApTsUQt49wL8JXWRu7cQbopcWx45teCduUdeU5EZ2YlRT
+aTJV/QlILUJr0B6DgamjmTXRn3TZYBosVfp5z97YI2Xo5izC4Y3nfJtuygL0mjIF
+B7tL0Q8N6Fo139VVx8TmVkyZT8yrFwIDAQABo0QwQjAdBgNVHSUEFjAUBggrBgEF
 BQcDAgYIKwYBBQUHAwEwIQYDVR0RBBowGIcEfwAAAYcQAAAAAAAAAAAAAAAAAAAA
-ATANBgkqhkiG9w0BAQsFAAOBgQBhe55wkdpr1zhTrlRufBUCHJsL39ECfwiyYGaq
-mXMkoLAr3G480Lcfw9At/DbCKAxM/Xz/v+23Xsa9O00XaMUoX/xyOlTXfi6pgmqr
-IXSLky+YDRv2pM7aqRW54QXGdquYVtyVLqo/Nx9hk/PqIlLy4f/TCqizGKfKrV2/
-kSR2gQ==
+ATANBgkqhkiG9w0BAQsFAAOBgQCkDlSqUA+rwwNItvOu9P22d7W37QXPkybmMBLS
+l0ZTpEU8AlFmnQNS4sxus5K4lZmIatGg/p/sOxOgTHUe+Tf+6AKz3dnSsS/Q4yNa
+qxw9qgDluPEFiLOYoDATRgDNZIeJvMrRAgWXtcNMLw10KQTTq5eukFAiTJvb9tht
+2UBJjA==
 -----END CERTIFICATE-----
diff --git a/test-keys/client.key b/test-keys/client.key
index c64b917e4eb..8b6d604b678 100644
--- a/test-keys/client.key
+++ b/test-keys/client.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXwIBAAKBgQDB18heghKA2B8JndS0oPHkGL2frNMYJbwfX8rzX9vucIm/a1db
-RPsHhIS4gS4REQnxmfDDLXLGNtkYj88sHhiUC35MZhqTVyE3vOq5ZDB7t4mQEr1H
-Y5pU1pgeLfRb+cnZJABf4iISy/ryzoXa0zlb9wSkkrmsZeYLh/E4UUSIewIDAQAB
-AoGBAJ1ga7UPNaaV0N0l3wOnh7wAujNhRSFdwZZXV5awRQcZJzzaEVpwbr5zwK1r
-c9M3WjNlICvWQlDbRvbCCxluddSQoUoE4aBeiMDRZX4cx1kz7i276C+yHaa+iFE/
-d1w5+3S/Q5HInhj3a9FS8LawQk6eLfeoPmuFy7Jy9dT0rB3BAkEA95/5E+iVf2fw
-yO++yQcI3AegihBU8Q7Mk+iqIqjowilssehdwKOy9/jO3DEkpJj5F9hSfFsq9gXM
-Qq6ar/cCfQJBAMhmJUG+CHcbeCwH1kx2DetyEdGf/zcXDldSHXEPgK63t2l4a/93
-+i/S1QI3uHLJzq5iN7ri+Ly05919FUjscFcCQQDMHOROYchhJcdXii9kO1U1MWBG
-jeHGdiFxxjX/reV2rni3SUeGVClgt4mj/SosNyAUZK7RbMDD3NGbIZvGckBtAkEA
-uK6SFUU5bfMNy54pW2vMpjgIveQygqWn3MdbRK+hyuKakAOfm98I3XvyPEn3nSno
-ZIM1kvDLhLU/nbpBnGPxnwJBAIDZMsetT+rjIJTkTA9CjgGq6NHLwLfJQFAvISWm
-yU1cxWWWzXCShCayWSSQ/kvTOhWC2ENCLmQKD6b59wKeKcY=
+MIICXQIBAAKBgQC4W1PvR6RCPdMB4GZ7Q0mK8D1u8OBLA78ApTsUQt49wL8JXWRu
+7cQbopcWx45teCduUdeU5EZ2YlRTaTJV/QlILUJr0B6DgamjmTXRn3TZYBosVfp5
+z97YI2Xo5izC4Y3nfJtuygL0mjIFB7tL0Q8N6Fo139VVx8TmVkyZT8yrFwIDAQAB
+AoGAOG3b9zXalVwPJlflhn1GGX0HkNmyDcQLxsrMlpsRI53H27n2b+3fRQYzcQmM
+Ev3gM+hhMHXfC4V1gkKE4cUd/bC1tombdQQ34JJA4Z68AL+W7jzGtY+Ek3Q4HhtG
+c0fyCXlxnXWsexKWUqHe1tC3JfPlNf1gCHTIrE6ernXyjwECQQDeOnUZBMGcfw/V
+LqSbBTy2uY9tdk+xfCJ5zbSk0/zMH+PAFygR786jFwcjWTul2rHxqSODtqi0atm9
+avFukM93AkEA1F+EyY3bA65RrxSNPt0qRVRjsEAj6eHUVNy6+cWfxJsSI2NDTter
+T8GKx2uzx5ZIuy6FVd3Fq3T871ETyOwpYQJBAKKCEyFxhffgPv7BNiQax1REC+ub
+Khn7UebKk8A5OVM4Or8879N2DyDadSDXXzQg4iF7c3odN+9/d6z5qIYXJW8CQFIA
+Q8xzWqK0N1QL8nHYgc7dQ9S1H2jaStstk4CH3yXR3pINbNrPiZU1HPndS0CAdbrY
+vqEmDYIjnNpnCuWk0mECQQDZus0vA0/U2YX4+f1m/fAceHBpvqev6GjGDo2FirZ3
+qu0+t4TStb79RYZwfcEmXsJbDY+pESeIp3S8vwvbJgi5
 -----END RSA PRIVATE KEY-----
diff --git a/test-keys/client.p12 b/test-keys/client.p12
index 46098cb4784c9486abe1e8aa6bcdfcd10d927622..6eb0455561c136fae1093ad76bd52c558ed93476 100644
GIT binary patch
delta 1456
zcmV;h1yB0D4807HU4NdOw?M;~E`b692mpYB0-*fGxAkur4VYBCF?$SEghu;p;NMaA
zV7`S$J=EI>l?<Q^B54*?Qcf&xZiwR~nH+)8I5qMHOpodI3c?0iNq%&>iA*X1@(;ko
zHzzA5=vTvDd;hjD(8e)EizJ2sB}26}Vp~J^dGiPIlgQ+34u9d-#AvEvGNV^Y8?J<x
zPL6}U_Ty)uWtC*N%Q9dagX@XvXB6%kV0{6%@QD0mbCJ%yG6_Y4pgJO9e>r_Uyi(6v
zaMHA+!X)!ey(*;H7@}cO{(*_sa@W5jF>ZQ}FdC+4pjaqHs}NeIU#w(57;F7XCT8PL
zD*?$s66#e;D}VRIf-*P31?sTAb!lD>6s4sX;boC9Nr130;4y9*fLuF+79O$)<<c2Y
zW^gSaNZrRrE<O8jExjS#Rn~`jl}X5DrYHVkw~+@Ws_DG?It+Xe-U2YSvF3t8a$!hU
z1x;G5d_-Agd!S#Y{QRB%ob%BXr#w#rC=uvcppcur0)Oq*<=xCDF%b!^mJT;$>6-l7
z$@H2y|MkZ6Cn{EcFFpU#{4uWbJ%8k2C6wD52r)<d>x2uQcba+f1chZF`RooFey%(q
zqb9iF(f^Mh%PgY>M0B3vNG(gFcn(?+sB2#Kb@2A|4ESkbrg+h!&|1@!f+OTd+ew-T
zAC)b*34iC2nd3~b7qI_$9rn_5xhvwn=nSJ5^$^)mLp*n!(61Fu8DGHZT6Y$SNz`1?
z`XEzfl#7>w?^fJF`%>DXCZJ1p2Ed?1^xEy>9WW=p1s&Z=UsYC$G>%s^R)<ay3x9#6
zshP^Ih-zIGGJkOcKkHij?s+J{fWV$Xzx+=_OEod{kDrfH`M|c;{l!8cTJ_$vL`Fje
zC-+mijqPj(0P|wQXU!7OI*In$>eV_yh~{Xbp80Q+4Fg7hCwd5wtbB5j0s;sC1cCy9
zb-=<kQ%Km&FNs;r{GE?v(FUaol@dbJKx*aggo{1_?D_A;+cR{(LM}&m#?*Jthd$C}
z#dUlPe^`k)r3cW>6_k-*T|3lwVXVv$=saCzZNxLkjEm%lL?oNM=^&H2U1aX{tYQ$6
zI`E*v31q{6E=WT&I=e!0#A%CeFY&m^)(3FEK)Yy_WgWAu1TTY2s>SFp+scQzztlJR
zd5Et|H-b5qAh5X}Tqv4er-7`G7)6+ZCqmPjN}BJ3etE_N=9_Mz0s`a)Cv75v2E`@`
z*XpVL0iH?PdD65MSepm0PYwtpv|}ECirV3^xMRD2kZ*v{hm0-JjDSb2C^<wy%rS8s
z6v@zI+?+vkOAjp*#$c*39!=REswHv-qZdWZ^pUSyAx-xS#I%TG9Yq+&_#k2I9wZje
zZH^kDR)o@oIQMc@Ol|*`e_Atz%%BYyQtb!3Q%ONjDWz*f07KllRl`pDb_;sJSZ8X!
zG;^$f3r$A~Q8OiW&F3=9O7mGo@C5?8#BLhX;`m6x5Q}ocGhWW*68ac+FITR=kwS>-
zP*2)9gDu7UeKc4=)CuAscoe?w4hhB%UHurVbBsBKZ=FOmM^5fI57<*zq-ZA|FCTuU
zpHhGc8CpY;Zp6+z*-3G9a8r=Kul=flK+z(9)ZjXB{vHGndx&r(dLal{bkw1JE@rXR
z?k0RZJdK0xX41_HlJl1BnB589CNz1K5Q`iie>rW~f=6DsZ|26mr8X+&$k5|8#flC>
z9U_3DMgdLF(2_zK<8taLw1pR{NU=%33FK>+|6AI8bn?Qz|M>0gv@=hpei@n|_&>*Q
zKC81iyCO?<k)`VO+p4P5`hOANY%wJ;BL)d7hDe6@4FL%iF%|?AZ>sM=)q{C;H&@dm
z{^Nx?WSI&mFflM8FbM_)D-Ht!8U+9Z6g{c8^R$njLuYrrs!n8D)u7-$0t5(AB2K(1
KoICjf0tf&#qOfrQ

delta 1456
zcmV;h1yB0D4807HU4LlxVy`TS{-y!~2mpYB0-yv`{9W~?p+qehO|y61d!Td&(${Cp
zK9Rj$#LXucb`Z|;tCs>RZ}$&DhgJ469-1T~Y|-9e2ad}F1fJbh66LGkb&e1dp~cq>
zl|Sx(ayPAW6x&@wiqLx751_6CXW6BPGRph|@=Vey$P&cmV}G4CMRGx5Ke;bRQK`ti
z7i~&wQFuww`raIn0KOF2J^r+FS8BkLlz3jqerS(eRPHU;-pbUv;7{J+pZt)gP-hfV
zS-9=6UErM@-hs8$2_R|R8eA?f-FfXxP(7iGobTK(ian-C{%MxqR-dw;T<k!)8#f@T
zjxvw5t03Kmseig478eh}o!|)CvXB%&Yx2QpGEXkxfMRkFDxvr5=S1q~S_{Q8`AdoS
zvPS&<|0L_5MHHX&Jur{?nTCF7-{B$>yFQtnv=4=Ne2T^8y8G$7980X-)V#v?`ak<P
zt9f97Gd^g{`AC@{NrfSf?`k$x#iJ|J-E*!WbL1*E34iZ4R8j?4wcUhdGdYh>i+U%O
zz0PI<oIdL9bkPd5gLSsHQhNAQS63LX!(fu2DG=`Dve@#A$NH?w>S$6vWL8OHUWFbp
zw|9fNJZD5=YBNGso|(TV_1BOBS+)UopQT#`^yNXXVM;6duyih6U0fUO&IIeq{y`du
zeO0&}cYmSLrcYUz*THn#W(b=*vxr+RW|mIlc}>jB?|}*|BD=fMz6D~M(jFK0Qv77*
z+bUf&3<9&CAyB2f9N-`!9x#MaTs`RbB{U|JA_c+2<zrMk3q61#5@up@0FvZdZPjjs
zXagZEWiNK|iT6y}Ox_RmGKY1-V}B}W_$e8+5H+RsF3VhNYch{E=IE3E&0Wne_N0mO
zL+~wPt)^dsv2d=Ii#Av21Lb?cD<<kWy97tAM6c<S4Fg7hWPQ1RItIPR0s;sC1cCy9
z1%cHaETm(d7txdCyE!$VcqOZa{I-EKXex0&MH2g*1aRsx9+R;s8Y;dR>FelB;%U=R
zeA6s*Z6m9@jdi?%cNyEG+&RdjohKe<r%rILLFAq8$;8h=Yzvdu_(E5^aMf*!%0AQ7
z|M{uOhWZ(QqSa>9(EERvfRm~nS?CuW&9isvL~eInM?s9b3w#8_2>HbR4-Vla*hjYy
z$05HRI5q_vE0$S;Hg!e&Cgcy9I0_vJCnC((EyMp5uCl2UN&isb;iJ^*OJ(V1(7s^z
zE5qVlN8(6W8Y@V25*Fb<dd#f5j%S;2dt%KDp{B`y*S}@Gno!E&eqOFF>MM8hDVPAu
zd&tvY7MzewSCrS=n%D|#3ZHXR-n|)QMJpFP@hu%AqWdSTAd+X3f!EX;AOqxsnef2B
z#+nn-Ccxyin|`p*3y3DaDAgMO%T6y9*7M_z`!~Uuln+~}OFV`^wfB>R7p7RUq&m0s
zcs&Pym5b_229o6h#z;oQ1#YjAH_o_&gLTgZP=ra-1@+*}mgA8yNzK)yF`Dobo*QK-
z)R0vzoLe4X&(oUlod<E_6i5B(f%5xdn#4Yez>!Ecvm+_&JRb1^Dd=f)N5EAQENb+9
zJZT@+u}1}x5RC=&f66-~o(ZNlWJCp?Ce;{!c8cBzTQ{D*1V}60ea&_H;A%g(ujjW{
zmUDMeQjJ)MU|aoglr{GLWmm^IoINo$`&|%6-4dvXXU9<2VT!P~$VnS@(P9~A)eg6B
zi-(VO!pDaf*^)l~u`1ln5L#|*&7+J3r#sF)>TVBpddnFkyU3l9F5g;pnyaBq(S}5C
zx259U-Yho~u?02buaL@;6t)LnYcVA-BL)d7hDe6@4FL%iF%|?AXd1qUH@YG4qQ66E
z;~0e_ItF7iFflM8FbM_)D-Ht!8U+9Z6q7_(T9CCcvOgXtSYN@Ah9MT>Jp>5W$da6&
Kr$Z3}0tf)YlD@G3

diff --git a/test-keys/openssl.ext b/test-keys/openssl.ext
new file mode 100644
index 00000000000..fd953aea524
--- /dev/null
+++ b/test-keys/openssl.ext
@@ -0,0 +1,2 @@
+extendedKeyUsage = clientAuth, serverAuth
+subjectAltName = IP:127.0.0.1,IP:::1
diff --git a/test-keys/root.crt b/test-keys/root.crt
index 9b000d2b9d2..04290911c76 100644
--- a/test-keys/root.crt
+++ b/test-keys/root.crt
@@ -1,16 +1,16 @@
 -----BEGIN CERTIFICATE-----
-MIICmzCCAgSgAwIBAgIJAIKcj0UfpHhfMA0GCSqGSIb3DQEBCwUAMD4xCzAJBgNV
+MIICmzCCAgSgAwIBAgIJAMLmSiQ09MqyMA0GCSqGSIb3DQEBCwUAMD4xCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTETMBEGA1UEChMKZ2hvc3R1bm5lbDENMAsGA1UE
-CxMEdGVzdDAeFw0xNTEwMDkyMTQ3MjlaFw0xNTEwMTQyMTQ3MjlaMD4xCzAJBgNV
+CxMEcm9vdDAeFw0xNTEwMjcxNzQzMjVaFw0xODA3MjMxNzQzMjVaMD4xCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTETMBEGA1UEChMKZ2hvc3R1bm5lbDENMAsGA1UE
-CxMEdGVzdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA5+orWkbOe4nTADwP
-4oGJz/xvie+5zPqnp8Qq0/sfh7rgtFA9SW55ypSPKx0rlc4dGBuCQanLoS1vEKxJ
-BRt0gi2C5lPl2RUu7kbNocb5OS/WDwMDklHYIz9AWL47MBYI6hYgWK/1qRDH27B8
-oeJHbi0jPhabvYz1huuYgztAcWMCAwEAAaOBoDCBnTAdBgNVHQ4EFgQUmNDGIm1l
-0xPVMWpo8HCedBSA4QYwbgYDVR0jBGcwZYAUmNDGIm1l0xPVMWpo8HCedBSA4Qah
+CxMEcm9vdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAqalSpcx4l8kBo54O
+2p7Z7hHqItc/Q15OzV2Z0prlI+ItKUINWj/K5Jn66qRd8DjoHYAlBKG403vFX2EV
+YjwwTOOzaEynYVWdgCAiBCeDxokfFgIJrJlo2oDRSEWxYi2mqiKVaxXoQuTu9I8i
+1lXcudhBVB90pRJ/cgBfFWrQ9KUCAwEAAaOBoDCBnTAdBgNVHQ4EFgQU8jp9wz9u
+a19rJp5bWfgQfZAQu2kwbgYDVR0jBGcwZYAU8jp9wz9ua19rJp5bWfgQfZAQu2mh
 QqRAMD4xCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTETMBEGA1UEChMKZ2hvc3R1
-bm5lbDENMAsGA1UECxMEdGVzdIIJAIKcj0UfpHhfMAwGA1UdEwQFMAMBAf8wDQYJ
-KoZIhvcNAQELBQADgYEAw3YBwBmAMirJ6P5/8Pc5q94baXyy3RgqK81swCh4gYsQ
-y0brEAX16/uzSzyfKixxFQG/5b3fBDjNMaOtPlXv7PQYqPGWI0acXpydLOXyZxDk
-GEk2L1UnTeds78AtsvjZ3xyaeUyAjpE17Tn1BwZcaJx3EFigXwx1Kse2AvkcukU=
+bm5lbDENMAsGA1UECxMEcm9vdIIJAMLmSiQ09MqyMAwGA1UdEwQFMAMBAf8wDQYJ
+KoZIhvcNAQELBQADgYEAd2FlLq1lvV9FhDQBNVzl9OJ/MBo2NCWk86x4UJnLkl/M
+VlE0Ik8wzW2d7nTZQanq91pp6015dnVkV6otaCOFW4UxVc9JdyF6rKF+t/MVPO90
++tKwgaUq4gLzOVrEpKXVSQVhBVsRRjR6JO+MxTIEtsm80mcD5Cehu2zd6DBoQ3Q=
 -----END CERTIFICATE-----
diff --git a/test-keys/root.key b/test-keys/root.key
index 903355e0d5b..578407d0d5e 100644
--- a/test-keys/root.key
+++ b/test-keys/root.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXgIBAAKBgQDn6itaRs57idMAPA/igYnP/G+J77nM+qenxCrT+x+HuuC0UD1J
-bnnKlI8rHSuVzh0YG4JBqcuhLW8QrEkFG3SCLYLmU+XZFS7uRs2hxvk5L9YPAwOS
-UdgjP0BYvjswFgjqFiBYr/WpEMfbsHyh4kduLSM+Fpu9jPWG65iDO0BxYwIDAQAB
-AoGAWPHfpKUJZioK6ckfUoDaCRHI+X8epHXxvQ8oWdqzUgwjSCSKDNK5FS/65M8w
-Oyks0WUjhOmJNozFTwC0lKfd+6Bf9vPIzVPfRMwsByGOelv0Rg+SHb7srDYf0+V/
-k55rN3WUtPOJaZYy5OzFXNR8dvLiUbvsGtZGXcHlA078neECQQD6Dfxx+7qp31Fp
-UiWJJwe79/U3IFvMofbbDUMSg28C8IuWB2F939YlLEdWw9hHcKyvwwnC+SQVjBYL
-aFjfecazAkEA7W3FRRvXQojLcmYno5AiVWsNBA5X3Zpco8tXC4NZ5ow0U4vwTERm
-DowtswLD5xyCKoIFwid8UsOg93aVHiCCkQJBALIp2u+/4zz7377CB/qT85/LSU2Q
-4beIwyFKbrq3KRaYG2y3L5CHNsZfqSi5+9TTBEdrGP5xk3NCz8Yq//+ifZ8CQQCV
-5OpZEhWZdMF0jNfTpGh4ougJuoBwcEayRerDYv671aInaL6hd8Eyx/8F9+X0H4Ry
-D7pQ9BrCKa2S7bOA3KdxAkEAmw48vz4dpEcvlzyFOh81wIJgl1WKtxBpc92m9v7n
-nbzre+iPOAmYtvIXGbJ4HgPz40sJZgDc+6r9wj3+kraGIg==
+MIICXQIBAAKBgQCpqVKlzHiXyQGjng7antnuEeoi1z9DXk7NXZnSmuUj4i0pQg1a
+P8rkmfrqpF3wOOgdgCUEobjTe8VfYRViPDBM47NoTKdhVZ2AICIEJ4PGiR8WAgms
+mWjagNFIRbFiLaaqIpVrFehC5O70jyLWVdy52EFUH3SlEn9yAF8VatD0pQIDAQAB
+AoGAN785Nt1OqqETds2Sl+cmOIGOa1BKqzorrnMY/giDTh0dNbdMZ+EaK68ksUC8
+1Rf9vOPERhdVgbfjjIl720FnpPMBEAhAOyJq5GTphVXj5yBK24lW/Eo/Y8oRm27Q
+neer8YGGQKpEb3DSMl7L8VJHqL3JEeTTPSPN0F/RRFWxysECQQDZQ9ZhXTACKIih
+kF2N9c8gPgKw6QR+T8MnF1+KxgLrs4LhOjJP0aHbiAZdG4I+rzJZP698yE2+DybZ
+C4h97Pw5AkEAx+jRLB/zDEtA3t07nPzGpF4qNhBZuW21+A9kGcNAubB4byDxlMl0
+WJTmVmEC8G88J8wH/4Gjo7iwwR24EWjTzQJBAJYUhUd2js4+37rzNZz1muGD1GoO
+XLtAL+eV/rqm86eLtjIM+Goovi0etn6knQDeFuKN2pRQ7VsHrmcpz1xlUwkCQC2E
+Wywa0jI4aDrWUJ58B5ahQicxLdzEmCw1BOvAw1oETkevTpI8FFue+5srV4n7Kc09
+7YxFrka25Lfz1ldQcPkCQQCgM5GhBQQ/CwhQSsyGB1tSQaF6+2NxIb4LJsbQRLcI
+8gu/EMKJJxsmW0qwNsNOhO8gvh4MNH8jL42b1/Llf8aI
 -----END RSA PRIVATE KEY-----
diff --git a/test-keys/server.crt b/test-keys/server.crt
index 9c3ee278b32..61dd37cc565 100644
--- a/test-keys/server.crt
+++ b/test-keys/server.crt
@@ -1,15 +1,15 @@
 -----BEGIN CERTIFICATE-----
-MIICQDCCAamgAwIBAgIJAKNePtFE5+2FMA0GCSqGSIb3DQEBCwUAMD4xCzAJBgNV
+MIICQDCCAamgAwIBAgIJAKNePtFE5+2KMA0GCSqGSIb3DQEBCwUAMD4xCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTETMBEGA1UEChMKZ2hvc3R1bm5lbDENMAsGA1UE
-CxMEdGVzdDAeFw0xNTEwMTIyMDAxMzRaFw00MzAyMjYyMDAxMzRaMEAxCzAJBgNV
+CxMEcm9vdDAeFw0xNTEwMjcxNzQzMjVaFw0xODA3MjMxNzQzMjVaMEAxCzAJBgNV
 BAYTAlVTMQswCQYDVQQIEwJDQTETMBEGA1UEChMKZ2hvc3R1bm5lbDEPMA0GA1UE
-CxMGc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQCfbpUs/tngLAo1
-FdWv0036PLjhjZ4mIWKEIVwqp0K64+ZqI51awcr3x2MuCAQmlu26HtExEYoPv/JF
-jr5aBmyg9BGCwp5jr8VnPLOEQelE5n6BaHwC3guHsMZ/yYeaOoZFd36T4biP8+G4
-sf3P2PQP+cFbXOT6ypRtiVCr9poBKwIDAQABo0QwQjAdBgNVHSUEFjAUBggrBgEF
+CxMGc2VydmVyMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDIz9Ow9Yg/Yh/e
+SMJ/z7q/+yq5cFMGKCyOo07j9PZM8GB7csSlOH9ufZsC0rr/qBYm1IFgBm1v90+n
+SojL3Y+wP7pfoYbePe32tQbPq97BVbaqCQs04mIsnDtyF1M9QEYCLLCVQDFfitGy
+yM48WH6aOcZ/M1MrKYYVilOtwnY5HwIDAQABo0QwQjAdBgNVHSUEFjAUBggrBgEF
 BQcDAgYIKwYBBQUHAwEwIQYDVR0RBBowGIcEfwAAAYcQAAAAAAAAAAAAAAAAAAAA
-ATANBgkqhkiG9w0BAQsFAAOBgQBrLQ+5hcVw6m64DHs0AifMc9/1dAdm6XI8Q8hT
-r3+/7vyc6NiIQW2toTrHmhtP5n67JlhQ/wcgsASJtLcwAiWspWbWYFpTxbBakFjA
-8JV+NubVWfPIGVsxn4wdYj81jkmnxPsKpBfQQTgK6he1kCK0+T1i+QwI6w+6DCKz
-JpJL+w==
+ATANBgkqhkiG9w0BAQsFAAOBgQCaHyO8SIu6k/sMr0uYXs184UlX+zMU5Tqo4J3U
+OKsrV/uFL/3BQBASvEBaEd+RtWpLgJ7ii834MQySvWrxXyueUWIY64n2moMVR8Cg
+dkyADu4Il4Qo0u1nJ35uKSkflYC4afrEy0hM6274wwAiwXFPRy0qkYdcFs0sMNuq
+oh1RZg==
 -----END CERTIFICATE-----
diff --git a/test-keys/server.key b/test-keys/server.key
index 75be9cb1b6f..dedda3da64a 100644
--- a/test-keys/server.key
+++ b/test-keys/server.key
@@ -1,15 +1,15 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDIi6vlCr5fxd6t7svSohzS3iosVzyMi4aGGAFxooZnsjcjk+BW
-WCNoC4WsfI+0Bsd3vO8FW7FHFpXikdXGbbCgRK0RYJwVMng0AA84IkzIHJdOzJSg
-ZuzNHMbYpc+G6GoEY4oB3D5CB/JbWsSHLA4apfM7dbgQMXXWR44BcoUCuQIDAQAB
-AoGAPP7mSGKtJnoLUYGo8qal96jk0Nmzq9egEdbpUYOqN43n4WVPvVNPaYzfmmfE
-WXAaaRvI4ytRTxraea/7gj/IkVuaz5tPNWeigEBVAOoMAeGwSVe5OwBPSNVxJDte
-Vk+nyhZj915O4jWmC7lvLypUt+vFppXpv526MYWwxZ3OLSUCQQD/tFYePjGgnAuT
-X1cIYMq4KfB095xZu8Z0qVR/Vlcfwmw3bdMMeNgCpcvhib22XbjAmKU4qQYpLEx5
-l030Xed/AkEAyMcDb3yWYpyZaCMntiiBzsp+LhJXI5K/KcDLNEW3Rx5euSA0sLAT
-Ql1G+zpXs9M1nqVKRxJvkC6GtftiiSlxxwJAUZKLIoy+sjj1rGbu0dpm8UdX0Uio
-lSvFDLR0I0c89gHFGg2sFT970aRonSOe5M2TQcWwd5ncQEhEgUmWcc1/KwJBAL4T
-irEVJdodny3zejj9iEaZdXNwcYZ/+vIwTzAhgC2YFtz0HG3Zg6IkZHqa9USNBAo5
-OWSnk27QXUATyWlJDykCQQCk3waoGvlFhVGtyCSRlmEo0xCBFO1/ffRJH3dBAQux
-M486HY7RzMnikiVsism1fQ7rJlsXwOth0HOsINNBkvr3
+MIICXAIBAAKBgQDIz9Ow9Yg/Yh/eSMJ/z7q/+yq5cFMGKCyOo07j9PZM8GB7csSl
+OH9ufZsC0rr/qBYm1IFgBm1v90+nSojL3Y+wP7pfoYbePe32tQbPq97BVbaqCQs0
+4mIsnDtyF1M9QEYCLLCVQDFfitGyyM48WH6aOcZ/M1MrKYYVilOtwnY5HwIDAQAB
+AoGAI7DMbyc0kA9gmqFT8GN7TaPWdB8CopWBVdiwrNNc80/F1isPyE3CWGD6rAXI
+NqgpR719QRPjX4MVJSaaKaG3Z8tHYYGTlKg5bKKvu/pNRKWZPD/4+Ha2qA5a3iTo
+hXRFYGxDcMZBVXhAzRgNKTYH9iY4sUtQykufR1nLXOoZIAECQQDqhA+C1PZKQHO4
+4UYrpcfDl6fxfLQziwJQCjiX/prrijzQzwwzUc/uRO7moVFx1kiE0w5fINaJkt80
+zoZ9YjOhAkEA2zVUJI+ov1MH/lYYDK2+yFJO5pATU8hsTCDGKWHE3O9cLhTw7NOy
+6tRiSEedd9zMeNgy2cb0Whz+OPoa15U0vwJBAKKMMHgdhiyHKe6+bjW4rZK7nlN6
+fSiwtESoIPvxJI4X/fk5WZqEnVvoebJvpBUEUrWF2JNFHo6yt3VRpNRpaaECQF+R
+VGnMJ+mhrW544mtEpFR5beSfE44HZw+ZiksoUMdxo2KDxrW5ZdtzVJXmgwRqwso8
+l47Sal2PHlaA04sBhckCQEH1WLd5+fDbN+ZIXpZuapuVcgpHUdsI9Pb5NKmre2My
+oORgHdF0g06bfR1Vtaw4rd/4zCgSoNgwH7/Kqyt9ET0=
 -----END RSA PRIVATE KEY-----
diff --git a/test-keys/server.p12 b/test-keys/server.p12
index 864764251ac7a52f34d57626d5a4d6b8706ef1ac..3fe5c8cb690f63146211034664b7e34b0c55e420 100644
GIT binary patch
delta 1456
zcmV;h1yB0D4807HU4Quw3d%x2)p`N~2mpYB0-*Iz+CD|A)?0m8hJH{TK>cpnm&etc
zY)qV7b$t|`xhJUOwD9HM5*>W$8^9t?7fgp>$%1=Q(q&2jfe5g8g930m2<Ce~X}WKW
zxxLbbW85=jg_$!SF=;Mxs7`mtTc(hdCycjr^=Igqn?6iyp?{$`xPH_D+RHuOHqR9#
z3%XxqXb1<<w;p}GuMW<}zF&;o?$29~$_LArWLHc&JswVPA7PuV9zU7qB+&3+f1zOP
zWe%43I`qL(QARTChC|>;Uc!)t$a~?IBzUW~%K_+^q!c3=0BT|sUY+%}Db)TlyMpfd
zlGP8YO&)tTCV&6b5E(s*3dmK<;@!c~xuAn+$e(WOiiGnJh#_|8_kIQv|AC_zi^Me8
zrJ)t?oUVO=RoDwU4B$Gha_9J<z<o5&qQOPa{D4;>CX$59^}duxo%eG8S{Llb^f_pr
zcr{eM*#tii7MuS%Za!itF`--I4Mb*Ycw=(;RTpVO$A4qn#9eR)mgy-AFpLLc=S({W
z-%W|E>@;32vFCbcJxTNp*YVl~4HZRDe&Np|0f*dzf4U1}*&zP3{HF=Tu#M5^Li7w@
zoMtx19}6GeBATz3xVI%^+g=#2Q8|uADgseqJncv)@u`@Cw@4?L0)!rfU<EPXuf0Xf
zU*7jE5r3PKDh2Ju(XPyt(A>@HuNdmC{TYV5hAyd&LP<gBTZ!tjWcoliwA#%wMqAB^
zE}$2{8xuAFo)h}@)&5Yz?x$*4$fwk%^#gh;czJsd-MvrW5S~^Kp)F9n4H;CUu|!b%
z0O;4VT$)aQCM1Ua&#zVi_{C4fCxH^{iE*=qdNoX@GwYDH2ltL}p7k$^b6a9z(TRGX
z{_GM-?qjHw-jbqVF+UVsyg&)5GUPH5HJ1N2|LmBP4Fg7hPT!xdY-y5^0s;sC1cCy9
zD87X-?SFLaA|=TW2qXiRQDWeZbaWA8u$i{9sg@$@$N#iII;u4J*Ui?WUt*^ASeJGq
zhC&!%KsS!U?V#V=s9C_s5y<o+AFZ@@7sGh%G@ThY)UQ-42#^1Ed*w$vO-oltnQVgS
zGZlYo2aQ&LZE=-UWW$}4c{ho%$-$jad$*sj(_9rV6l=)-$E%aWBTq<2rQ3wY7tH%|
z<?)PFx8?Fv)TbIY^QJ6}2tmd|z7g+_zlzlS7j-F+0i5^Gv-9ktX!Rg177gPO&7(gq
z<<r5V6R-GbO#!6ps0EC|8z6)JMJw}Z@*TZ5nnPTFu{3}Qy`%bEw|i9XqEXK@wfLx1
z0W}Z_AJ8*A8~;(OnJn6tC79%RUnVZ*OC<NE@9C>~+>OWv+4&KJ33n+o^^L;0Qp4!m
zf)=sMWiP(${Cc(@xRyrQHJ0+(R~qJy;3@9Rcd(tl(l6(3V@R4!VY#3iG;e7SaY_cV
zQfoMW(J0<2nIh*)v``2ZuAS!g3{o-CyUOM{fF|J3ZvBS^gYm>Yee1-3t!D=}*n;Kh
zp}n=1^f<f@TpQk7pvBDt-1T>IbQ4==BuRg?&`FGWw&XXjrXsX`cv7>%sBu@{;<MLB
z#&Qz)jLjAhq%pDDphzZ&*{f2DtHDF?LxJvpE@$ye*IMYOx43fjX43<n{A;`nnJc(k
z1I1_8N^4LGhXVauG!;o}vZdGnJJTWKsy#{F*&ppkI+t*3okkJ8!9<cm?DlJHksh^6
zA}+KgRY0HLuk9X$*%Od&$>fOY%icYNe2Rr)WmR0d@?cODC$>4{zy-=xiv;ZS3$NI3
z%g7xTZ8;|TZ1indU&^&3q%5GeuQ4SsBL)d7hDe6@4FL%iF%|?Ay)%7vKk@76&+-8j
z{+Dlf5UnQUFflM8FbM_)D-Ht!8U+9Z6xbttpe2~&K?b#GO?-8`ha(Y}>jVgla?Ncj
K87xu)0tf(whslfp

delta 1456
zcmV;h1yB0D4807HU4PpEfp7E#1BwCy2mpYB0-%NQUH=VAKt^CczLYMGZNl2fA7rK_
z@^P@BQ=qP9Uw@Edj+3laT&u=+?2LTJlKW$pAlx98^bGbOtNu+diDMLJ9n&Mas;_N8
zGH(LjnNXtnItpr{;63vkO~?ZdNFXH7mgB<&oRs_oph^-G-hX=tW(uj8HMoVC^wP7C
zi^GPItD$y@v3^QW5q8t}p8nQy^I~lI14s#rMc`O!M}@Q#4jF%gCDI15WK?**-0rXF
zPO8dx;VhwT^zL7{o#ViFZLtPM4V=hE?pipV=ef_fE$4%q$jBhp)m5#=;@?H=#r%jC
zWXU((r*DYN)PFE(d^zi@x{+1qt#$|yF3K|s{wNvs%oH8LhPUC)>(P{nJ@MkR!2Yt(
z$L((c)$T}|p(~PI;~^o?>YL~QG|CCOY_<pw@?7}7+9P)i$5J`#DsixHpfD`2eN~jT
z%*!T;1bDA0)~(-3Kxm8yB7XIY`hV8O2tb1@nxf?G0)P0iiLPwp(ptr&`xOEvHFJiM
z8^pDgO1I?x+k4FmjO7Q34g*w58r5pm*nv2hP0q)@V!gL=CUX`DFi$QH)EB`@EL45V
z1&&=6_v_m8CC8Pldc`E!7DLEkF*f@HEllzNHXx#I!>6PY(SX10SkEW}nI`3YZ2UZ&
z9aGyJ34gLo%{C#|NKG)<vhzzXqosgf>&bPggwI?S!HFDoIwTDr%L;PP<+A4vsTLn)
z{w+J!5nn5t#Avkq#K%3*Jd9VKcfnIXD+B-mx+OR~U;a=qns~>z%?<Wjv-H|pK0bhu
z%Qw#ohc`V_UEU!LswIAeSOwiCnuljP0jO)Ox-~eRK@4Hc!HsAroKULYEkdf%gFc4(
z+L@HK4{bE<44jahlA<URf{LpDMaB)ZU(l&+r*VIi4Fg7hV_qd<F=z!10s;sC1cCy9
znOjpv0@ykxyc|Q5W0Jo$fAe$bZ}~433pup%KiDM<(l{L_AnT(CPM9u*STHzS{7N#g
zz}Xm*al$X^gdX_8?QVqTMT91Fx|>rr7yD)Z=G7nhdz(N8%~SnwMcVZS#0!sbI)ok_
z(7VTo*fzg^XOwd;&-v?%3unRuVPk2Dqq0q2{siOxz>oX@>_urhMM8b^^R$c3Ci=bN
z1GB6chP^({Ecj^g^fn^<<J|rCFZ1=ag~)9vjo+Lac`s<zFN2iZft1x;<%D~1<!f^?
zsqvo@5*}tj{}SosN?;M9lRw<KniSirIam57o8`fOC3`E76w6e15Zv2SVeB5#&r#Dw
zNQQ=>Cgz-X9S>&%<rb#g#s~@8AEQsH{m)0D>lt*bEa{;Ju&3AA^gbG4EtmZ6YWrGr
z<wue7{)Lx+s0w|&2#JpyMsZN+cb5C22M?XiF#0gnsc|gh6373^%Go@-^%Y<M894&i
znM|sG>RAT^I0InS2>OHuem*;mUompC?4AJHyZ%(X{VjLuJ_|OQV-LLPEitWc@l>IR
z5z>*bA}x^cdGH|lXW2@1$CuW&7SiXZeq4rfJFLSAA%s|+IwGj93&svTMg~D6>x;L7
zSy2z#2I)&<Qf;<_SinZ6D)TpA#g^)sps;0s(z#zLrGz0fFb~9ELf7j24A9~+#-weP
zE&q(j(`7djzUMFVikNwAHuG}IWCtPI7hvJ*H;WauGLK2D@hU;Kw;Ei9kIOM>)tjfr
zdflBs;#@{E8;$j;^}J)AWr#2^WUFp4k#p~bmjxmDeqi~s9i_>c4$Lz+&ZXeDDD4z)
z!a~17Uw@%|9IL~+;W=_X8CwrnUNI#wBL)d7hDe6@4FL%iF%|?Aw{N*?pK@NkU=Zh9
z-W6l<_!R#0FflM8FbM_)D-Ht!8U+9Z6g`QUc%ixA;+jna7x58k#j`>aLj(v+7=NVU
KU${R40tf)>BgA+B