| c64f6fe2be99cb3fa8e491b5bede9a217de87a4c |
06-Nov-2014 |
Kenny Root <kroot@google.com> |
Upgrade to 1.0.1j
Upgraded from archive:
cff86857507624f0ad42d922bb6f77c4f1c2b819 openssl-1.0.1j.tar.gz
(cherry picked from commit c642a4957fa6f518a02839abc38de4e1476cdfc6)
Bug: 18018599
Change-Id: I7db55f15e6c5670cc2ced1ffbc736b1b354be740
sm/aesni-x86_64.pl
|
| 3f9e6ada2c9f7183a41081263585e6a70bbd9f59 |
19-Jun-2014 |
Kenny Root <kroot@google.com> |
Update ARM assembly patch
Change-Id: I9facdfa167df5fd95a9f573045093d4e4c5dc345
sm/aes-armv4.S
sm/aes-armv4.pl
sm/aesv8-armx-64.S
sm/aesv8-armx.S
sm/aesv8-armx.pl
|
| d55031a5e797d10e7106668121d18ef5608aaed9 |
28-May-2014 |
Kenny Root <kroot@google.com> |
Add bitsliced AES for ARMv7
From commit 028bac0670c167f154438742eb4d0fbed73df209 on OpenSSL Git.
Change-Id: I8666b524dc749327c95a1643195145729cd530a0
sm/bsaes-armv7.S
sm/bsaes-armv7.pl
|
| 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
sm/vpaes-x86_64.S
sm/vpaes-x86_64.pl
|
| ff41a4bc41ae1e1391f9b05117623ff70b985983 |
07-Jan-2014 |
Kenny Root <kroot@google.com> |
Import OpenSSL 1.0.1f
Upgrade to the new OpenSSL 1.0.1f release. SHA-1 hash of file:
9ef09e97dfc9f14ac2c042f3b7e301098794fc0f openssl-1.0.1f.tar.gz
Some changes had to be made to the existing source:
Fixed the import script to work with "sh -x" for debugging problems.
Update some of the files from patches/ to work with 1.0.1f, because
1.0.1f fixes have used some of the constants that were used (0x20L was
changed to 0x80L and 0x40L was changed to 0x100L).
Delete the "Makefile.save" files that are newly present in the
OpenSSL 1.0.1f release tarball.
Change-Id: Ib0f13b91e863157da23ec1d736ff2d788897d9f1
sm/aes-parisc.pl
sm/bsaes-x86_64.S
sm/bsaes-x86_64.pl
|
| 1762a559ef393f9c15300398433598989033385f |
19-Feb-2013 |
David 'Digit' Turner <digit@android.com> |
Convert ISO-8859-1 files to UTF-8.
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
sm/aes-586.pl
|
| 04ef91b390dfcc6125913e2f2af502d23d7a5112 |
05-Feb-2013 |
Brian Carlstrom <bdc@google.com> |
openssl-1.0.1d upgrade
Change-Id: Ie980c8834cf2c843858182d98d1f60c65a2a9b70
sm/aes-s390x.pl
sm/aes-x86_64.pl
sm/aesni-sha1-x86_64.pl
sm/aesni-x86_64.pl
sm/bsaes-x86_64.pl
sm/vpaes-x86_64.pl
|
| 85dbb371d6ce544388360f64389b5007fe7f384b |
24-Jan-2013 |
David 'Digit' Turner <digit@android.com> |
Add another missing x86_64 assembly file generation step.
Change-Id: I357c33a297937c2e64cfa8c6e49795cd1e865544
sm/aesni-sha1-x86_64.S
|
| 20777798f5184ef65e59bb5eb91ac9e839d7afeb |
10-Dec-2012 |
David 'Digit' Turner <digit@android.com> |
Add x86_64 assembly files.
This patch modifies import_openssl.sh to also generate assembly
files for x86_64 (using the appropriate Perl scripts).
These new sources are not used by the Android build, but by the
Chromium "linux_redux" build which uses OpenSSL has its SSL engine.
Change-Id: I3d1435de17f2de10633a71b9197b6cec328e93a7
sm/aes-x86_64.S
sm/aesni-x86_64.S
sm/bsaes-x86_64.S
sm/vpaes-x86_64.S
|
| 2c4d015c2c3dbe9cf62004171e265487dfa22469 |
05-Nov-2012 |
Daniel Leung <daniel.leung@linux.intel.com> |
x86: Fix DT_TEXTREL in assembly code
Regenerate some assembly files to make them PIC friendly.
The perl script needs to be passed "-fPIC" to properly generate PIC
friendly code for x86.
The import_openssl.sh has also been updated to include -fPIC when
generating assembly files for x86.
Change-Id: Ie174b5f74cf7fcdad1339892302b8762ee43ed7c
Signed-off-by: Daniel Leung <daniel.leung@linux.intel.com>
sm/aes-586.S
|
| 9838b9f4b038825b061a6b323842f9d23729eac0 |
05-Oct-2012 |
David 'Digit' Turner <digit@google.com> |
Rename assembly files with .S extensions.
The openssl files were generated with an .s extension,
which tells GCC that they normally don't need to be sent
to the pre-processor (i.e. they are passed directly to the
assembler).
Unfortunately, all these files _do_ need to be preprocessed,
which is why 'LOCAL_AS_CFLAGS := -x assembler-with-cpp' was
required in Crypto.mk.
As simpler way to solve the issue is simply to use an .S
extension when generating the assembly files. GCC knows
that these must be pre-processed first.
So the patch does:
- Rename all .s files to .S
- Remove the use of -x assembler-with-cpp from Crypto.mk
- Modify import_openssl.sh to directly generate .S files
(tested)
Context: This makes it easier to reuse the exact same sources
for Chrome on Android. Its gyp build system doesn't
have a feature comparable to LOCAL_AS_CFLAGS.
Change-Id: I708d9fbcf8d42b5c39a7d30df2b03ed79a3e62f0
sm/aes-586.S
sm/aes-586.s
sm/aes-armv4.S
sm/aes-armv4.s
sm/aes-mips.S
sm/aes-mips.s
sm/aesni-x86.S
sm/aesni-x86.s
sm/vpaes-x86.S
sm/vpaes-x86.s
|
| c58cd0fd2cebb61b0e0f200e01562c542525ef46 |
13-Sep-2012 |
Catalin Ionita <catalin.ionita@intel.com> |
Enable openssl crypto optimizations for x86 platform
Asm files attached to this patch were generated from the
current OpenSSL version.
Change-Id: I05ef67a6e34016ef94a0ef23ca264bcac805b1cc
Signed-off-by: Catalin Ionita <catalin.ionita@intel.com>
sm/aes-586.s
sm/aesni-x86.s
sm/vpaes-x86.s
|
| 2178392bec7b69d0f469bce29f653c9fbd09b614 |
02-Aug-2012 |
Chris Dearman <chris@mips.com> |
[MIPS] Append private_ to AES_set_encrypt_key and AES_set_decrypt_key for MIPS.
Update import script to generate o32 .s files for MIPS.
Release 1.0.1 of openssl renamed the C and assembler routines for
AES_set_encrypt_key() and AES_set_decrypt_key(), but forgot to do this in the
Mips assembler version. The following mips_private.patch fixes that
problem in the upstream source, until such time as it is fixed upstream.
The upstream version of openssl builds for a "n32" Mips abi used on SGI
workstations. Android's import_openssl.sh script is now modified to
build for the "o32" abi used throughout Mips Android. That change is
permanent, and will not be upstreamed.
Signed-off-by: Raghu Gandham <raghu@mips.com>
Change-Id: Iec5ce7f11a74a3674e96057f2ce97d8ba9238464
sm/aes-mips.pl
sm/aes-mips.s
|
| a1a5710c055e139ea00e785f9eb55b3af3e4dab1 |
19-Apr-2012 |
Brian Carlstrom <bdc@google.com> |
openssl-1.0.1a upgrade
Bug: 6366068
Change-Id: I0b6ec75b5c2a8f082b4b0fe6db2697d24f2f9b00
sm/aes-armv4.pl
sm/aes-armv4.s
sm/aes-s390x.pl
sm/bsaes-x86_64.pl
sm/vpaes-x86.pl
sm/vpaes-x86_64.pl
|
| 392aa7cc7d2b122614c5393c3e357da07fd07af3 |
16-Mar-2012 |
Brian Carlstrom <bdc@google.com> |
openssl-1.0.1 upgrade
Bug: 6168278
Change-Id: I648f9172828120df5d19a14425e9ceec92647921
es.h
es_core.c
es_misc.c
sm/aes-586.pl
sm/aes-armv4.pl
sm/aes-armv4.s
sm/aes-parisc.pl
sm/aes-ppc.pl
sm/aes-s390x.pl
sm/aes-x86_64.pl
sm/aesni-sha1-x86_64.pl
sm/aesni-x86.pl
sm/aesni-x86_64.pl
sm/bsaes-x86_64.pl
sm/vpaes-x86.pl
sm/vpaes-x86_64.pl
|
| 7f1d63479ce92a2a4a0874b007e49f8acb13a0d9 |
15-Mar-2012 |
Brian Carlstrom <bdc@google.com> |
am db166823: Merge "From 67b1ae72527c9e173ace98e805e8b9c090455873 Mon Sep 17 00:00:00 2001 Subject: [MIPS] MIPS assembler pack update"
* commit 'db166823303559663b1c209e14b326160519c51c':
From 67b1ae72527c9e173ace98e805e8b9c090455873 Mon Sep 17 00:00:00 2001 Subject: [MIPS] MIPS assembler pack update
|
| b83a02d94f9ba66fc5da46c2e27572674ea17931 |
21-Feb-2012 |
Petar Jovanovic <petar.jovanovic@rt-rk.com> |
From 67b1ae72527c9e173ace98e805e8b9c090455873 Mon Sep 17 00:00:00 2001
Subject: [MIPS] MIPS assembler pack update
Asm changes have been taken from http://cvs.openssl.org/chngview?cn=21708
These should discarded when the code base moves to OpenSSL 1.0.1 or above.
Additional changes have also been added to the Android make files, so it builds
correctly for MIPS architecture.
Change-Id: Ifc139e624d50510727180b03b15e15f7bbeda4d1
Signed-Off-By: Petar Jovanovic <petarj@mips.com>
sm/aes-mips.pl
sm/aes-mips.s
|
| 7d3d122363e2a85d516db314892f3d6112cb1377 |
19-Jan-2012 |
Brian Carlstrom <bdc@google.com> |
Upgrade to openssl-1.0.0g
Change-Id: I568ac8da185ddbaab980757c7bf902bf829ecd03
sm/aes-sparcv9.pl
|
| 43c12e3d4f9bbbbd4a8ba7b149686437514bc6b6 |
16-Nov-2010 |
Brian Carlstrom <bdc@google.com> |
Upgrade to openssl-1.0.0b
Bug: 3201137
Change-Id: I20cd6bed7717e5982abc3734e9a6522067f2908e
es_wrap.c
sm/aes-armv4.pl
sm/aes-armv4.s
|
| 3d3a1b8fcf46ca3bdb3d8f09acd6ef604624a30d |
18-Aug-2010 |
Brian Carlstrom <bdc@google.com> |
Upgrade to openssl-1.0.0a
- Updated README.android
- Updated openssl.version
- Ran ./import_openssl.sh import .../openssl-1.0.0a.tar.gz
(which is responsible for the rest of the changes)
Change-Id: I3214fb8cb5297d68edc7632bbd9027952fec559b
sm/aes-ppc.pl
|
| 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
es.h
es_cbc.c
es_cfb.c
es_core.c
es_ctr.c
es_ige.c
es_ofb.c
es_x86core.c
sm/aes-586.pl
sm/aes-armv4.pl
sm/aes-armv4.s
sm/aes-ppc.pl
sm/aes-s390x.pl
sm/aes-sparcv9.pl
sm/aes-x86_64.pl
|
| 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
es_cfb.c
es_x86core.c
sm/aes-armv4.pl
sm/aes-ppc.pl
sm/aes-s390x.pl
sm/aes-sparcv9.pl
sm/aes-x86_64.pl
|
| 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
es.h
es_cbc.c
es_core.c
es_x86core.c
sm/aes-586.pl
sm/aes-armv4.pl
sm/aes-ppc.pl
sm/aes-s390x.pl
sm/aes-sparcv9.pl
sm/aes-x86_64.pl
|
| 656d9c7f52f88b3a3daccafa7655dec086c4756e |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
akefile
EADME
es.h
es_cbc.c
es_cfb.c
es_core.c
es_ctr.c
es_ecb.c
es_ige.c
es_locl.h
es_misc.c
es_ofb.c
es_wrap.c
sm/aes-586.pl
sm/aes-ia64.S
sm/aes-x86_64.pl
|
| d2cbe6ee0fd4269543a9a243f2b0963ce6f46280 |
04-Mar-2009 |
The Android Open Source Project <initial-contribution@android.com> |
auto import from //depot/cupcake/@135843
akefile
EADME
es.h
es_cbc.c
es_cfb.c
es_core.c
es_ctr.c
es_ecb.c
es_ige.c
es_locl.h
es_misc.c
es_ofb.c
es_wrap.c
sm/aes-586.pl
sm/aes-ia64.S
sm/aes-x86_64.pl
|
| f48372ded3bb76c2598392aa58abe6e2eb7432d2 |
21-Oct-2008 |
The Android Open Source Project <initial-contribution@android.com> |
Initial Contribution
sm/aes-x86_64.pl
|
| bdfb8ad83da0647e9b9a32792598e8ce7ba3ef4d |
12-Jan-1970 |
Upstream <upstream-import@none> |
external/openssl 0.9.8h
akefile
EADME
es.h
es_cbc.c
es_cfb.c
es_core.c
es_ctr.c
es_ecb.c
es_ige.c
es_locl.h
es_misc.c
es_ofb.c
es_wrap.c
sm/aes-586.pl
sm/aes-ia64.S
sm/aes-x86_64.pl
|