diff options
| author | davidben <davidben@chromium.org> | 2015-04-30 17:40:49 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-01 00:41:39 +0000 |
| commit | 121e9c969b46eb278134dcdcfd44e2c677c5c6b3 (patch) | |
| tree | 6e404241526366f8baf2c2cd8f04e25743d92617 /components/test | |
| parent | 9476a1c73347b083a1077b5c187d26fe8514bff4 (diff) | |
| download | chromium_src-121e9c969b46eb278134dcdcfd44e2c677c5c6b3.zip chromium_src-121e9c969b46eb278134dcdcfd44e2c677c5c6b3.tar.gz chromium_src-121e9c969b46eb278134dcdcfd44e2c677c5c6b3.tar.bz2 | |
Roll src/third_party/boringssl/src ef4962f:68de407
Summary of changes available at:
https://boringssl.googlesource.com/boringssl/+log/ef4962f..68de407
Since BoringSSL's headers were tightened somewhat, this fixes code
in Chromium to include mem.h when relevant functions are used.
BUG=none
Review URL: https://codereview.chromium.org/1113533004
Cr-Commit-Position: refs/heads/master@{#327847}
Diffstat (limited to 'components/test')
| -rw-r--r-- | components/test/data/webcrypto/ec_private_keys.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/components/test/data/webcrypto/ec_private_keys.json b/components/test/data/webcrypto/ec_private_keys.json index e1506dd..3c5abd2 100644 --- a/components/test/data/webcrypto/ec_private_keys.json +++ b/components/test/data/webcrypto/ec_private_keys.json @@ -72,7 +72,7 @@ "x":"t9PMXQhdi3cHs-Vy0iPxbNXid9P7k_sbGxGycoRjzsU", "y":"gKEET8d0MXwkffogoA-3jRQZjTSmNxeUfoxxQ-y53xM" }, - "pkcs8": "308186020100301306072A8648CE3D020106082A8648CE3D030107046C306A020101041FC766C09343D4337EEAD05A5CE16C899808C8F15C7C7A4C7DF7231C84C2D5BCA14403420004B7D3CC5D085D8B7707B3E572D223F16CD5E277D3FB93FB1B1B11B2728463CEC580A1044FC774317C247DFA20A00FB78D14198D34A63717947E8C7143ECB9DF13" + "pkcs8": "308187020100301306072A8648CE3D020106082A8648CE3D030107046D306B020101042000C766C09343D4337EEAD05A5CE16C899808C8F15C7C7A4C7DF7231C84C2D5BCA14403420004B7D3CC5D085D8B7707B3E572D223F16CD5E277D3FB93FB1B1B11B2728463CEC580A1044FC774317C247DFA20A00FB78D14198D34A63717947E8C7143ECB9DF13" }, // In this test the PKCS8 input data does NOT contain the optional publicKey field. |