chromium/deps/openssl.git
3 weeks ago[MIPS] Add build support for MIPS in openssl.gyp master
digit@chromium.org [Mon, 29 Apr 2013 17:31:05 +0000 (17:31 +0000)]
[MIPS] Add build support for MIPS in openssl.gyp

The gyp file missed support for MIPS arch. This caused a build break
when content shell was built for MIPS.

BUG=130022
TEST=build content shell for MIPS

Review URL: https://chromiumcodereview.appspot.com/14531003

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@197066 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

5 weeks agoOnly make OpenSSL a component for Android component builds.
yfriedman@chromium.org [Mon, 15 Apr 2013 16:44:22 +0000 (16:44 +0000)]
Only make OpenSSL a component for Android component builds.

Fixes an issue with attempted roll see on linux_clang:
http://build.chromium.org/p/tryserver.chromium/builders/linux_clang/builds/97781

BUG=158821

Review URL: https://codereview.chromium.org/13979005

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@194187 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

6 weeks agoMake openssl a component.
yfriedman@chromium.org [Wed, 10 Apr 2013 20:24:51 +0000 (20:24 +0000)]
Make openssl a component.

This is needed for the Android component build.
BUG=158821

Review URL: https://codereview.appspot.com/8246044

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@193445 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

7 weeks agoUpdate the license file path in README.chromium
digit@chromium.org [Tue, 2 Apr 2013 12:11:00 +0000 (12:11 +0000)]
Update the license file path in README.chromium

This is necessary to pass the webview_licenses.py check in the
Android automated builds.

BUG=None
R=rsleevi@chromium.org,agl@chromium.org,wtc@chromium.org

Review URL: https://chromiumcodereview.appspot.com/13304002

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@191822 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

8 weeks agoRestore the x509_hash_name_alpgorithm_change patch.
digit@chromium.org [Tue, 26 Mar 2013 07:58:08 +0000 (07:58 +0000)]
Restore the x509_hash_name_alpgorithm_change patch.

This is needed to ensure that the linux_redux build runs its unit
tests properly on Lucid build bots.

+ Remove obsolete patches/ directory that wasn't removed in previous
  CL (everything is under openssl/patches/ now).
Review URL: https://codereview.chromium.org/12459028

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@190582 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

2 months agoimport_from_android.sh: Save subversion subdirectories
digit@chromium.org [Mon, 18 Mar 2013 18:14:09 +0000 (18:14 +0000)]
import_from_android.sh: Save subversion subdirectories

The previous commit didn't change the files under openssl/,
because the import_openssl.sh script used by import_from_android.sh
removes the 'openssl' directory completely to replace it with
new files.

This has the unfortunate side-effect of removing all .svn subdirs,
making it impossible to send the right set of changes during
"svn commit".

This patch modifies import_from_android.sh to save/restore the
subversion directories to avoid this problem.

BUG=none
TBR=wtc@chromium.org, rsleevi@google.com, agl@chromium.org
Review URL: https://codereview.chromium.org/12780010

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@188770 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

2 months agoThis CL upgrades OpenSSL to 1.0.1e with a twist :-)
digit@chromium.org [Mon, 18 Mar 2013 10:46:52 +0000 (10:46 +0000)]
This CL upgrades OpenSSL to 1.0.1e with a twist :-)

It introduces a new way to completely automate the process of importing the sources from Android,
applying Chromium-specific patches, generating a 64-bit configuration header, and a gyp-specific build file.

For all details, please read README.chromium.
Review URL: https://codereview.chromium.org/12573005

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@188714 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

3 months agoFix minor linking issues for the full linux_redux build.
digit@chromium.org [Thu, 24 Jan 2013 17:13:12 +0000 (17:13 +0000)]
Fix minor linking issues for the full linux_redux build.

This fixes the full 64-bit linux_redux build. net_unittests and
flip_in_memory_edsm_server did link properly, but there was minor
issues in the content browser code. Sorry about that.
Review URL: https://codereview.chromium.org/12047077

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@178597 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

3 months agoUpdate the openssl sources to the latest Android version.
digit@chromium.org [Thu, 24 Jan 2013 10:15:07 +0000 (10:15 +0000)]
Update the openssl sources to the latest Android version.

Compared to the previous version, this includes the following fixes:

- Remove "small_records.patch".
  https://android-review.googlesource.com/#/c/49977/

- Add support for TLS channel ID.
  https://android-review.googlesource.com/#/c/49984/

- Remove recursive lock in X509_PUBKEY_get.
  https://android-review.googlesource.com/#/c/50413/

- Add x86_64 assembly files and use them.
  https://android-review.googlesource.com/#/c/47913/
  https://android-review.googlesource.com/#/c/50401/
  https://android-review.googlesource.com/#/c/50402/

  This should only matter for the "linux_redux" build, and
  the net/tools/flip_server binary (flip_in_mem_edsm_server)
  which implements a host SPDY proxy.

- Remove obsolete patch file fix-clang-build.patch.
Review URL: https://codereview.chromium.org/12033053

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@178558 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

4 months agoRemove <(library) usage from openssl.gyp.
tfarina@chromium.org [Sat, 19 Jan 2013 00:37:15 +0000 (00:37 +0000)]
Remove <(library) usage from openssl.gyp.

BUG=111541
R=thakis@chromium.org
Review URL: https://codereview.chromium.org/11938032

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@177803 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

5 months agoFix x86 linux_redux build.
digit@chromium.org [Mon, 10 Dec 2012 10:39:54 +0000 (10:39 +0000)]
Fix x86 linux_redux build.

This should have been part of the previous patch. Not sure why this
was left out. Without this, the x64 build fails with a link error due
to undefined OPENSSL_setup_cpuid function.

BUG=137071
TBR=rsleevi@chromium.org
Review URL: https://codereview.chromium.org/11494005

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@172029 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

5 months agoSmall patch to fix the "linux_redux" Chromium build.
digit@chromium.org [Fri, 7 Dec 2012 17:10:51 +0000 (17:10 +0000)]
Small patch to fix the "linux_redux" Chromium build.

Trying to DEPS roll the previous patch, which updates the
library to 1.0.1c, doesn't work for the following reason:

- third_party/libjingle is now referencing DTLSv1_client_method
  and DTLSv1_server_method, which were missing from openssl.gyp
  (this affects both Android and linux_redux builds).

- The piii/k8 configuration files didn't disable CAST5 and
  Whirlpool like the Android one, and the corresponding source
  files are missing from openssl.gyp.

- The piii config now enables inline assembly, but the
  source repository is missing the assembly source for
  the ia32 OPENSSL_setup_cpuid() function.

- The implementation source file for SHA-0 is not listed
  in openssl.gyp to match the Android build, which does
  explicitely disable this weak hash.

This patch is used to fix these issues in the most straightforward
way. It is possible to address the issues by adding missing source
files, but I'd rather do this in the upstream Android external/openssl
tree first, to minimize the differences between them.

BUG=137071
TEST=Passed net_unittests on both linux_redux and Android builds.

Review URL: https://chromiumcodereview.appspot.com/11467016

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@171794 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

6 months agoUpstream openssl to version 1.0.1c
digit@chromium.org [Mon, 29 Oct 2012 15:53:55 +0000 (15:53 +0000)]
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.
Review URL: https://codereview.chromium.org/10911247

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@164645 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

8 months agoFix warnings when building OpenSSL with clang.
agl@chromium.org [Mon, 17 Sep 2012 17:22:49 +0000 (17:22 +0000)]
Fix warnings when building OpenSSL with clang.

third_party/openssl/openssl/crypto/bio/bss_dgram.c:512:5: error: passing
'unsigned int *' to parameter of type 'socklen_t *' (aka 'int *')
converts between pointers to integer types with different sign
[-Werror,-Wpointer-sign]
&sockopt_len)) < 0 || sockopt_val < 0)
^~~~~~~~~~~~
/usr/local/google/code/chromium/src/third_party/android_tools/ndk//platforms/android-9/arch-arm/usr/include/sys/socket.h:73:63: note:
passing argument to parameter here
__socketcall int getsockopt(int, int, int, void *, socklen_t *);
^

third_party/openssl/openssl/crypto/bio/bss_dgram.c:528:5: error: passing
'unsigned int *' to parameter of type 'socklen_t *' (aka 'int *')
converts between pointers to integer types with different sign
[-Werror,-Wpointer-sign]
&sockopt_len)) < 0 || sockopt_val < 0)
^~~~~~~~~~~~

third_party/openssl/openssl/crypto/cryptlib.c:503:34: error: passing
'volatile int *' to parameter of type 'void *' discards qualifiers
[-Werror,-Wincompatible-pointer-types]
CRYPTO_THREADID_set_pointer(id, &errno);
^~~~~~
third_party/openssl/openssl/crypto/cryptlib.c:431:61: note: passing argument to
parameter 'ptr' here
void CRYPTO_THREADID_set_pointer(CRYPTO_THREADID *id, void *ptr)
^

BUG=143931

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@157142 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

9 months agoFix a typo in the license metadata for openssl
steveblock@chromium.org [Thu, 16 Aug 2012 14:21:30 +0000 (14:21 +0000)]
Fix a typo in the license metadata for openssl

BUG=138921
TBR=jnd
Review URL: https://chromiumcodereview.appspot.com/10837284

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@151890 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

9 months agoAdd 'License Android Compatible' field to openssl license metadata
steveblock@chromium.org [Tue, 14 Aug 2012 13:54:40 +0000 (13:54 +0000)]
Add 'License Android Compatible' field to openssl license metadata

See http://codereview.chromium.org/10829272

BUG=138921
Review URL: https://chromiumcodereview.appspot.com/10855081

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@151471 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

13 months agoOpenSSL: Disable specific warnings when using clang.
thakis@chromium.org [Tue, 3 Apr 2012 21:50:39 +0000 (21:50 +0000)]
OpenSSL: Disable specific warnings when using clang.

Fix disabling of all warnings when using gcc ('copts' is a noop).
Review URL: https://chromiumcodereview.appspot.com/9959115

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@130472 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

14 months agoOpenSSL: Add support for keying material exporters (RFC 5705) git-svn
hclam@chromium.org [Thu, 8 Mar 2012 19:34:45 +0000 (19:34 +0000)]
OpenSSL: Add support for keying material exporters (RFC 5705)

Review URL: http://codereview.chromium.org/9633002

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@125658 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

15 months agoAdd flag to disable DTLS on Chromium's openssl.
jnd@chromium.org [Thu, 9 Feb 2012 08:05:37 +0000 (08:05 +0000)]
Add flag to disable DTLS on Chromium's openssl.

BUG=None
TEST=SSL tests in net_unittest and unit_tests should pass

Review URL: http://codereview.chromium.org/9310106

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@121210 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

15 months agoUpgrade chrome's OpenSSL to same version Android ships with.
jnd@chromium.org [Wed, 25 Jan 2012 01:50:40 +0000 (01:50 +0000)]
Upgrade chrome's OpenSSL to same version Android ships with.

This change is basically from openssl.org with the patches applied as per patches/README in https://android.googlesource.com/platform/external/openssl, plus 3 patches for Chromium to pass compliation and tests. Please refer to b/5428019 for more details.

BUG=None
TEST=net_unittests
Review URL: https://chromiumcodereview.appspot.com/9254031

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@118977 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

19 months agoInclude POSIX systems that aren't Linux.
agl@chromium.org [Wed, 12 Oct 2011 16:38:57 +0000 (16:38 +0000)]
Include POSIX systems that aren't Linux.

http://codereview.chromium.org/8233003/

Patch-by: Robert Nagy
git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@105093 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

20 months agoIt seemed that linux_chromeos_arm bot still use openssl,
michaelbai@google.com [Tue, 20 Sep 2011 18:39:02 +0000 (18:39 +0000)]
It seemed that linux_chromeos_arm bot still use openssl,
Changed the linux logic to be same as one before issue 7920010.
Review URL: http://codereview.chromium.org/7948008

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@101988 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

20 months agoSmall refactorings on openssl.gyp.
michaelbai@google.com [Mon, 19 Sep 2011 16:06:57 +0000 (16:06 +0000)]
Small refactorings on openssl.gyp.
Adds config/android/openssl/opensslconf.h:
* Copied from android's external/openssl/include/openssl/openssl.conf
Review URL: http://codereview.chromium.org/7920010

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@101745 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

21 months agoGuard #define with #ifndef
agl@chromium.org [Wed, 27 Jul 2011 16:36:11 +0000 (16:36 +0000)]
Guard #define with #ifndef

third_party/openssl/openssl/crypto/ui/ui_openssl.c:125:1: warning:
"_POSIX_C_SOURCE" redefined
In file included from /usr/include/unistd.h:26,
                from third_party/openssl/config/piii/openssl/opensslconf.h:132,
                from third_party/openssl/openssl/e_os2.h:56,
                from third_party/openssl/openssl/crypto/ui/ui_openssl.c:118:
/usr/include/features.h:210:1: warning: this is the location of the
previous definition

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7514045

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@94299 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

22 months agoOpenSSL: include the config directory in the direct dependent settings too.
agl@chromium.org [Fri, 22 Jul 2011 13:30:11 +0000 (13:30 +0000)]
OpenSSL: include the config directory in the direct dependent settings too.

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@93618 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

22 months agoThe config should be switched based on the target_arch, not the host.
agl@chromium.org [Thu, 21 Jul 2011 14:11:59 +0000 (14:11 +0000)]
The config should be switched based on the target_arch, not the host.

Also, delete the opensslconf.h from the source tree so that it doesn't
interfere with the build depending on the order of include paths.

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@93387 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

22 months agoRemove config/k8 from include_dirs
agl@chromium.org [Thu, 21 Jul 2011 12:53:54 +0000 (12:53 +0000)]
Remove config/k8 from include_dirs

The config directory should be included depending on the platform. However, the
unconditional include of config/k8 means that 32-bit systems can get the 64-bit
config.

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@93379 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

2 years agoFormatting the readmes in deps to follow the proper format and making sure they conta...
cdn@chromium.org [Mon, 14 Mar 2011 19:29:03 +0000 (19:29 +0000)]
Formatting the readmes in deps to follow the proper format and making sure they contain Short Name and Version fields for version tracking.

BUG=None
TEST=N/A
Review URL: http://codereview.chromium.org/6624034

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@78071 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

2 years agoFix capitalization in README.chromium.
evan@chromium.org [Tue, 14 Dec 2010 22:48:23 +0000 (22:48 +0000)]
Fix capitalization in README.chromium.

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@69192 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

2 years agoChange third_party/openssl default CA certs path to match the ubuntu location (/etc...
joth@chromium.org [Thu, 9 Dec 2010 16:31:06 +0000 (16:31 +0000)]
Change third_party/openssl default CA certs path to match the ubuntu location (/etc/ssl)

Review URL: http://codereview.chromium.org/5710001

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@68738 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

2 years agoOpenSSL: remove a couple of test files from the build.
agl@chromium.org [Wed, 10 Nov 2010 22:23:59 +0000 (22:23 +0000)]
OpenSSL: remove a couple of test files from the build.

(They shouldn't have been included in the first place and were triggering
errors about multiple definitions of 'main'.)

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@65717 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

2 years agoopenssl: fix gyp typo
agl@chromium.org [Fri, 5 Nov 2010 15:10:58 +0000 (15:10 +0000)]
openssl: fix gyp typo

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@65203 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

2 years agoAdd openssl 0.9.8o
agl@chromium.org [Fri, 5 Nov 2010 14:55:34 +0000 (14:55 +0000)]
Add openssl 0.9.8o

git-svn-id: http://src.chromium.org/svn/trunk/deps/third_party/openssl@65201 4ff67af0-8c30-449e-8e8b-ad334ec8d88c