Change-Id: I568ac8da185ddbaab980757c7bf902bf829ecd03

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

Change-Id: I4484b059c935c858d96aa9d1be28b61feccbf5c7

Change-Id: I0bc9b6b486bf10ebae34b994b63cf6011afdf5e1

…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

Bug: 6168278

Change-Id: I648f9172828120df5d19a14425e9ceec92647921

…algorithms extension

From http://cvs.openssl.org/chngview?cn=22286

Bug: 6234791
Change-Id: Icbb516f14a6cd3e2c873847e7d5aa51661b0c618

Bug: 6168278
Change-Id: Icb87356462ff2219c939bfeedc6aac7f4db69af7

Bug: 6274291
Change-Id: Id0850ce39aebfc9018c0459ec3147e05506a646f

Change-Id: I39f6cfc61f484f4457bda3003e5992dfc7e20186

Bug: 6366068

Change-Id: I0b6ec75b5c2a8f082b4b0fe6db2697d24f2f9b00

Change-Id: I4fe854007f774cf7f386cd405a9d21e6ca94e7b6

Bug: 6478397
Change-Id: If231aadbeb92eba4383adf91969361102cdfad69

Change-Id: I5062011638b1d31a80c1b9713da028db0e143a50

Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/70
Bug: http://rt.openssl.org/Ticket/Display.html?id=2825#txn-34312
Bug: http://code.google.com/p/android/issues/detail?id=34212
Bug: 6883259
Change-Id: Ib5862d4f698c4b5a19a60218b2778c6988930386

…operability

* commit '9b4b062050bf9a39ae49bce7b735a3c046d7452c':
  Use OPENSSL_NO_HEARTBEATS for better wpa_supplicant interoperability

Bug: https://bugs.launchpad.net/ubuntu/+source/wpasupplicant/+bug/969343/comments/70
Bug: http://rt.openssl.org/Ticket/Display.html?id=2825#txn-34312
Bug: http://code.google.com/p/android/issues/detail?id=34212
Bug: 6883259

(cherry-picked from 9b4b062)

Change-Id: I440deb622b51fd38d575f32bf70e9f1ce990aa71

…bility"

…t interoperability"

* commit '2a9ba31461c7a3bd16f382baa2033d0141d08a8d':
  Use OPENSSL_NO_HEARTBEATS for better wpa_supplicant interoperability

…pa_supplicant interoperability"

* commit '996ad4b519bbe2e6e53c90a9c2598d92ae7bbace':
  Use OPENSSL_NO_HEARTBEATS for better wpa_supplicant interoperability

Change-Id: Ib48b7f2c4acd99329ffd52c07321da3b6bc43bbb

Bug: 6932421
Change-Id: I672e467da876501f415773ee117aa550b248212f

Bug: 6932421
Change-Id: I672e467da876501f415773ee117aa550b248212f

* commit '8c9339263a8f0919023feaf3ca4fa7b9e678a2ca':
  Retire LOCAL_NDK_VERSION.

… 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 <[email protected]>

Change-Id: Iec5ce7f11a74a3674e96057f2ce97d8ba9238464

…ypt_key for MIPS. Update import script to generate o32 .s files for MIPS."

…AES_set_decrypt_key for MIPS. Update import script to generate o32 .s files for MIPS."

* commit 'bb8694884c6c00c21c6b8c78112cf66eb9d239fe':
  [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.

…ypt_key and AES_set_decrypt_key for MIPS. Update import script to generate o32 .s files for MIPS."

* commit '123473619dc38303d91078566c656933bbe82570':
  [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.

* commit '03e9262c803c2afb7ac14a85cc4e0a111d24def9':
  Auto-generate configuration flags.

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

* commit '2b80108735eb6cce8656cfdd638aa8985d7fec62':
  Fix Clang build.

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

* commit 'c1b05eb57fadc3796aff6079d5a65e3c809aa9de':
  Move more build configuration to openssl.config

Change-Id: Ib4d2ababe8bf6876a2d41c2dcc2db881515089b9

(cherry picked from commit 32e8f93)

Change-Id: I63d341a0bd2ea502e617e6bb6aee4ad6fb72a06f

* commit '7f01ddce5984e5555cb3315289af0d18530d9c3b':
  Give unique name to host build shared libraries

Clang now is performant enough to use instead of GCC. We can later
switch on ftrapv to better deal with potential problems. Clang was
having problems with BN multiply operations, but it appears to not
affect RSA speeds anymore.

gcc:
openssl speed -elapsed rsa
                  sign    verify    sign/s verify/s
rsa  512 bits 0.000759s 0.000073s   1317.5  13621.0
rsa 1024 bits 0.004109s 0.000234s    243.4   4276.1
rsa 2048 bits 0.027652s 0.000842s     36.2   1188.3
rsa 4096 bits 0.198824s 0.003204s      5.0    312.1

clang:
openssl speed -elapsed rsa
                  sign    verify    sign/s verify/s
rsa  512 bits 0.000784s 0.000074s   1274.9  13522.6
rsa 1024 bits 0.004132s 0.000235s    242.0   4256.9
rsa 2048 bits 0.027680s 0.000851s     36.1   1175.5
rsa 4096 bits 0.198824s 0.003245s      5.0    308.2

Change-Id: Iadad4739cf925a552158463047bdf1e19f9d0e83

* commit '1cd04072fc7c86297474402859cf13c08c40d578':
  Switch compiler to clang

There appears to be a problem with the way openssl is built for static
libraries and clang currently. Revert that until it works.

Change-Id: I2650ecbfbfa2efd23a77a455f40dc05a27802cde

* commit '4768d150edb4ad27fb32161acd071356600d8d49':
  Remove clang as compiler for static versions

Clang is not in the NDK, so don't try to use it for unbundled builds.
When clang is in the NDK, we can revert this change.

Change-Id: I8afbdee24673c4af7021703b0cece2e2139d2d35

* commit 'a417d05adc329e0cda1768aed67f207bc4168998':
  Don't use clang for unbundled build target

Fixes a bug with handling TLS 1.2 and digest functions for DSA and ECDSA
keys.

Patch from Adam Langley <[email protected]>

Change-Id: I11b74472c0df16eca8de3aa36413686603814243

This change adds support for ALPN[1] in OpenSSL. ALPN is the IETF
blessed version of NPN and we'll be supporting both ALPN and NPN for
some time yet.

[1] https://tools.ietf.org/html/draft-ietf-tls-applayerprotoneg-00

Patch from Adam Langley <[email protected]>

Change-Id: I556b1ee877f398ae8b7f1d4abbaddc44611e5f51

* changes:
  Add ALPN support patch
  Add TLS 1.2 digests patch

* commit '7b972f1aa23172c4430ada7f3236fa1fd9b31756':
  Add ALPN support patch
  Add TLS 1.2 digests patch

Change-Id: I7d8b77d77979f69cbb5e63f1fcab802e9dcccfe0

Android has a custom certificate chain patch that didn't check whether
the cert_chain was already set when setting the new chain. This results
in a leak of all the X509 instances in the stack of certificates.

(cherry picked from commit bb8428f762b3632f493572c4f73957e1281ade79)

Bug: 10610037
Bug: http://code.google.com/p/android/issues/detail?id=59536
Change-Id: I885a5dd0d0bca9d1003c4e4e7f0e500bead2232f

…form/external/openssl master branch