Merged with the latest openssl & builds against latest ndk-r8d toolchains #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Change-Id: I2a21ac2c943b468e92cbf3cf15f2aca1adba344f Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
Change-Id: I3cb6fb47f8294e5bc912e7ed073433925e9b120b
* commit 'bc0d6bd06f5fde27a35c4bce0c655ba5bfec6198': openssl: Fix build fail with binutils-gold/indirect linking
Change-Id: Ia285a3f0f7905bf4834380530d0c0eb7fdf730c6
Bug: 3201137 Change-Id: I20cd6bed7717e5982abc3734e9a6522067f2908e
Change-Id: Ie076e26ab49f1addd7a918271e85d779f47167ac
Update jsse.patch to produce RI compliant "standard names" for server authentication types passed to X509TrustManager.checkServerTrusted Change-Id: Ib5af6229a048ef9dd038a50f5baf96c3ebccb245
OpenSSL Security Advisory [16 November 2010] TLS extension parsing race condition. (UPDATED) CVE-2010-3864 http://www.openssl.org/news/secadv_20101116-2.txt Bug: 3201137 Change-Id: Ie3e38b9e02ac35eb8c782e0bcd19ce29ac457f29
Bug: 3249410 Change-Id: Iac938a7d2f17b73dcb82b031607dae96dbb35f34
* commit '1537fcb001c4f666893aa2bdeed7880e9c6a83b2': Patch for CVE-2010-3864
* commit 'bbb2e706f6d9aeb29f7119ca3edd87e9a578222a': Patch for CVE-2010-3864
Change-Id: Ifbcf5ce396d45170d04c0b6005e41f998fe04253
Can be invoked with out/host/linux-x86/bin/openssl Change-Id: I993558d1096082ef116072afa212fa2b9b873a23
Change-Id: I569445d9db75caf42f804b47d33eeb1a61be5194
Bug: 3435285 Change-Id: Ied92c240f0a3ef9b2ce9b841089c03e0b29018b8
Change-Id: Icd3bd47f0d570f85323d3888720297216daea55e
Change-Id: I90c9e978d5a987c27982562cd2373def3a256db9
Change-Id: I0c7e2612b9b79cdd49096144aad5f0009bcb3857 http://code.google.com/p/android/issues/detail?id=15356 Bug: 4074737
* commit 'f07bf9fa6a96c0039e832242569c8e6fc40c9a94': Include space for alignment in read buffer resize check
* commit '3fe4d70417eaf6ff284aee226d69bdc5e2007010': Include space for alignment in read buffer resize check
Bug: 5010576 Change-Id: Ic867a941ef51e408a5dc6d5ef4c8ff9ec3dd7f2f
1. If built with the NDK, they should link against the NDK libdl and libz. 2. Upgrade to NDK version 5, because NDKr4 lacks some functions in libdl. Change-Id: I080d102d224496c63060c58a08b1dfd1de05978c
Bug: 5261862 Change-Id: I34d2d458aa85e61b1faacb8b5f386353be679d9b
Change-Id: Ifd5d788fc49e84d66661483d7fe11612181fa320
From Valgrind: I/valgrind( 1837): ==1838== Invalid write of size 4 I/valgrind( 1837): ==1838== at 0x4E312A4: sha1_block_data_order (sha1-armv4-large.s:109) I/valgrind( 1837): ==1838== Address 0xbdd6abb8 is just below the stack ptr. To suppress, use: --workaround-gcc296-bugs=yes This is probably just a cosmetic fix to make Valgrind happy. BUG: 5505776 Change-Id: Ice2fa65ab753a7c4cb92f531179db8b200f8b2c5
Bug: 5822335 Change-Id: Iadf81526a10b072ff323730db0e1897faea7a13f
(cherry-picked from 2c082d2) Bug: 8017911 Bug: 8095088 Change-Id: I57556e120fd1f585d38739d0d6aaf02bcbe45fbd
Change-Id: Ie980c8834cf2c843858182d98d1f60c65a2a9b70
If DIR_ADD is called with multiple directories, and the target file does not exist in the first directory scanned, the DSO object will still be considered "loaded" for the next call of DSO_load(...) and cause subsequent calls to DSO_load(...) fail with the reason code of "already loaded" even though the load failed. Additionally, with multiple directories used in eng_dyn, another problem manifests because the errors pushed onto the error stack will linger even if another library is loaded successfully on subsequent calls to DSO_load(...) in the directory scanning loop. Change-Id: I4ddd24f7b39bd88663e1783f30914870a907acfa
Change-Id: I4520a7e044b1c6a1b9d09b365bc18b178826131e
Without this, one patch file was not applied properly. Change-Id: I53d3b5935c3cd633b3bade8055d1aa37c14810fc
This patch modifies import_openssl.sh to convert all untarred OpenSSL source files that are in ISO-8859-1 encoding into UTF-8. The main reason for this is that the Chromium review tool doesn't support anything else (i.e. "git cl upload" will barf with a mysterious Python exception if the uploaded diff files aren't UTF-8). This makes it easier to import the Android sources into the Chromium tree, and should have no impact on the build products. Change-Id: I43df753c41f5d9ed853a4252d7d05c5bbced98b4
This modifies import_openssl.sh to parse the configured Makefile and extract the appropriate compiler flags that were currently defined manually in android-config.mk - Modifies openssl.config to add missing configure options to ensure the final result is the same than before the patch. This also updates crypto/opensslconf.h. - The generated output is stored in build-config.mk which content directly comes from the OpenSSL Makefile. - android-config.mk is still used to define LOCAL_CFLAGS from the definitions in build-config.mk, as well as perform minimal extra filtering. - Remove the section in README.android about manually changing android-config.mk. Change-Id: I5275de69a817aa7c9880ea48e5d6a8ac1652a1e4
This contains a new Android-specific patch to fix the Chromium linux Clang builds. This updates patches/channelid.patch independently since this patch hasn't been submitted upstream yet. Change-Id: I9d9a2ca3ad8446a54db5a023571fde1bc0d276c5
This patch makes openssl.config the only place where common
and architecture-specific sources and compiler flags are listed.
Its content is processed by import_openssl.sh to generate new
build config files (Crypto-config.mk, Ssl-config.mk, Apps-config.mk)
which are themselves included by simplified Crypto.mk, Ssl.mk, Apps.mk.
+ Add a new script (check-all-builds.sh) that can rebuild six
different variants of openssl in one go. This is useful to quickly
check that a change didn't break a specific build, e.g. when
adding new patch or upgrading the OpenSSL sources.
See './check-all-builds.sh --help' for more info.
Note: Clang-based builds are currently broken, so only GCC-based
ones are activated at the moment.
Change-Id: If08c204e4dc9b081ce676bc7984d039670e115b0
Add missing sha512-armv4.S
|
@eighthave it would be great to get openssl updated if this merge make sense |
|
@n8fr8 I'm ok with merging it, but I'm not really doing anything with openssl-android at the moment, so I won't be testing it really. Our projects that depend on it are all pinned to a specific commit, so it wouldn't break those. But it might break for other people using it and I wouldn't know where to fix it. |
Change-Id: Ib4d2ababe8bf6876a2d41c2dcc2db881515089b9
Conflicts: Apps.mk Crypto.mk Ssl.mk
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.