summaryrefslogtreecommitdiffstats
path: root/crypto/opensslconf.h
Commit message (Collapse)AuthorAgeFilesLines
* Auto-generate configuration flags.David 'Digit' Turner2013-02-201-4/+64
| | | | | | | | | | | | | | | | | | | | | | 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
* openssl-1.0.1 upgradeBrian Carlstrom2012-03-211-0/+12
| | | | | | Bug: 6168278 Change-Id: I648f9172828120df5d19a14425e9ceec92647921
* Remove SHA0 from opensslBrian Carlstrom2010-09-161-0/+6
| | | | | | | | | | | | Recent a bug was found that would have been much more obvious if not for the confusion that "sha" means "SHA-0" in openssl and "SHA" means "SHA-1" to Java programmers. Removing SHA-0 should be not be an interoperability issue, it was never really used, was apparently flawed, so like MD2 we will just remove it. Bug: 2997009 Change-Id: I630c851fb2f5f344ef7a2c62c7092843cb40818c
* enabling blowfish in opensslBrian Carlstrom2010-08-181-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Manual changes: Changing build/config to remove OPENSSL_NO_BF and no-bf openssl.config android-config.mk Add list of new files to build for blowfish patches/crypto_Android.mk Need to clean because we are changing build flags CleanSpec.mk Derived changes: Changed by import_openssl.sh based on android-config.mk change crypto/opensslconf.h include/openssl/opensslconf.h Derived from patches/crypto_Android.mk by import_openssl.sh crypto/Android.mk Newly imported files by import_openssl.sh with updated openssl.config crypto/bf/COPYRIGHT crypto/bf/asm/bf-586.pl crypto/bf/asm/bf-686.pl crypto/bf/bf_cfb64.c crypto/bf/bf_ecb.c crypto/bf/bf_enc.c crypto/bf/bf_locl.h crypto/bf/bf_ofb64.c crypto/bf/bf_pi.h crypto/bf/bf_skey.c crypto/bf/blowfish.h include/openssl/blowfish.h Bug: 1856777 Change-Id: Id984df3834fa1d935feb9910c26a082242a9a8e1
* openssl-1.0.0 upgradeBrian Carlstrom2010-04-191-44/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Upgrade to openssl-0.9.8k.Nagendra Modadugu2009-09-301-6/+35
| | | | | | The source tree (and the size of the compiled library) can be reduced further. This will be done in a future commit.
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-0/+253
|
* auto import from //depot/cupcake/@135843The Android Open Source Project2009-03-031-253/+0
|
* Initial ContributionThe Android Open Source Project2008-10-211-6/+27
|
* external/openssl 0.9.8hUpstream1970-01-121-0/+232