summaryrefslogtreecommitdiff
path: root/openssl/ssl/d1_pkt.c
AgeCommit message (Collapse)Author
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
2013-03-18import_from_android.sh: Save subversion subdirectoriesdigit@chromium.org
The previous commit didn't change the files under openssl/, because the import_openssl.sh script used by import_from_android.sh removes the 'openssl' directory completely to replace it with new files. This has the unfortunate side-effect of removing all .svn subdirs, making it impossible to send the right set of changes during "svn commit". This patch modifies import_from_android.sh to save/restore the subversion directories to avoid this problem. BUG=none TBR=wtc@chromium.org, rsleevi@google.com, agl@chromium.org Review URL: https://codereview.chromium.org/12780010 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@188770 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2013-01-24Update the openssl sources to the latest Android version.digit@chromium.org
Compared to the previous version, this includes the following fixes: - Remove "small_records.patch". https://android-review.googlesource.com/#/c/49977/ - Add support for TLS channel ID. https://android-review.googlesource.com/#/c/49984/ - Remove recursive lock in X509_PUBKEY_get. https://android-review.googlesource.com/#/c/50413/ - Add x86_64 assembly files and use them. https://android-review.googlesource.com/#/c/47913/ https://android-review.googlesource.com/#/c/50401/ https://android-review.googlesource.com/#/c/50402/ This should only matter for the "linux_redux" build, and the net/tools/flip_server binary (flip_in_mem_edsm_server) which implements a host SPDY proxy. - Remove obsolete patch file fix-clang-build.patch. Review URL: https://codereview.chromium.org/12033053 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@178558 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-10-29Upstream openssl to version 1.0.1cdigit@chromium.org
This patch updates the openssl sources and corresponding build files to version 1.0.1c to match the sources currently used by the Android platform. As a reminder, Chromium itself *only* uses openssl on Android, and only to implement SSL sockets (certificate verification is performed differently using platform APIs that talk to the framework through JNI). On the other hand, net/tools/flip_server is a host tool that links directly to this openssl library, and needs to be built on all Posix systems. Please read README.chromium, which contains a detailed list of the patch's contents (i.e. where the sources come from, what patches were applied, etc). Tested: There is no way to test this patch directly in upstream Chromium at the moment, so all changes here have been tested downstream. All net_unittests pass after the patch is applied. I have also used the browser to manually navigate to various https:// sites without issues, but would appreciate any hint on ensuring this still works well. I have *manually* checked, by inspecting the sources, that the following previous patches are not needed anymore because they have been integrated into the upstream openssl source distribution: patches/empty_OPENSSL_cpuid_setup.patch patches/npn.patch patches/openssl_no_dtls1.patch patches/tls_exporter.patch The sources have been built succesfully under the following conditions: - Downstream reference build for ARM - Downstream SDK build for ARM - Downstream SDK build for x86 - Downstream Clang build for ARM - Upstream SDK build for ARM - Upstream SDK build for x86 Finally, I have tested that net/tools/flip_server still builds properly on Linux/x64 and Linux/ia32. Review URL: https://codereview.chromium.org/10911247 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@164645 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2012-01-25Upgrade chrome's OpenSSL to same version Android ships with.jnd@chromium.org
This change is basically from openssl.org with the patches applied as per patches/README in https://android.googlesource.com/platform/external/openssl, plus 3 patches for Chromium to pass compliation and tests. Please refer to b/5428019 for more details. BUG=None TEST=net_unittests Review URL: https://chromiumcodereview.appspot.com/9254031 git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@118977 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
2010-11-05Add openssl 0.9.8oagl@chromium.org
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@65201 4ff67af0-8c30-449e-8e8b-ad334ec8d88c