diff options
| author | Steven Fackler <[email protected]> | 2015-07-06 11:09:19 -0700 |
|---|---|---|
| committer | Steven Fackler <[email protected]> | 2015-07-06 11:09:19 -0700 |
| commit | 114e8a5a58a8fb3c4cc37391fc2f5a7addd796fc (patch) | |
| tree | d35618791cfc3bf1815b310639f74185a0d0464d /openssl/test | |
| parent | Merge branch 'release-v0.6.3' into release (diff) | |
| parent | Release v0.6.4 (diff) | |
| download | rust-openssl-0.6.4.tar.xz rust-openssl-0.6.4.zip | |
Merge branch 'release-v0.6.4' into releasev0.6.4
Diffstat (limited to 'openssl/test')
| -rw-r--r-- | openssl/test/nid_test_cert.pem | 12 | ||||
| -rwxr-xr-x | openssl/test/test.sh | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/openssl/test/nid_test_cert.pem b/openssl/test/nid_test_cert.pem new file mode 100644 index 00000000..6f17e734 --- /dev/null +++ b/openssl/test/nid_test_cert.pem @@ -0,0 +1,12 @@ +-----BEGIN CERTIFICATE----- +MIIB1DCCAX6gAwIBAgIJAMzXWZGWHleWMA0GCSqGSIb3DQEBCwUAMFYxHzAdBgkq +hkiG9w0BCQEWEHRlc3RAZXhhbXBsZS5jb20xFDASBgNVBAMMC2V4YW1wbGUuY29t +MR0wGwYJKoZIhvcNAQkUHg4ARQB4AGEAbQBwAGwAZTAeFw0xNTA3MDEwNjQ3NDRa +Fw0xNTA3MzEwNjQ3NDRaMFYxHzAdBgkqhkiG9w0BCQEWEHRlc3RAZXhhbXBsZS5j +b20xFDASBgNVBAMMC2V4YW1wbGUuY29tMR0wGwYJKoZIhvcNAQkUHg4ARQB4AGEA +bQBwAGwAZTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQCmejzp4+o35FD0hAnx2trL +08h07X5jZca9DgZH35hWXPh7fMucLt/IPXIRnz2zKEa/Mo6D2V/fx03Mqo0epid7 +AgMBAAGjLzAtMB0GA1UdDgQWBBRQa57tXz3rZNRz+fTbo3w3jQJMBTAMBgNVHRME +BTADAQH/MA0GCSqGSIb3DQEBCwUAA0EAm0iY9cr+gvC+vcQIebdofpQ4GcDW8U6W +Bxs8ZXinLl69P0jYLum3+XITNFRiyQqcivaxdxthxDNOX7P+aKwkJA== +-----END CERTIFICATE----- diff --git a/openssl/test/test.sh b/openssl/test/test.sh index 975b124e..9beb37c3 100755 --- a/openssl/test/test.sh +++ b/openssl/test/test.sh @@ -4,7 +4,7 @@ cd $(dirname $0) openssl s_server -accept 15418 -www -cert cert.pem -key key.pem >/dev/null 2>&1 & openssl s_server -accept 15419 -www -cert cert.pem -key key.pem \ - -nextprotoneg "http/1.1,spdy/3.1" >/dev/null 2>&1 & + -nextprotoneg "http/1.1,spdy/3.1" -alpn "http/1.1,spdy/3.1" >/dev/null 2>&1 & openssl s_server -no_ssl2 -accept 15420 -www -cert cert.pem -key key.pem >/dev/null 2>&1 & if test "$TRAVIS_OS_NAME" == "osx"; then |