| 7f7ea2d72f2e316ba518e82f06513e3477840c15 |
07-Apr-2014 |
Kenny Root <kroot@google.com> |
Update to OpenSSL 1.0.1g
Upgrade to the new OpenSSL 1.0.1g release. SHA-1 hash of file:
b28b3bcb1dc3ee7b55024c9f795be60eb3183e3c openssl-1.0.1g.tar.gz
Change-Id: Ie839cf2a4367afbd2919180ea4ce016b1c8d6668
ng_list.c
|
| d38060ab627bb1af09983903130c3e63cd1cab45 |
08-Feb-2013 |
Kenny Root <kroot@google.com> |
Fix failures when eng_dyn scans multiple directories
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
ng_dyn.c
|
| 392aa7cc7d2b122614c5393c3e357da07fd07af3 |
16-Mar-2012 |
Brian Carlstrom <bdc@google.com> |
openssl-1.0.1 upgrade
Bug: 6168278
Change-Id: I648f9172828120df5d19a14425e9ceec92647921
ng_all.c
ng_fat.c
ngine.h
|
| 21c841450af61d0a9119cdc863e93d019127bfe1 |
12-Mar-2012 |
Brian Carlstrom <bdc@google.com> |
Upgrade to openssl-1.0.0h
Change-Id: I0bc9b6b486bf10ebae34b994b63cf6011afdf5e1
ng_cryptodev.c
|
| c642ac3a56765a59cd8c52e608f11c2b6cf61cc5 |
08-Feb-2012 |
Kenny Root <kroot@google.com> |
Add engines back to build
The new keystore work requires OpenSSL engines to be enabled again.
This adds back the Android.mk rules, tweaks the android-config.mk to
build engine support, and adds in some essential files that were deleted
during the subsequent merges since engine support was removed
(crypto/engine/tb_asnmth.c and crypto/engine/tb_pkmeth.c)
Change-Id: I7b8190d21f50c1dd1ed12bbd0961b6e543c18ecf
b_asnmth.c
b_pkmeth.c
|
| 81c4de7869b646592127e952cda763abf8305069 |
08-Feb-2011 |
Brian Carlstrom <bdc@google.com> |
Upgrade to openssl-1.0.0d
Bug: 3435285
Change-Id: Ied92c240f0a3ef9b2ce9b841089c03e0b29018b8
ngine.h
|
| 221304ee937bc0910948a8be1320cb8cc4eb6d36 |
15-Apr-2010 |
Brian Carlstrom <bdc@google.com> |
openssl-1.0.0 upgrade
external/openssl
Updated version to 1.0.0
openssl.version
Updated small records patch for 1.0.0. This is probably the most significant change.
patches/small_records.patch
Removed bad_version.patch since fix is included in 0.9.8n and beyond
patches/README
patches/bad_version.patch
openssl.config
Changed import_openssl.sh to generate armv4 asm with the 1.0.0
scripts, not our backported 0.9.9-dev backported version in
patches/arm-asm.patch.
import_openssl.sh
openssl.config
patches/README
patches/arm-asm.patch
Added -DOPENSSL_NO_STORE to match ./Configure output
Added -DOPENSSL_NO_WHIRLPOOL (no-whrlpool) to skip new optional cipher
android-config.mk
openssl.config
Fixed import to remove include directory during import like other
imported directories (apps, ssl, crypto)
import_openssl.sh
Updated UNNEEDED_SOURCES. Pruned Makefiles which we don't use.
openssl.config
Updated to build newly required files
patches/apps_Android.mk
patches/crypto_Android.mk
Disable some new openssl tools
patches/progs.patch
Updated upgrade testing notes to include running BigInteger tests
README.android
Automatically imported
android.testssl/
apps/
crypto/
e_os.h
e_os2.h
include/
ssl/
dalvik
Change makeCipherList to skip SSLv2 ciphers that 1.0.0 now returns
so there are not duplicate ciphersuite names in getEnabledCipherSuites.
libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
Updated OpenSSLSocketImpl_cipherauthenticationmethod for new
SSL_CIPHER algorithms -> algorithm_auth (and const-ness)
libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
Update to const SSL_CIPHER in OpenSSLSessionImpl_getCipherSuite (and cipherauthenticationmethod)
libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
test_EnabledCipherSuites on both SSLSocketTest and
SSLServerSocketTest caught the makeCipherList problem. However the
asserts where a bit out of sync and didn't give good messages
because they didn't actually show what was going on. As part of
debugging the issue they found, I tried to make align the asserts
and improve their output for the future.
libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
libcore/x-net/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java
vendor/google
Add const to X509V3_EXT_METHOD* for 1.0.0 compatibility
libraries/libjingle/talk/base/openssladapter.cc
Change-Id: I90fb1566dede6034eebc96d2b0dcf4533d9643bf
akefile
ng_all.c
ng_cryptodev.c
ng_dyn.c
ng_err.c
ng_fat.c
ng_int.h
ng_lib.c
ng_list.c
ng_openssl.c
ng_padlock.c
ng_table.c
ngine.h
nginetest.c
|
| 98d58bb80c64b02a33662f0ea80351d4a1535267 |
09-Mar-2010 |
Brian Carlstrom <bdc@google.com> |
Summary: upgrading to openssl-0.9.8m and adding new testssl.sh
Testing Summary:
- Passed new android.testssl/testssl.sh
- General testing with BrowserActivity based program
Details:
Expanded detail in README.android about how to build and test openssl
upgrades based on my first experience.
modified: README.android
Significant rework of import_openssl.sh script that does most of
the work of the upgrade. Most of the existing code became the main
and import functions. The newly regenerate code helps regenerate
patch files, building on the fact that import now keeps and
original unmodified read-only source tree for use for patch
generation. Patch generation relies on additions to openssl.config
for defining which patches include which files. Note that
sometimes a file may be patched multiple times, in that case
manual review is still necessary to prune the patch after
auto-regeneration. Other enhancements to import_openssl.sh include
generating android.testssl and printing Makefile defines for
android-config.mk review.
modified: import_openssl.sh
Test support files for openssl/
Add support for building /system/bin/ssltest as test executible for
use by testssl script. Need confirmation that this is the right way
to define such a test binary.
modified: patches/ssl_Android.mk
Driver script that generates user and CA keys and certs on the
device with /system/bin/openssl before running testssl. Based on
openssl/test/testss for generation and openssl/test/Makefile
test_ssl for test execution.
new file: patches/testssl.sh
Note all following android.testssl files are automatically
imported from openssl, although possible with modifications by
import_openssl.sh
testssl script imported from openssl/test that does the bulk of
the testing. Includes new tests patched in for our additions.
new file: android.testssl/testssl
CA and user certificate configuration files from openssl.
Automatically imported from openssl/test/
new file: android.testssl/CAss.cnf
new file: android.testssl/Uss.cnf
certificate and key test file imported from openssl/apps
new file: android.testssl/server2.pem
Actual 0.9.8m upgrade specific bits
Trying to bring ngm's small records support into 0.9.8m. Needs
signoff by ngm although it does pass testing.
modified: patches/small_records.patch
Update openssl.config for 0.9.8m. Expanded lists of undeeded
directories and files for easier update and review, adding new
excludes. Also added new definitions to support "import_openssl.sh
regenerate" for patch updating.
modified: openssl.config
Updated OPENSSL_VERSION to 0.9.8m
modified: openssl.version
Automatically imported/patched files. Seems like it could be
further pruned in by openssl.config UNNEEDED_SOURCES, but extra
stuff doesn't end up impacting device.
modified: apps/...
modified: crypto/...
modified: include/...
modified: ssl/...
Other Android build stuff.
Note for these patches/... is source, .../Android.mk is derived.
Split LOCAL_CFLAGS additions into lines based on openssl/Makefile
source for easier comparison when upgrading. I knowingly left the
lines long and unwrapped for easy vdiff with openssl/Makefile
modified: android-config.mk
Removed local -DOPENSSL_NO_ECDH already in android-config.mk.
modified: patches/apps_Android.mk
Sync up with changes that had crept into derived crypto/Android.mk
modified: patches/crypto_Android.mk
Change-Id: I73204c56cdaccfc45d03a9c8088a6a93003d7ce6
akefile
ng_cnf.c
ng_cryptodev.c
ng_ctrl.c
ng_err.c
ng_table.c
ngine.h
|
| e45f106cb6b47af1f21efe76e933bdea2f5dd1ca |
30-Sep-2009 |
Nagendra Modadugu <ngm@google.com> |
Upgrade to openssl-0.9.8k.
The source tree (and the size of the compiled library)
can be reduced further. This will be done in a future
commit.
akefile
ng_all.c
ng_cnf.c
ng_err.c
ng_int.h
ng_padlock.c
ng_pkey.c
ngine.h
nginetest.c
|
| 656d9c7f52f88b3a3daccafa7655dec086c4756e |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
akefile
EADME
ng_all.c
ng_cnf.c
ng_cryptodev.c
ng_ctrl.c
ng_dyn.c
ng_err.c
ng_fat.c
ng_init.c
ng_int.h
ng_lib.c
ng_list.c
ng_openssl.c
ng_padlock.c
ng_pkey.c
ng_table.c
ngine.h
nginetest.c
b_cipher.c
b_dh.c
b_digest.c
b_dsa.c
b_ecdh.c
b_ecdsa.c
b_rand.c
b_rsa.c
b_store.c
|
| d2cbe6ee0fd4269543a9a243f2b0963ce6f46280 |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
akefile
EADME
ng_all.c
ng_cnf.c
ng_cryptodev.c
ng_ctrl.c
ng_dyn.c
ng_err.c
ng_fat.c
ng_init.c
ng_int.h
ng_lib.c
ng_list.c
ng_openssl.c
ng_padlock.c
ng_pkey.c
ng_table.c
ngine.h
nginetest.c
b_cipher.c
b_dh.c
b_digest.c
b_dsa.c
b_ecdh.c
b_ecdsa.c
b_rand.c
b_rsa.c
b_store.c
|
| bdfb8ad83da0647e9b9a32792598e8ce7ba3ef4d |
12-Jan-1970 |
Upstream <upstream-import@none> |
external/openssl 0.9.8h
akefile
EADME
ng_all.c
ng_cnf.c
ng_cryptodev.c
ng_ctrl.c
ng_dyn.c
ng_err.c
ng_fat.c
ng_init.c
ng_int.h
ng_lib.c
ng_list.c
ng_openssl.c
ng_padlock.c
ng_pkey.c
ng_table.c
ngine.h
nginetest.c
b_cipher.c
b_dh.c
b_digest.c
b_dsa.c
b_ecdh.c
b_ecdsa.c
b_rand.c
b_rsa.c
b_store.c
|