wip: merge from upstream

.travis.yml

@@ -3,6 +3,8 @@ language: go
 go:
 - 1.9.x
 - 1.10.x
+- 1.11.x
+- 1.12.x
 
 services:
   - docker

examples/customTls/certs/ca.key

@@ -0,0 +1,30 @@
+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,6038398CF5682C8D
+
+0ywZooqJ4w6M87oDY0M2h1vfPi2kLd3q1BackeLeor7NIr36kCYoN02IOC/bwAOP
+6OjiaBCb4INyEIpJWolJ0ATJgtcFiy0S6Joo+mJiG3/EIXjVSYVJmwywKZuZgAr7
+Ms9lchEqhRiv7fswyG0InaCEm2V0LFucnWOs7LsSaDbKtNswG4o09F5ebHfOSDEe
+6mSvD+rseRNYQrSxEqrvazYWzrMPvsLY4tIDYGJqjRX+OwdQI4ud9Bn1ninWTkuQ
+H//0rYsosmkYSH15seOkeP+6UdhQv4ZwWcUTJoiYfPfFmEk3ywPWtbQ62JcwOL3U
+aWew+3fJL55myMHEKCOUTraLedJOIxgcI0VZS7qBqnSGetyBsbun2hR9rIOFAVNq
+hKw+u/P8lFzeEC8XFeg165VxWqy7iKnACG+EmGpz2F3prm7y4Hsf2L61EXOmyo/j
+QxLuJ2lhcON6ydEXi+0UXwVnGrBw309BVfsUbGYDzpHjjrAV2k44d/RIdUKe2Ct1
+W7PT9Fy8hnbUCzdgk+Hu6vgaWDX/Ii+CepG3E3Q9YPQOSC2NxCq85KgdbcO91V8Y
+zXIBDTrTybz8hKTVRFZKHqbt0fiQW/ES8dJsB6I+CmAl5Hqkwg9gnDqDfeXBEqz0
+MHrJUNLIS9tAmbdRcqBTMoXN2TLruVj99Tvpog5ZcpGRO9Do/NHfKW6yrSZvwlZb
+GUikOeogdNICmwnTB6BevbETL1XB11Avu/VL7klbcV3YxdvwroYWla1wxrKMl/x0
+0kSlVbgIRLB0SFoHjPZAzBgWAQ6Cy5v5iIT+9sx5M5e6DQIA0It+k0tIP9CEv2O4
+FkTfaaVvgILBXaRFjpbYki9fDNQ1c4yBxcqSnniu2urIcqdrPtxwhVtYsx5G6U+j
+Q/RNIjvXqjv5hEwJhuRh3OLGeEc7viHk00rCQRkOvo0uyMdVDcPHT6bfXP3BG9/Z
+RQOgyUPKwg3lycvq7SShlwcWaYWOgbl6+4vXMwRGdfL7IBUyhwWZL/KGcOrmU29L
+1worjvJYkukyM5ocx7xsd7NEyjVPc+c09BTeShbjhzn7VhC9+kqbYrdl2YU+7vy7
+D3ykD3HwfjBszuNe+QGON3+dl7jAw9ObRTGoH+lX1FKttKqvdqzweCEBgbsQHR9n
+OCrZDzbgxZJOq5xfMm8dz+F6nZV4UyhvUTWLmsNpH4/K0b0f1wfuWAsCuSNufqAv
+xHGnOEyoOAzqFB/5AaAexehDM7Z34xst9RtOMwDAxyWkKF9x0ckAHPc5qRuFXAcd
+vlpf2w+9LzbEohUjAX/dbZgS88UU++vUQUTEI0hhzgdGyII90rASJ7EuEHHFTyio
+Ad5hDhCqfTtOW+c3iaRHK//ETz5CrZamrnR73UKHAsTWrBSNtEi50y0T+6EG3zih
+VxLlrrfiOQYJFp+MJq4O/yzlb+oH3qAmkORdtSWJlEtlxFaRg1kR8Yf4fuhnGug9
+Y/vIGSQid4//TfANbW6Izt9hw4tKzifrieDCjHr+vVQC7M2P5vFuRlolsA6Q0i7B
+2ECYRBlE9flubPfPWLvhai5nF1iVZEmdYJI0vNljJHffZDppHQlIQnX+nMxlpItN
+-----END RSA PRIVATE KEY-----

examples/customTls/certs/ca.pem

@@ -1,19 +1,22 @@
 -----BEGIN CERTIFICATE-----
-MIIDAjCCAeqgAwIBAgIRANd+eeBjb4D4mNW86NmUFk8wDQYJKoZIhvcNAQELBQAw
-KjESMBAGA1UEChMJbG9jYWxob3N0MRQwEgYDVQQDEwtQa2kgQ0EgUm9vdDAeFw0x
-NzAyMjgyMjIzMDBaFw0yMDAyMTMyMjIzMDBaMCoxEjAQBgNVBAoTCWxvY2FsaG9z
-dDEUMBIGA1UEAxMLUGtpIENBIFJvb3QwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQDS4qFc21Bh5fw4UftWS/MLxKkyJklX+045brxmYL05zGA/isF1QWSq
-pZaXaXhFr68/LcXAHOAiNzJSHe9ezscnn7lLN0J+6v5wvW6UKoQhMdCZpWHsGFe5
-e4od6hWJm6rjh3qGx4ENgqXOZNukRMYbig7MKGE5htxcnvdImrPXAiRtuJ6Aa6bl
-dBhkpOhQwHEey90NtcliRM6H1jYcCbhtlRStCVXsWiMjfpq9YIq+Wf/ece27Rvgy
-DX3UVNkRTuS0ZeX+D3n4lyOMTzgT6Cn0OUU23D5TRCCkDCDxkXgmnT6Cri9x2WnX
-AT7c2apUAx6ms9+AACE32ijqSg0Zx0+zAgMBAAGjIzAhMA4GA1UdDwEB/wQEAwIC
-pDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQCZ/d2+NWcU2bNy
-/W4XrwOHuBGVWW6vB2HGDN8l+Ut3K6Gbc5sXrkmmoap2y9zZKZl9mybchqQUJ9Qo
-U8zrhRJ5L74NRay9Jm+csRXbMBdSZtfJ8RRzZK7cr+fZ3DTd7tReSmV00nj7ciGj
-O2s73/GZHab7FzbTSbEf/5ei0UMAlN4L89DxzJxfnvIg6wu7dXg/QPhU3Ws4Y4bj
-5Dpl7pS2ZnVTh+cz39PgD+WkjubSx/CfOoo0bvwXKvg7vuE3HB65aP8tEZePSj4t
-MKWLAxwTNSqq7FVDrYkpgsnG00BTefaViTRyEuMaBWc4IpJ+r+W2ODEtFTWVyiyJ
-zXOYmm2Y
+MIIDoDCCAogCCQCRS+LK7eZQ4DANBgkqhkiG9w0BAQsFADCBkTELMAkGA1UEBhMC
+QVUxDDAKBgNVBAgMA1ZJQzESMBAGA1UEBwwJTWVsYm91cm5lMREwDwYDVQQKDAhQ
+YWN0ZmxvdzEUMBIGA1UECwwLRW5naW5lZXJpbmcxEjAQBgNVBAMMCWxvY2FsaG9z
+dDEjMCEGCSqGSIb3DQEJARYUaGVsbG9AZG9udGNhbGxtZS5jb20wHhcNMjAwMjI0
+MDMzMDQ3WhcNMzAwMjIxMDMzMDQ3WjCBkTELMAkGA1UEBhMCQVUxDDAKBgNVBAgM
+A1ZJQzESMBAGA1UEBwwJTWVsYm91cm5lMREwDwYDVQQKDAhQYWN0ZmxvdzEUMBIG
+A1UECwwLRW5naW5lZXJpbmcxEjAQBgNVBAMMCWxvY2FsaG9zdDEjMCEGCSqGSIb3
+DQEJARYUaGVsbG9AZG9udGNhbGxtZS5jb20wggEiMA0GCSqGSIb3DQEBAQUAA4IB
+DwAwggEKAoIBAQDeQdDWs2HrWihRutMAoKTy+ff7VUXvcrz6fbIIF672Mjo15vzf
+sFNjsEXHWdWgsXtkv5yGRWBI/3oYan/Z0cDCJfxzxpF/98oY9PbH1hZSCNmI0o0u
+jb7esS0Xsu3uz9NXqoyZU34GtNyi8ZtUMlkNTFTbN8HH3g2gHZ33nSzJ/Q3t29xE
+i+P/FEQnY0db3R86qts/rfH6dS/vfyc5QI5deK0NDtpfQFXrkAExPMZrFYRAxSCc
+cHdshk9qCjLerpi/Niz/xe5vh8+pJ3ykXqjQqLny6JwE3tNm/C0dFIB9M0WxNfmy
+TCgEUsFj0Hc3tRH/Jri+Pa023rgTud0bCzrBAgMBAAEwDQYJKoZIhvcNAQELBQAD
+ggEBABC0gOJ6x0n+rSTalpcXCvGLOsPV1zzMcsQNcuurOfob6K2txUyw3rtSpwAl
+az3gTqr7dlBxpOv+LQzq6t2j2+yv7kmTp27eJGgEn0QID/hYMGhpO4LA2edaxHDq
+vLfGR20jATx8kGG51uFo+lXy0ze8RFEPkQCucp3PPPAttck33MnX8B7Ncozg//El
+MbtAWIzs8yTrVBnJhmiF4/TwyjtIxCtfsH/0Ng5u7FJF2uKQ7Q/mhWtZpkqVBK3M
+QQQ39mxRJ0n7IMtRCP+DTTpTukZ3LfhLRF7gzuh50vOucfvO8ulLd/kvT8tLZddw
+ZZNCHsXC1qz3M92ZjLLnymjobro=
 -----END CERTIFICATE-----

examples/customTls/certs/server-cert.pem

@@ -1,19 +1,22 @@
 -----BEGIN CERTIFICATE-----
-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
+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
+jtZ5nBZK2lfcY8lG6fpDaDqysFI=
 -----END CERTIFICATE-----

examples/customTls/certs/server-key.pem

@@ -1,27 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-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
+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
 -----END RSA PRIVATE KEY-----

examples/customTls/self_signed_certificate_test.go

@@ -23,6 +23,8 @@ func TestExample_SelfSignedTLSProvider(t *testing.T) {
 	go startServer()
 
 	pact := createPact()
+	// time.Sleep(100 * time.Second)
+
 	_, err := pact.VerifyProvider(t, types.VerifyRequest{
 		ProviderBaseURL: fmt.Sprintf("https://localhost:%d", port),
 		PactURLs:        []string{filepath.ToSlash(fmt.Sprintf("%s/consumer-selfsignedtls.json", pactDir))},
@@ -86,3 +88,10 @@ func getCaCertPool() *x509.CertPool {
 
 	return caCertPool
 }
+
+// Generate a certificate with self-signed CA
+// openssl genrsa -des3 -out ca.key 2048
+// openssl req -x509 -new -nodes -key ca.key -sha256 -days 3650 -out ca.pem
+// openssl genrsa -out server-key.pem 2048
+// openssl req -new -key server-key.pem -out server.csr // Set "localhost" as the common name
+// openssl x509 -req -in server.csr -CA ca.pem -CAkey ca.key -CAcreateserial -out server-cert.pem -days 3650 -sha256