diff options
| author | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 00:27:18 +0000 |
|---|---|---|
| committer | mbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-09 00:27:18 +0000 |
| commit | 291d2e29d539bacf57dbd66bff13b8d57f03f3c7 (patch) | |
| tree | c66e0bcae88908ddc0f482ccae706dabd89a50c3 /net | |
| parent | 26711738350a67f6db9f3d408badfa5882790b1e (diff) | |
| download | chromium_src-291d2e29d539bacf57dbd66bff13b8d57f03f3c7.zip chromium_src-291d2e29d539bacf57dbd66bff13b8d57f03f3c7.tar.gz chromium_src-291d2e29d539bacf57dbd66bff13b8d57f03f3c7.tar.bz2 | |
Support loading of chained certificates from the cert file.
fix from Kevin Lindsay (kelindsay@gmail.com)
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6623085
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77383 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
| -rw-r--r-- | net/tools/flip_server/spdy_ssl.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/net/tools/flip_server/spdy_ssl.cc b/net/tools/flip_server/spdy_ssl.cc index 79559aa..8d3b21c 100644 --- a/net/tools/flip_server/spdy_ssl.cc +++ b/net/tools/flip_server/spdy_ssl.cc @@ -44,9 +44,8 @@ void InitSSL(SSLState* state, // Disable SSLv2 support. SSL_CTX_set_options(state->ssl_ctx, SSL_OP_NO_SSLv2 | SSL_OP_CIPHER_SERVER_PREFERENCE); - if (SSL_CTX_use_certificate_file(state->ssl_ctx, - ssl_cert_name.c_str(), - SSL_FILETYPE_PEM) <= 0) { + if (SSL_CTX_use_certificate_chain_file(state->ssl_ctx, + ssl_cert_name.c_str()) <= 0) { PrintSslError(); LOG(FATAL) << "Unable to use cert.pem as SSL cert."; } |