OSDN Git Service

openssl-1.0.0 upgrade
authorBrian Carlstrom <bdc@google.com>
Thu, 15 Apr 2010 21:00:03 +0000 (14:00 -0700)
committerBrian Carlstrom <bdc@google.com>
Thu, 15 Apr 2010 22:41:45 +0000 (15:41 -0700)
commitc5668d7e55298a200f0d1de97b05e458cd118356
tree1d7d98d89867bcc1a6ae337d818cbdb01fc35d6a
parenta731357c0cadaca3863f6fd0de1b8ffb39464220
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

    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: I9e848c79772211d3956f8561ec526339b30e24a4
libcore/x-net/src/main/native/org_apache_harmony_xnet_provider_jsse_NativeCrypto.cpp
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