Update makefiles after merge of Chromium at r220875

This commit was generated by merge_from_chromium.py.

Change-Id: I8a0e80bcc62e002855a6b9ef32d9b772cbb82964
Update makefiles after merge of Chromium at r221383

This commit was generated by merge_from_chromium.py.

Change-Id: I2bf65deb24ffc43e66083e82c8e49cf167f7c5b1
Update makefiles after merge of Chromium at r221391

This commit was generated by merge_from_chromium.py.

Change-Id: I2ec8d60c60864959afe56cbd5b57a35b60236e6e
Update makefiles after merge of Chromium at r221673

This commit was generated by merge_from_chromium.py.

Change-Id: I2ec525d243e8de858f817506b7e47c44eedfa52e
Update makefiles after merge of Chromium at r221681

This commit was generated by merge_from_chromium.py.

Change-Id: If0937d6793e8017c8ed1f0f4c817bd1ab26fbbe9
Update makefiles after merge of Chromium at 222376

This commit was generated by merge_from_chromium.py.

Change-Id: Ieeb8c5973a0cca82e87f8f58eb69a2acf9456dd9
Merge from Chromium at DEPS revision 222756

This commit was generated by merge_to_master.py.

Change-Id: I38bf4739bb0ecdcf22b85aa6847e7a82560bc1b2
Update makefiles after merge of Chromium at 223266

This commit was generated by merge_from_chromium.py.

Change-Id: Iba615e864af90268dc48668005389a72296d5508
Update makefiles after merge of Chromium at 223269

This commit was generated by merge_from_chromium.py.

Change-Id: Iaa1254dde69e4195097fe721359a50dd3139b050
Update makefiles after merge of Chromium at 223573

This commit was generated by merge_from_chromium.py.

Change-Id: Ic5858c2a46b781c5151c409507d98441464facbf
Merge from Chromium at DEPS revision 224184

This commit was generated by merge_to_master.py.

Change-Id: Ic74cb886f1c65271634dcaf051298b4c3db9b63f
Update makefiles after merge of Chromium at 224573

This commit was generated by merge_from_chromium.py.

Change-Id: I64fc3b2ad132b27316ec8d0e04433e473bf4fcff
Merge from Chromium at DEPS revision 225410

This commit was generated by merge_to_master.py.

Change-Id: I476b16b8d61432a5a24a472a8d775f0f80769854
Update makefiles after merge of Chromium at 227040

This commit was generated by merge_from_chromium.py.

Change-Id: I55a7347d7245807aca750b02e81460395224cc5d
Merge from Chromium at DEPS revision 228962

This commit was generated by merge_to_master.py.

Change-Id: I065874c572b8625c38ce4e4de64c201df7b3d776
Use C source for openssl RC4 calculation instead of ASM

Due to a problem with rc4-x86_64.S,
We use the C rc4 source instead of the ASM source.
This hurts performance, but it's not a problem because
no production code uses openssl on x86-64.

BUG=240674
R=agl@chromium.org, digit@chromium.org, rsleevi@chromium.org, wtc@chromium.org
TBR=darin

Review URL: https://codereview.chromium.org/26651005

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@229995 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Updating Channel ID to allow computing the key when the server supports it.

The previous API of openssl for channel ID forces the client to set the
private key before knowing if the server supports channel ID. This
updates the API so that the client can set the private key after the
handshake started and the server confirmed it supports the protocol.

R=agl@chromium.org, digit@chromium.org

Review URL: https://codereview.chromium.org/28983003

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@230132 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Update Channel ID API to use a callback.

R=agl@chromium.org, rsleevi@chromium.org

Review URL: https://codereview.chromium.org/35493002

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@230363 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Fix code style.

TBR=agl@chromium.org
BUG=306176

Review URL: https://codereview.chromium.org/36693002

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@230364 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
Merge third_party/openssl from https://chromium.googlesource.com/chromium/deps/openssl.git at 8a612017162d5dd6fde1b22715941723b49e8f99

This commit was generated by merge_from_chromium.py.

Change-Id: I85e9f4f45f7406db9f9864334c49f69c0fd81482