Upstream openssl to version 1.0.1c

Upstream openssl to version 1.0.1c

This patch updates the openssl sources and corresponding build files
to version 1.0.1c to match the sources currently used by the Android
platform.

As a reminder, Chromium itself *only* uses openssl on Android, and only
to implement SSL sockets (certificate verification is performed
differently using platform APIs that talk to the framework through JNI).

On the other hand, net/tools/flip_server is a host tool that links
directly to this openssl library, and needs to be built on all
Posix systems.

Please read README.chromium, which contains a detailed list of the
patch's contents (i.e. where the sources come from, what patches were
applied, etc).

Tested:
There is no way to test this patch directly in upstream Chromium at
the moment, so all changes here have been tested downstream. All
net_unittests pass after the patch is applied. I have also used the
browser to manually navigate to various https:// sites without issues,
but would appreciate any hint on ensuring this still works well.

I have *manually* checked, by inspecting the sources, that the following
previous patches are not needed anymore because they have been integrated
into the upstream openssl source distribution:

  patches/empty_OPENSSL_cpuid_setup.patch
  patches/npn.patch
  patches/openssl_no_dtls1.patch
  patches/tls_exporter.patch

The sources have been built succesfully under the following conditions:

  - Downstream reference build for ARM
  - Downstream SDK build for ARM
  - Downstream SDK build for x86
  - Downstream Clang build for ARM
  - Upstream SDK build for ARM
  - Upstream SDK build for x86

Finally, I have tested that net/tools/flip_server still builds
properly on Linux/x64 and Linux/ia32.
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=164645

[digit1, 2012-09-12 15:05:34]

Please note that this patch is for review and doesn't contain the content of the
openssl/ sub-directory (which contains a massive set of patched source files
from the upstream openssl project).

This is because upload.py / gcl upload cannot upload many of these files because
they are not in UTF-8 format (Rietvield or upload.py doesn't support anything
else since 6 months, converting the files locally doesn't work because the files
on the server are still in ISO-8859-1 and so will be the patch files). The plan,
agreed with maruel, who helped me debug the issue, is to add the files to the CL
just before the commit, once it has been accepted.

If you want to have a more detailed look, I can send you the complete patch
privately. I can also provide a stack of 10 git patches that were used to
generate the end result (i.e. 1/ upgrade all sources to official openssl-1.0.1c,
2/ apply Android specific patches, 3/ apply Chromium-specific patches , 4/
Update openssl.gyp, 5/ Update config/android/..., etc).

[M-A Ruel, 2012-09-12 15:10:07]

lgtm

https://chromiumcodereview.appspot.com/10911247/diff/1/patches/README
File patches/README (right):

https://chromiumcodereview.appspot.com/10911247/diff/1/patches/README#newcode3
patches/README:3: Fixup sources under the apps/ directory that are not built
under the android environment.
80 cols

[digit, 2012-09-12 15:30:34]

https://chromiumcodereview.appspot.com/10911247/diff/1/patches/README
File patches/README (right):

https://chromiumcodereview.appspot.com/10911247/diff/1/patches/README#newcode3
patches/README:3: Fixup sources under the apps/ directory that are not built
under the android environment.
This comes from the Android tree, and I prefer to keep the file unmodified for
ease of diffing.

[bulach, 2012-09-12 15:40:52]

lgtm, thanks for the detailed write up!

agl: just FYI, since you originally added this repo..

[Philippe, 2012-09-12 16:19:43]

LGTM although I'm not very familiar (yet) with openssl.

http://codereview.chromium.org/10911247/diff/1/README.chromium
File README.chromium (right):

http://codereview.chromium.org/10911247/diff/1/README.chromium#newcode45
README.chromium:45: Given that they is a very large number of files that are not
used in
Nit: s/they/there

[digit1, 2012-09-12 16:42:54]

https://chromiumcodereview.appspot.com/10911247/diff/1/README.chromium
File README.chromium (right):

https://chromiumcodereview.appspot.com/10911247/diff/1/README.chromium#newcode45
README.chromium:45: Given that they is a very large number of files that are not
used in
On 2012/09/12 16:19:43, Philippe wrote:
> Nit: s/they/there

Done. Sorry for the multiple patches, but gcl upload was failing with a weird
ssl error this time. Just my lucky day I guess.

[Ryan Sleevi, 2012-09-12 17:33:52]

LGTM, but please wait for a comment from rch.

https://chromiumcodereview.appspot.com/10911247/diff/9002/README.chromium
File README.chromium (right):

https://chromiumcodereview.appspot.com/10911247/diff/9002/README.chromium#new...
README.chromium:12: For more context, please read:
Regrettably (or conveniently, depending on your take on things), this target is
used by one piece on Linux - flip_in_mem_edsm_server in net/net.gyp, which is a
sorta-reference implementation for a SPDY service, AIUI.

+cc rch to figure out the status of that code

[digit1, 2012-09-14 09:20:40]

Hello Ryan, any comments on this?

I also noticed that Android just modified their openssl source tree, will check
the new patch and try to integrate it there.

[Ryan Hamilton, 2012-09-14 22:53:16]

https://chromiumcodereview.appspot.com/10911247/diff/9002/README.chromium
File README.chromium (right):

https://chromiumcodereview.appspot.com/10911247/diff/9002/README.chromium#new...
README.chromium:12: For more context, please read:
On 2012/09/12 17:33:52, Ryan Sleevi wrote:
> Regrettably (or conveniently, depending on your take on things), this target
is
> used by one piece on Linux - flip_in_mem_edsm_server in net/net.gyp, which is
a
> sorta-reference implementation for a SPDY service, AIUI.
> 
> +cc rch to figure out the status of that code

The flip_in_mem_edsm_server is definitely "supported".  Does this change affect
the ability to build it?  If not, I'm happy for this change to land.

[digit1, 2012-10-15 14:23:08]

Sorry for the many partial patches that were uploaded, but they were due to a
gcl bug (see crbug.com/154553). Changes in Patchset 13 compared to the first
patch:

  - Rebased on top of master (which included a similar patch to fix Clang
compilation).

  - Added x86 assembly files (from upstream Android external/openssl).

  - Updated README.chromium to explain that the library is used both
    for Chromium on Android and net/tools/flip_server/

Testing:

  - Checked that flip_in_mem_edsm server rebuilds properly on
    Linux/x86_64. However, I did not run it.

  - Checked that flip_in_mem_edsm server rebuilds properly on
    Linux/x86. It actually doesn't link on my 64-bit Ubuntu
    installation because there are no 32-bit versions of the
    required dependencies (gtk/cairo/dbus/etc... I guess this
    has a GTK2 UI).

  - Checked that Chromium builds fine with it for Android/ARM
    and Android/x86.

  - Checked that the Android/ARM net_unittests suite passes.
    Actually, only 1 test out of 2925 fails, but this is due
    to an un-implemented feature in net/base/x509_util_openssl.cc
    and doesn't depend on the openssl implementation at all
    (the function just returns true, and contains NOTIMPLEMENTED())

As usual, this doesn't include the changes of the underlying openssl/
subdirectory, because some of the original files are ISO-8859-1 encoded and make
"gcl upload" crash when trying to send the corresponding diff files.


IMPORTANT NOTE:
  I don't know anything about the required openssl configuration
  options for net/tools/flip_server. I've tried to make the
  minimal amount of changes to the piii/k8 opensslconf.h headers
  to make the library build and link with the final executable
  but that's it. If you're concerned about it, please have a look
  at the changes in these files.

[Ryan Sleevi, 2012-10-15 17:55:44]

If it builds, LGTM.

https://chromiumcodereview.appspot.com/10911247/diff/35001/patches/README
File patches/README (right):

https://chromiumcodereview.appspot.com/10911247/diff/35001/patches/README#new...
patches/README:3: Fixup sources under the apps/ directory that are not built
under the android environment.
nit: 80 char line wrap

[joth, 2012-10-15 18:23:22]

lgtm too.



On 15 October 2012 10:55, <rsleevi@chromium.org> wrote:

> If it builds, LGTM.
>
>
> https://chromiumcodereview.**appspot.com/10911247/diff/**
>
35001/patches/README<https://chromiumcodereview.appspot.com/10911247/diff/35001/patches/README>
> File patches/README (right):
>
> https://chromiumcodereview.**appspot.com/10911247/diff/**
>
35001/patches/README#newcode3<https://chromiumcodereview.appspot.com/10911247/diff/35001/patches/README#newcode3>
> patches/README:3: Fixup sources under the apps/ directory that are not
> built under the android environment.
> nit: 80 char line wrap
>
>
https://chromiumcodereview.**appspot.com/10911247/<https://chromiumcodereview...
>

[digit1, 2012-10-16 07:40:49]

https://chromiumcodereview.appspot.com/10911247/diff/35001/patches/README
File patches/README (right):

https://chromiumcodereview.appspot.com/10911247/diff/35001/patches/README#new...
patches/README:3: Fixup sources under the apps/ directory that are not built
under the android environment.
This is intentional. The file comes from the Android tree, I prefer to keep it
untouched here to make future updates easier.

[digit1, 2012-10-16 07:55:03]

When trying to "gcl commit" this (after changing the CL to contain all the
source files), I get the following error:

svn: Commit failed (details follow):
svn: Entry for
'/usr/local/google2/digit/upstream/chromium-openssl/openssl/demos/jpake' has no
URL


Anyone knows what that means?

[M-A Ruel, 2012-10-16 13:14:01]

On 2012/10/16 07:55:03, digit1 wrote:
> When trying to "gcl commit" this (after changing the CL to contain all the
> source files), I get the following error:
> 
> svn: Commit failed (details follow):
> svn: Entry for
> '/usr/local/google2/digit/upstream/chromium-openssl/openssl/demos/jpake' has
no
> URL
> 
> 
> Anyone knows what that means?

A trivial search for [svn: Commit failed has no URL] found a way to work around
subversion.

[digit1, 2012-10-17 15:17:17]

Upstream openssl to version 1.0.1c

This patch updates the openssl sources and corresponding build files
to version 1.0.1c to match the sources currently used by the Android
platform.

As a reminder, Chromium itself *only* uses openssl on Android, and only
to implement SSL sockets (certificate verification is performed
differently using platform APIs that talk to the framework through JNI).

On the other hand, net/tools/flip_server is a host tool that links
directly to this openssl library, and needs to be built on all
Posix systems.

Please read README.chromium, which contains a detailed list of the
patch's contents (i.e. where the sources come from, what patches were
applied, etc).

Tested:
There is no way to test this patch directly in upstream Chromium at
the moment, so all changes here have been tested downstream. All
net_unittests pass after the patch is applied. I have also used the
browser to manually navigate to various https:// sites without issues,
but would appreciate any hint on ensuring this still works well.

I have *manually* checked, by inspecting the sources, that the following
previous patches are not needed anymore because they have been integrated
into the upstream openssl source distribution:

  patches/empty_OPENSSL_cpuid_setup.patch
  patches/npn.patch
  patches/openssl_no_dtls1.patch
  patches/tls_exporter.patch

The sources have been built succesfully under the following conditions:

  - Downstream reference build for ARM
  - Downstream SDK build for ARM
  - Downstream SDK build for x86
  - Downstream Clang build for ARM
  - Upstream SDK build for ARM
  - Upstream SDK build for x86

Finally, I have tested that net/tools/flip_server still builds
properly on Linux/x64 and Linux/ia32.

[digit1, 2012-10-17 15:19:53]

fyi, the latest patches were only to be able to change from a read-only http
checkout to a writable svn one. Will commit now.

[agl, 2012-11-05 19:36:36]

lgtm