| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "net/spdy/spdy_credential_builder.h" | 5 #include "net/spdy/spdy_credential_builder.h" |
| 6 | 6 |
| 7 #include "base/threading/sequenced_worker_pool.h" | 7 #include "base/threading/sequenced_worker_pool.h" |
| 8 #include "crypto/ec_signature_creator.h" | 8 #include "crypto/ec_signature_creator.h" |
| 9 #include "crypto/ec_private_key.h" | 9 #include "crypto/ec_private_key.h" |
| 10 #include "net/base/asn1_util.h" | 10 #include "net/base/asn1_util.h" |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 return SpdyCredentialBuilder::GetCredentialSecret( | 68 return SpdyCredentialBuilder::GetCredentialSecret( |
| 69 MockClientSocket::kTlsUnique); | 69 MockClientSocket::kTlsUnique); |
| 70 } | 70 } |
| 71 | 71 |
| 72 SpdyTestStateHelper helper_; // Provides deterministic EC signatures. | 72 SpdyTestStateHelper helper_; // Provides deterministic EC signatures. |
| 73 std::string cert_; | 73 std::string cert_; |
| 74 std::string key_; | 74 std::string key_; |
| 75 SpdyCredential credential_; | 75 SpdyCredential credential_; |
| 76 }; | 76 }; |
| 77 | 77 |
| 78 TEST_F(SpdyCredentialBuilderTest, GetCredentialSecret) { | 78 // http://crbug.com/142833, http://crbug.com/140991. The following tests fail |
| 79 // with OpenSSL due to the unimplemented ec_private_key_openssl.cc. |
| 80 #if defined(USE_OPENSSL) |
| 81 #define MAYBE_GetCredentialSecret DISABLED_GetCredentialSecret |
| 82 #else |
| 83 #define MAYBE_GetCredentialSecret GetCredentialSecret |
| 84 #endif |
| 85 |
| 86 TEST_F(SpdyCredentialBuilderTest, MAYBE_GetCredentialSecret) { |
| 79 std::string secret_str(kSecretPrefix, arraysize(kSecretPrefix)); | 87 std::string secret_str(kSecretPrefix, arraysize(kSecretPrefix)); |
| 80 secret_str.append(MockClientSocket::kTlsUnique); | 88 secret_str.append(MockClientSocket::kTlsUnique); |
| 81 | 89 |
| 82 EXPECT_EQ(secret_str, GetCredentialSecret()); | 90 EXPECT_EQ(secret_str, GetCredentialSecret()); |
| 83 } | 91 } |
| 84 | 92 |
| 85 TEST_F(SpdyCredentialBuilderTest, SucceedsWithECDSACert) { | 93 #if defined(USE_OPENSSL) |
| 94 #define MAYBE_SucceedsWithECDSACert DISABLED_SucceedsWithECDSACert |
| 95 #else |
| 96 #define MAYBE_SucceedsWithECDSACert SucceedsWithECDSACert |
| 97 #endif |
| 98 |
| 99 TEST_F(SpdyCredentialBuilderTest, MAYBE_SucceedsWithECDSACert) { |
| 86 EXPECT_EQ(OK, BuildWithType(CLIENT_CERT_ECDSA_SIGN)); | 100 EXPECT_EQ(OK, BuildWithType(CLIENT_CERT_ECDSA_SIGN)); |
| 87 } | 101 } |
| 88 | 102 |
| 89 TEST_F(SpdyCredentialBuilderTest, FailsWithRSACert) { | 103 #if defined(USE_OPENSSL) |
| 104 #define MAYBE_FailsWithRSACert DISABLED_FailsWithRSACert |
| 105 #else |
| 106 #define MAYBE_FailsWithRSACert FailsWithRSACert |
| 107 #endif |
| 108 |
| 109 TEST_F(SpdyCredentialBuilderTest, MAYBE_FailsWithRSACert) { |
| 90 EXPECT_EQ(ERR_BAD_SSL_CLIENT_AUTH_CERT, | 110 EXPECT_EQ(ERR_BAD_SSL_CLIENT_AUTH_CERT, |
| 91 BuildWithType(CLIENT_CERT_RSA_SIGN)); | 111 BuildWithType(CLIENT_CERT_RSA_SIGN)); |
| 92 } | 112 } |
| 93 | 113 |
| 94 TEST_F(SpdyCredentialBuilderTest, SetsSlotCorrectly) { | 114 #if defined(USE_OPENSSL) |
| 115 #define MAYBE_SetsSlotCorrectly DISABLED_SetsSlotCorrectly |
| 116 #else |
| 117 #define MAYBE_SetsSlotCorrectly SetsSlotCorrectly |
| 118 #endif |
| 119 |
| 120 TEST_F(SpdyCredentialBuilderTest, MAYBE_SetsSlotCorrectly) { |
| 95 ASSERT_EQ(OK, Build()); | 121 ASSERT_EQ(OK, Build()); |
| 96 EXPECT_EQ(kSlot, credential_.slot); | 122 EXPECT_EQ(kSlot, credential_.slot); |
| 97 } | 123 } |
| 98 | 124 |
| 99 TEST_F(SpdyCredentialBuilderTest, SetsCertCorrectly) { | 125 #if defined(USE_OPENSSL) |
| 126 #define MAYBE_SetsCertCorrectly DISABLED_SetsCertCorrectly |
| 127 #else |
| 128 #define MAYBE_SetsCertCorrectly SetsCertCorrectly |
| 129 #endif |
| 130 |
| 131 TEST_F(SpdyCredentialBuilderTest, MAYBE_SetsCertCorrectly) { |
| 100 ASSERT_EQ(OK, Build()); | 132 ASSERT_EQ(OK, Build()); |
| 101 base::StringPiece spki; | 133 base::StringPiece spki; |
| 102 ASSERT_TRUE(asn1::ExtractSPKIFromDERCert(cert_, &spki)); | 134 ASSERT_TRUE(asn1::ExtractSPKIFromDERCert(cert_, &spki)); |
| 103 base::StringPiece spk; | 135 base::StringPiece spk; |
| 104 ASSERT_TRUE(asn1::ExtractSubjectPublicKeyFromSPKI(spki, &spk)); | 136 ASSERT_TRUE(asn1::ExtractSubjectPublicKeyFromSPKI(spki, &spk)); |
| 105 EXPECT_EQ(1u, credential_.certs.size()); | 137 EXPECT_EQ(1u, credential_.certs.size()); |
| 106 EXPECT_EQ(0, (int)spk[0]); | 138 EXPECT_EQ(0, (int)spk[0]); |
| 107 EXPECT_EQ(4, (int)spk[1]); | 139 EXPECT_EQ(4, (int)spk[1]); |
| 108 EXPECT_EQ(spk.substr(2, spk.length()).as_string(), credential_.certs[0]); | 140 EXPECT_EQ(spk.substr(2, spk.length()).as_string(), credential_.certs[0]); |
| 109 } | 141 } |
| 110 | 142 |
| 111 TEST_F(SpdyCredentialBuilderTest, SetsProofCorrectly) { | 143 #if defined(USE_OPENSSL) |
| 144 #define MAYBE_SetsProofCorrectly DISABLED_SetsProofCorrectly |
| 145 #else |
| 146 #define MAYBE_SetsProofCorrectly SetsProofCorrectly |
| 147 #endif |
| 148 |
| 149 TEST_F(SpdyCredentialBuilderTest, MAYBE_SetsProofCorrectly) { |
| 112 ASSERT_EQ(OK, Build()); | 150 ASSERT_EQ(OK, Build()); |
| 113 base::StringPiece spki; | 151 base::StringPiece spki; |
| 114 ASSERT_TRUE(asn1::ExtractSPKIFromDERCert(cert_, &spki)); | 152 ASSERT_TRUE(asn1::ExtractSPKIFromDERCert(cert_, &spki)); |
| 115 std::vector<uint8> spki_data(spki.data(), | 153 std::vector<uint8> spki_data(spki.data(), |
| 116 spki.data() + spki.size()); | 154 spki.data() + spki.size()); |
| 117 std::vector<uint8> key_data(key_.data(), | 155 std::vector<uint8> key_data(key_.data(), |
| 118 key_.data() + key_.length()); | 156 key_.data() + key_.length()); |
| 119 std::vector<uint8> proof_data; | 157 std::vector<uint8> proof_data; |
| 120 scoped_ptr<crypto::ECPrivateKey> private_key( | 158 scoped_ptr<crypto::ECPrivateKey> private_key( |
| 121 crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo( | 159 crypto::ECPrivateKey::CreateFromEncryptedPrivateKeyInfo( |
| 122 ServerBoundCertService::kEPKIPassword, key_data, spki_data)); | 160 ServerBoundCertService::kEPKIPassword, key_data, spki_data)); |
| 123 scoped_ptr<crypto::ECSignatureCreator> creator( | 161 scoped_ptr<crypto::ECSignatureCreator> creator( |
| 124 crypto::ECSignatureCreator::Create(private_key.get())); | 162 crypto::ECSignatureCreator::Create(private_key.get())); |
| 125 std::string secret = GetCredentialSecret(); | 163 std::string secret = GetCredentialSecret(); |
| 126 creator->Sign(reinterpret_cast<const unsigned char *>(secret.data()), | 164 creator->Sign(reinterpret_cast<const unsigned char *>(secret.data()), |
| 127 secret.length(), &proof_data); | 165 secret.length(), &proof_data); |
| 128 | 166 |
| 129 std::string proof(proof_data.begin(), proof_data.end()); | 167 std::string proof(proof_data.begin(), proof_data.end()); |
| 130 EXPECT_EQ(proof, credential_.proof); | 168 EXPECT_EQ(proof, credential_.proof); |
| 131 } | 169 } |
| 132 | 170 |
| 133 } // namespace net | 171 } // namespace net |
| OLD | NEW |