Adding new certs to vetinari

Dockerfile

@@ -6,4 +6,4 @@ RUN go get github.com/docker/vetinari/cmd/vetinari-server
 
 EXPOSE 4443
 
-CMD vetinari-server -cert /go/src/github.com/docker/vetinari/fixtures/ca.pem -key /go/src/github.com/docker/vetinari/fixtures/ca-key.pem -debug
+CMD vetinari-server -cert /go/src/github.com/docker/vetinari/fixtures/vetinari.pem -key /go/src/github.com/docker/vetinari/fixtures/vetinary.key -debug

ca.crt

@@ -0,0 +1,35 @@
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----

cmd/vetinari-server/config.json

@@ -1,8 +1,8 @@
 {
 	"server": {
 		"addr": ":4443",
-		"tls_cert_file": "../../fixtures/ca.pem",
-		"tls_key_file": "../../fixtures/ca-key.pem"
+		"tls_cert_file": "../../fixtures/vetinari.pem",
+		"tls_key_file": "../../fixtures/vetinari.key"
 	}
 	"trust_service":{
 		"type": "local"

fixtures/ca-key.pem

@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEA4zWKzehx/YuLfvbphGLLAnxHiAizsqR17Ch9zN5wxZInJduz
-9v2HZCFgqV/4ZqITsA/y5ibr6X31KLkiSgPABc/AZiBcgONz41TmGVIy7lzU9xsq
-vDwTqzyYyoBXN+TbJk6NAHglhHpbOa6T1Pwf2K9D6ypSytpFkz6JltLJFbpIxYtz
-g3cpCwR/ZBOS5f4bqzMnrIlfZUbta50/wc5HIgU6Q3Ggx/CIiICMEgtWZxoPM5Oq
-tt0tnVZPJoSA9xUOVRXOnb9NZVrHgvyCpL8D9qsGISOUveV/fvYOw/+Iy+2y5rc7
-dSfSH1XbczE8RLdhTMLYgmg6km7rq4JQBvtIlwIDAQABAoIBAQCNweUlTQZ502uo
-PnM5hs30cgfLJuq+5X8xZZ3/iTVA/0vvgeEJk+q6HV0Kr/bySeMQsRKyZ8w+tLiV
-vNRY63gN6C25Si2MuNygFGMvnyppr3+r4MZMBQuchcUqauJ/3AijINU2Wr/FpPVv
-yq0vcFKKReeRPKnFKGPKV3VOpZqSM6ds1fqjG0vJPtW4OYhii9QWBky94kb9P9ef
-52X7EcESY+G+gLOxEt95KYCY5gLvyOxObUtk9xGzmcKMmYr80fgqDllavMie7BQ6
-BHm5EUfxtPd1Q0Pd8ZYYZusYD1dxiBISlncf0kDG0PYWifb8HTPOEddX9CwzYfnV
-alea2ENZAoGBAOeoQW+dwTU9OBDOUADysBoR0EU2F/+wbCLsQTj4QBZXg91+CR0P
-o57v56yoCEz4dsVi2YtphFbM2Gb8ByqMDa4/onlUrnbkb+bUR4mJ34vF78kSrMnu
-3HwP1SBvucleaRpr7O8Qh6A5+AHs8O4ApMU3DJyBeo0BO37XjBpMFIhTAoGBAPsV
-oStqT0zS1axXeR/wlg7181e9ZAbJWo6YYktabud7V+iPn+8zjecpD2rNn92wWkYR
-tGUL4XJeC/vF0IP9EdmOg275IFgC22svNnli7daMOMeznuxoz7nzVscHqw7HVTp+
-bkDPBs55IwrIG9hy3XlvgD6VmgaZa5cBQG0H8SYtAoGAGdB3EkALEqqyv7St150z
-oIQRqFTB0d1P/4hCMF4BjjvMVvc/fryKaCCluWi0HBen7JD6Wv20IJQNHVTCW6xl
-reArc8fK9Ta5fYh0PFBf18yDzu1E0e/LJAwDnOy2UEkz/xy9t1opMuKiz1we8Paj
-ZdKfliUbifD0N0s/soJ92z8CgYEAz/vPwJXUUG/I3XSr+eAhfQ0Q4NoaFGEQaVQj
-AAZOHeOXIyZttgf/gL8LbU4dIdbmQGqEAru/qSvsQ0dN/TdRZORfTTqCJ0Vemj/G
-oPBo0TLgCdRpTa1YfNDsTfu1H43QtJ5sF7UmDzxa4aB3KGmlueS51522s8a8T56S
-zn4orJUCgYBNdWYT6HZEyhcCwchFCDGurSFDP1NEO4chMS4R4fFKulOA9reL7xAP
-KSkKGTgZwNF6fjY7+iVnK533dPsi3aWdnkSNi0inXCeUCwbUUosENtmPslltGbYL
-qC7m5yTyCi/nh0dXh23bTCRuxqVcTNnPENZ5uXt3T7kiw2IGIXKqEQ==
------END RSA PRIVATE KEY-----

fixtures/ca.pem

@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC1jCCAcCgAwIBAgIRAP8N1ySxBPApJwblEm6nP14wCwYJKoZIhvcNAQELMBYx
-FDASBgNVBAoTC0Jvb3QyRG9ja2VyMB4XDTE1MDMzMTIzMTQyN1oXDTE4MDMxNTIz
-MTQyN1owFjEUMBIGA1UEChMLQm9vdDJEb2NrZXIwggEiMA0GCSqGSIb3DQEBAQUA
-A4IBDwAwggEKAoIBAQDjNYrN6HH9i4t+9umEYssCfEeICLOypHXsKH3M3nDFkicl
-27P2/YdkIWCpX/hmohOwD/LmJuvpffUouSJKA8AFz8BmIFyA43PjVOYZUjLuXNT3
-Gyq8PBOrPJjKgFc35NsmTo0AeCWEels5rpPU/B/Yr0PrKlLK2kWTPomW0skVukjF
-i3ODdykLBH9kE5Ll/hurMyesiV9lRu1rnT/BzkciBTpDcaDH8IiIgIwSC1ZnGg8z
-k6q23S2dVk8mhID3FQ5VFc6dv01lWseC/IKkvwP2qwYhI5S95X9+9g7D/4jL7bLm
-tzt1J9IfVdtzMTxEt2FMwtiCaDqSbuurglAG+0iXAgMBAAGjIzAhMA4GA1UdDwEB
-/wQEAwIApDAPBgNVHRMBAf8EBTADAQH/MAsGCSqGSIb3DQEBCwOCAQEAzJ8XzvTU
-jV3p38Oe6tzzJmL51MVbJ0+FTGAVBXxiS50Gmb7bTgG6VpDVn4mzBFxbZHKmljDZ
-mWDO2S6AH+Z8La+81cStoRxhcHrHPRu676qQlmZCXOgScyjccMJShsz26fWTcafh
-cbSBzY8CvtSNvbk8SV1+r4Yq91cII6HHUsYE78GblW6y6SP3gqTP55vATJajaEqp
-0mcX4JaFg3+hnTVZlRlKbR5BsYKDaR2bp2PE2EE7KQv4PrsqvVq4iJ0nxjMkdC4R
-OcFjUgb5uplOnuhm6u287mSVsTbbFGQeojL9RpBcrwXr2Lbkh9MuEHxMyW2FtkFU
-vsnNyfVXIR+xOA==
------END CERTIFICATE-----

fixtures/vetinari.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEA8rZTAVnXsPwzy5HEkLUJvKjzVd24ZGUTEQLU1V+iiFdQUBSV
+VrUroLKXtvM7FLYpm3BA7XfEraTPsBVBJ2NgbLbA1//mkFkbQd4nJF8ugS3a7knw
+Mto2UylGn2WW36yeUI0ZRDarEUbMqVZVECXdkdZyIuFyTN7zDKduguHCw89pzP42
+4J+QXPpewT39/XByJ8ok557cY3j3z78SFOfFf4lnGsuIdumVy7AqhubsxJuadsSO
+udpAb2ElZbpHNYXgOq4yhry7EEZIEbfVGAiOGUoMFMrqgLQDUJcrMrIdFiNleR3x
+v3w2euxMbZfOP21lWLTSBhJEdhZ7X5F/OsgqTQIDAQABAoIBAC8xYmxl0rm4ID4Z
+5tWYTf9f/oiYpwzmVlG9cjLW+Jx4FcasaelFKumBMFzDaJ57WRW/OvCxlA2LeVKs
+n1GQUiRxWIfnWyaAHPuuvX+l/j3h86rXt5u7sEp1QSUnNLHjN5lEBkCsPJEMaikW
+/003f6CmyOSdX4Mw6qNwPt22Fg/KeLh58+h9+9ePc3HoILghuHBv6X3Fi60OWop4
+zszzOerNE9NMRk96XUL2PerXZMpQ0kq5iiDVLBEN3XcQjaSdw3G/rih+wcEyE8U2
+FMaLPNtscRvmeKke+TBQvYKLThj9wn3GkCAFu9e3e5ByE7SQzeB+yS7/rJz4RMuN
+pyDrHAECgYEA//xnc6dZRkN3mLUM82FPMPp8RWymcUH7vq+q+NSmnrI9gZaQ/C1O
+WYXQp8LCHLBMR+4rtzTKD60buY7H3RdaFmljEctpaog15nEHWHDu+pgHMkiE62DX
+i+DaK+rS6Zxyr8hpd2KwXUEEh0rN2QlGf2zjYjL16GUa0+Zth4Ini00CgYEA8rm7
+0eZyqQ01z5AWY+b+lrwc9OHJmd3tfbv8XhUU6tBzXBjZOPD6bK6W3qdZbzvfsXH/
+8aYQbv3RVXtCHYNp7IBzcwO/6cZdYovHfVfjC5tFXxCGl9ADUDdO81yrDlgVXkpT
++F81uQOEQuW5YYqEd0hRF3m8UdkTkLxKYpXtmwECgYEA6ELUfqw9pTH75pOHX6BQ
+IQl1DeyqDCMpTnfHMiSH1X+1rMm3XQeiijmO+1gLlcokPDOOeJkuKREREcjJ8QGK
+HMGcQP4F9MIH3cF6P7WgL8EW7nm8GHDywZjPe3+BxLLNoE6/2rGxgbtHZ5Xotd7j
+lyRuH6BLXIO31sHBaW0fghUCgYEAsY5ms4w1Ui7krzqC9n+yuwdO02Abvp/WrASI
+/zXCwGbODI/szzeQqVIp8SRQSwtsfnybMuU83kR0DmkFG1vXb3cjfP5AND20cHM5
+8hoJb6Mc4wbOvl0fH13mNiYSx4Jt1zTeKjFTtky5QsqTiqPudOeE0nxt4x29r0Hd
+1DJCxwECgYAW8MkvwhwcmQ+oPu0G3xGC3CBNtwtCFOPkf6Gkf23yPWg3u9g/81wF
+M4QxAkLtdvI9Pe8MF1jKmrk+1oDgM0d2SB6J0HrA6eu7KiOw//WiwlyDs5sb9CAb
+jP4qLOGfMXq0p6GD+DSlwzOxLT6V55w7k/EzswgAnhedUESPkUn6eA==
+-----END RSA PRIVATE KEY-----

fixtures/vetinari.pem

@@ -0,0 +1,30 @@
+-----BEGIN CERTIFICATE-----
+MIIFJDCCAwygAwIBAgIBAjANBgkqhkiG9w0BAQsFADBZMRMwEQYDVQQDEwpFeGFt
+cGxlIENBMQswCQYDVQQGEwJVUzEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEQMA4G
+A1UEChMHRXhhbXBsZTELMAkGA1UECBMCQ0EwHhcNMTUwNDI4MDEyOTU0WhcNMTYw
+NDI3MDEyOTU0WjBXMREwDwYDVQQDEwh2ZXRpbmFyaTELMAkGA1UEBhMCVVMxFjAU
+BgNVBAcTDVNhbiBGcmFuY2lzY28xEDAOBgNVBAoTB0V4YW1wbGUxCzAJBgNVBAgT
+AkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA8rZTAVnXsPwzy5HE
+kLUJvKjzVd24ZGUTEQLU1V+iiFdQUBSVVrUroLKXtvM7FLYpm3BA7XfEraTPsBVB
+J2NgbLbA1//mkFkbQd4nJF8ugS3a7knwMto2UylGn2WW36yeUI0ZRDarEUbMqVZV
+ECXdkdZyIuFyTN7zDKduguHCw89pzP424J+QXPpewT39/XByJ8ok557cY3j3z78S
+FOfFf4lnGsuIdumVy7AqhubsxJuadsSOudpAb2ElZbpHNYXgOq4yhry7EEZIEbfV
+GAiOGUoMFMrqgLQDUJcrMrIdFiNleR3xv3w2euxMbZfOP21lWLTSBhJEdhZ7X5F/
+OsgqTQIDAQABo4H4MIH1MIGBBgNVHSMEejB4gBR233eeV1v6NtTVfho+G5C9LAyy
+s6FdpFswWTELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRYwFAYDVQQHEw1TYW4g
+RnJhbmNpc2NvMRAwDgYDVQQKEwdFeGFtcGxlMRMwEQYDVQQDEwpFeGFtcGxlIENB
+ggEBMAwGA1UdEwEB/wQCMAAwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
+MA4GA1UdDwEB/wQEAwIFoDATBgNVHREEDDAKggh2ZXRpbmFyaTAdBgNVHQ4EFgQU
+nm7GapxAmZX7G7aAU3dX9qs6zuswDQYJKoZIhvcNAQELBQADggIBAKiGuAZHmp0Q
+i/mDsNhsyGpQ/6rTHrUuGjkH/zb/LClxe+TRMDFy3HKAdk3I+0ixy+3nI/3uCjqB
+ZizhoAi0/qmGDbNqnEuMVvN6B+hcYDLMO9YZwNtuT5l/JgQMOLAA7wMmbnoH6fWn
+o7eUI6+5Mu4bswE4mmP5HQCJb/ex3/tDVxmN0BqKrCbOoLBOEetM+HwO2V2xcbM4
+AF3MLDiAzCss80S0p4V8BwriKR74iHMeLdA1XnOGMMOkcdx0C2AO3UKlqoJcYWot
+n6Zb+yRS61ukuw4DowyUOaUMrnVBS3NW7mCPPvKZmC3MwJWqgA+0EsNn8ph/EK77
+QFUDwYyurIZ8oMGfLjV8i/u0R6GNMPSs184BbHEjxVrIPrXVk0+fCim9LWAYuW3h
++iwNu82+E8JArv3LxmIVJenzAox2gqmCj9uc18xHNhCwRPEJzKt/rF0qidjwqF5Z
+Iz290bM7Odo03knQFSfS4xAZAYVPtM47liw9+5TDt+SOG/VsbjDRaj4IheSazdvw
+ITr4zki3An7SZC1Y5Lhz0cfHUJWSHsICBMkpRzCWIRejQ86S/r3dWvqWs0m2+Pe9
+C4x+l21k1eNsg5/l1lXfPNYTgLbCNyyfF5veDjAilEZ5W74g6z73dYI9QA8xlAlg
+eYcNsiJhKNNJC3EGw4lEOUXpxO8Jozne
+-----END CERTIFICATE-----

server/server_test.go

@@ -40,8 +40,8 @@ func TestRunReservedPort(t *testing.T) {
 	config := &config.Configuration{
 		Server: config.ServerConf{
 			Addr:        "localhost:80",
-			TLSCertFile: "../fixtures/ca.pem",
-			TLSKeyFile:  "../fixtures/ca-key.pem",
+			TLSCertFile: "../fixtures/vetinari.pem",
+			TLSKeyFile:  "../fixtures/vetinari.key",
 		},
 	}
 
@@ -61,8 +61,8 @@ func TestRunGoodCancel(t *testing.T) {
 	config := &config.Configuration{
 		Server: config.ServerConf{
 			Addr:        "localhost:8002",
-			TLSCertFile: "../fixtures/ca.pem",
-			TLSKeyFile:  "../fixtures/ca-key.pem",
+			TLSCertFile: "../fixtures/vetinari.pem",
+			TLSKeyFile:  "../fixtures/vetinari.key",
 		},
 	}