summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2014-08-19Merge from Chromium at DEPS revision 290040HEADmastermainTorne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Icd3e313a2bc3cc85997fbe3c33ffdf5f8158d9c3
2014-08-14Update makefiles after merge of Chromium at 289578Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I6b9ef3d9f9d06c0b9062e0dddede5f8ec20aac6a
2014-08-12Merge from Chromium at DEPS revision 288042Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ic56ac0ad483d730efeb75b1f3b338ac16a79923d
2014-07-29Update makefiles after merge of Chromium at 286177Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Icc93ae5190db444e435cdcfd1307926f54c6e54f
2014-07-29Merge third_party/openssl from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/openssl.git at c9613e3123ff035683f45163af142817b38d03b6 This commit was generated by merge_from_chromium.py. Change-Id: I6e354de9fb49c0c2c1485b93d68e4557bf5c9991
2014-07-20Merge from Chromium at DEPS revision 284076Ben Murdoch
This commit was generated by merge_to_master.py. Change-Id: Id679bcc6d6917ac7d763985319eb580c796ef5c9
2014-07-18Switch openssl forwarding target to 'none'.davidben@chromium.org
Building it as a static library causes problems on Mac at least since it's empty. BUG=393317 Review URL: https://codereview.chromium.org/401903004 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@284247 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-07-15Remove header files in include/openssl.agl@chromium.org
This is needed because webrtc adds "../../openssl/openssl/include" to its include directories explicitly rather than just using direct dependent settings. git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@283115 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-07-14OpenSSL: forward to BoringSSL.agl@chromium.org
This change will sit in the OpenSSL deps repo. When we switch to BoringSSL, that patch will update DEPS to point to this revision. This avoids having to update webrtc and libjingle repos at the same time. The NaCl build is removed because I believe that all the pointers to it are in the main Chromium repo and can be switched over. I'd rather get a clear build error than linking in both OpenSSL and BoringSSL. (Also, forwarding doesn't appear to work for NaCl targets.) BUG=393317 https://codereview.chromium.org/383273002/ git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@283025 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-07-10Update makefiles after merge of Chromium at 282385Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ic7e6aee5b15b7b6f526e65929b29b6a3732a529a
2014-06-25Update makefiles after merge of Chromium at 279716Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I3ac0b901144d493a9efd5a02d75e6cf660cbf579
2014-06-25Merge from Chromium at DEPS revision 278856Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I88982c1c25f25ef846e6bda10aececd98d25d2c1
2014-06-20Merge from Chromium at DEPS revision 278205Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I7bb0a3d11ec1ddc7ea260f4756cfad285f1ec566
2014-06-19Update makefiles after merge of Chromium at 278252Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ie2636966966867f765f059fb9d4e917d89b92c45
2014-06-16Update makefiles after merge of Chromium at 277428Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ib432a4c80cef78d025ab2da840dec3ff90bce11c
2014-06-10Update makefiles after merge of Chromium at 276202Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I4f4654f2ee148d50c8960ddd4392e6966ecdf09d
2014-06-10Merge third_party/openssl from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/openssl.git at 063a4b93646788bd883fc0cb1b5eafc991ddacc4 This commit was generated by merge_from_chromium.py. Change-Id: Ibb97ae63ec3cd50ae7a7ec5712e11c1aa3f1d49b
2014-06-09Pull in more changes from OpenSSL 1.0.1h.agl@chromium.org
This change includes the following changes from OpenSSL: a07856a08d7e8d76273e5d05099914aa335da143 "Delays the queue insertion until after the ssl3_setup_buffers() call due to use-after-free bug. PR#3362" 725c5f1ad393a7bc344348d0ec7c268aaf2700a7 "Fix use after free." (Not a problem unless read-ahead is used, which it is not in Chrome) bcc311668ede6ffdcd6dc5a65454a548b5404fcc "Free up s->d1->buffered_app_data.q properly. PR#3286" b107586c0c3447ea22dba8698ebbcd81bb29d48c "Fixed NULL pointer dereference. See PR#3321" d0666f289ac013094bbbf547bfbcd616199b7d2d "evp: prevent underflow in base64 decoding. This patch resolves RT ticket #2608." a41d5174e27c99d1caefd76a8e927c814ede509e "Initialize num properly." 8eb094b9460575a328ba04708147c91fc267b394 "Double free in i2o_ECPublicKey. PR: 3338." 9c8dc84ac16a2f21063ae36809d202d0284ecf82 "Fix double frees." BUG=381169 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@275836 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-06-09Update makefiles after merge of Chromium at 275833Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ib2aa24866b083a6f64cf2c311785ca9bbaa46288
2014-06-09Merge from Chromium at DEPS revision 275586Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Id09daa9811a8862e9e98e6a953538344cf45eb28
2014-06-07Update makefiles after merge of Chromium at 275661Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Iab25f749b82709452754cc0ca9ecfd43a6fd4a7b
2014-06-06Cherrypick "OpenSSL: add CVE fixes from 1.0.1h"Torne (Richard Coles)
> This change includes the following commits from upstream: > 8011cd56e39a433b1837465259a9bd24a38727fb > d3152655d5319ce883c8e3ac4b99f8de4c59d846 > 006cd7083f76ed5cb0d9a914857e9231ef1bc317 > bc8923b1ec9c467755cd86f7848c50ee8812e441 > 1632ef744872edc2aa2a53d487d3e79c965a4ad3 > > These address the following CVEs: > CVE-2014-3470 > CVE-2014-0221 > CVE-2014-0224 > CVE-2014-0195 > > BUG=381169 Bug: 15443154 Change-Id: I9c0204c643de1f9ba2b897b92482937fe4fdbb92 (cherry picked from commit 37523a43656f9acb96eedb00b13b66c196a53a25)
2014-06-05OpenSSL: fix copy of ssl3.hagl@chromium.org
Unlike upstream, the headers are not symlinks so also need to be updated. git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@275137 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-06-05OpenSSL: add CVE fixes from 1.0.1hagl@chromium.org
This change includes the following commits from upstream: 8011cd56e39a433b1837465259a9bd24a38727fb d3152655d5319ce883c8e3ac4b99f8de4c59d846 006cd7083f76ed5cb0d9a914857e9231ef1bc317 bc8923b1ec9c467755cd86f7848c50ee8812e441 1632ef744872edc2aa2a53d487d3e79c965a4ad3 These address the following CVEs: CVE-2014-3470 CVE-2014-0221 CVE-2014-0224 CVE-2014-0195 BUG=381169 https://codereview.chromium.org/317183003/ git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@275106 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-06-03Update makefiles after merge of Chromium at 274467Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I01beedc7891b8a15b7d5a48a32c644e17742cc49
2014-06-03Merge from Chromium at DEPS revision 273901Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: I8a639c7a291feed376dfb255c14c27dfb0e8d364
2014-05-28Update makefiles after merge of Chromium at 273259Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I73f86dcabcffd8a051c4887968233a214bf2c426
2014-05-28Update makefiles after merge of Chromium at 273188Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ie3a9204508f6411017ab2228f9faed772f58b08e
2014-05-24Update makefiles after merge of Chromium at 272740Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I3b82f2b888e91d66a2aaeb7103b3c87d5a64839d
2014-05-23Update makefiles after merge of Chromium at 272566Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I603785ed9a59ee61de5c1bc8b8b6ae1c121c6f25
2014-05-21Merge third_party/openssl from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/openssl.git at 29e801fb234ad76f516552e0c39129f7fcb358ba This commit was generated by merge_from_chromium.py. Change-Id: Id88ffd473d7a4c05646620b0b4c93c7013783c6b
2014-05-20Disable the chromium_code config in the GN build on ARM.brettw@chromium.org
The ARM source files do not compile cleanly without warnings. R=rsleevi@chromium.org Review URL: https://codereview.chromium.org/291153006 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@271781 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-05-20Merge third_party/openssl from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/openssl.git at 3b4db11065e17f93065278faaa5952ab8d0e5c26 This commit was generated by merge_from_chromium.py. Change-Id: I55a5ecbfae8868fe22ca3529bddf3ee35e044a81
2014-05-17Update makefiles after merge of Chromium at 271215Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: Ia1c4fda8244a3a1c195f81f4d84e0e91b47d6987
2014-05-16Update makefiles after merge of Chromium at 270770Torne (Richard Coles)
This commit was generated by merge_from_chromium.py. Change-Id: I80561b8a11bd8a7dc9cf9be7597fe6be6070defa
2014-05-16Merge third_party/openssl from ↵Torne (Richard Coles)
https://chromium.googlesource.com/chromium/deps/openssl.git at 7f0be5dc6cd354f962618d88faa1b1d2b8e32238 This commit was generated by merge_from_chromium.py. Change-Id: I8c7db85ba77b4d241a998975f42bebd536098280
2014-05-15Merge from Chromium at DEPS revision 269467Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Iec3a8d81a68a5c29672c64d8b8408fa7111fdf38
2014-05-14Refactor ssl3_send_client_verify.davidben@chromium.org
The original logic was a confusing spaghetti and mixed up initialization for all the different cases together. Tidy it up in preparation for having to adjust this logic later to support asynchronous crypto operations. BUG=none R=agl@chromium.org Review URL: https://codereview.chromium.org//284693002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@270417 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-05-14Merge from Chromium at DEPS revision 269336Torne (Richard Coles)
This commit was generated by merge_to_master.py. Change-Id: Ia8cc378112bd04b4091175297e16ffe2a3dcc817
2014-05-14Update makefiles after merge of Chromium at 269467Torne (Richard Coles)
This commit was generated by merge_from_chromium.py. Change-Id: Ie657c929ded471c277913dae134d308c174d0e63
2014-05-12Add SSL_get_client_certificate_types.davidben@chromium.org
Exposes the certificate_types parameter in a CertificateRequest. BUG=165446 Review URL: https://codereview.chromium.org/254723002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@269864 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-05-08New tls channel id version for OpenSSLhaavardm@opera.com
New tls channel id version extracted from patch 0015-channelid.patch attached to http://crbug.com/366961. BUG=366961 Review URL: https://codereview.chromium.org/259963009 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@269063 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-05-08Update makefiles after merge of Chromium at 269041Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I487c68add4985c510272fb7005638d1257b76b9c
2014-05-08Update makefiles after merge of Chromium at 269030Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I3787393e5e932318936da1a85dad821a7c1f830b
2014-05-06Revert of New tls channel id version for OpenSSL ↵haavardm@opera.com
(https://codereview.chromium.org/259963009/) Reason for revert: I was a little quick committing this. If someone adds another OpenSSL patch and rolls OpenSSL version forward in DEPS the current channel id test will fail on Android, since tls lite has not yet been updated. I'll revert and sync commit and DEPS update with commit of TLS lite. Original issue's description: > New tls channel id version for OpenSSL > > New tls channel id version extracted from patch 0015-channelid.patch attached to http://crbug.com/366961. > > BUG=366961 TBR=wtc@chromium.org,rsleevi@chromium.org,agl@chromium.org NOTREECHECKS=true NOTRY=true BUG=366961 Review URL: https://codereview.chromium.org/270103002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@268540 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-05-06New tls channel id version for OpenSSLhaavardm@opera.com
New tls channel id version extracted from patch 0015-channelid.patch attached to http://crbug.com/366961. BUG=366961 Review URL: https://codereview.chromium.org/259963009 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@268457 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-05-06Update makefiles after merge of Chromium at 268379Android Chromium Automerger
This commit was generated by merge_from_chromium.py. Change-Id: I962c3288e20c90b3e753c79e069597b44e8bca4b
2014-05-02Merge third_party/openssl from ↵Android Chromium Automerger
https://chromium.googlesource.com/chromium/deps/openssl.git at 55b9eb8eb546355b3d55945cf09a45a434cd796f This commit was generated by merge_from_chromium.py. Change-Id: I960f74e6f58953cc7946e4da153494517d9aea1a
2014-05-01Move ECC SSL extensions to the end in OpenSSL.davidben@chromium.org
WebSphere Application Server 7.0 appears to be intolerant of an empty extension at the end. To that end, also ensure we never send an empty padding extension. BUG=363583 Review URL: https://codereview.chromium.org/241613002 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@267674 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2014-05-01Tidy up OpenSSL padding extension code.davidben@chromium.org
Add (redundant because of SSL3_RT_MAX_PLAIN_LENGTH) length check, don't pad DTLS, and move the SSL23 special case closer to the SSL23 code. BUG=none Review URL: https://codereview.chromium.org/242453005 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@267663 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-02 23:30:31 +0000