chromium/deps/openssl.git
12 days agoSwitch openssl forwarding target to 'none'. master
davidben@chromium.org [Fri, 18 Jul 2014 23:13:07 +0000 (23:13 +0000)]
Switch openssl forwarding target to 'none'.

Building it as a static library causes problems on Mac at least since it's
empty.

BUG=393317

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

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

2 weeks agoRemove header files in include/openssl.
agl@chromium.org [Tue, 15 Jul 2014 00:48:22 +0000 (00:48 +0000)]
Remove header files in include/openssl.

This is needed because webrtc adds "../../openssl/openssl/include" to its
include directories explicitly rather than just using direct dependent
settings.

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

2 weeks agoOpenSSL: forward to BoringSSL.
agl@chromium.org [Mon, 14 Jul 2014 21:22:52 +0000 (21:22 +0000)]
OpenSSL: forward to BoringSSL.

This change will sit in the OpenSSL deps repo. When we switch to BoringSSL,
that patch will update DEPS to point to this revision. This avoids having to
update webrtc and libjingle repos at the same time.

The NaCl build is removed because I believe that all the pointers to it are in
the main Chromium repo and can be switched over. I'd rather get a clear build
error than linking in both OpenSSL and BoringSSL. (Also, forwarding doesn't
appear to work for NaCl targets.)

BUG=393317

https://codereview.chromium.org/383273002/

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

7 weeks agoPull in more changes from OpenSSL 1.0.1h.
agl@chromium.org [Mon, 9 Jun 2014 17:49:19 +0000 (17:49 +0000)]
Pull in more changes from OpenSSL 1.0.1h.

This change includes the following changes from OpenSSL:

a07856a08d7e8d76273e5d05099914aa335da143
"Delays the queue insertion until after the ssl3_setup_buffers() call due to use-after-free bug. PR#3362"

725c5f1ad393a7bc344348d0ec7c268aaf2700a7
"Fix use after free."
(Not a problem unless read-ahead is used, which it is not in Chrome)

bcc311668ede6ffdcd6dc5a65454a548b5404fcc
"Free up s->d1->buffered_app_data.q properly. PR#3286"

b107586c0c3447ea22dba8698ebbcd81bb29d48c
"Fixed NULL pointer dereference. See PR#3321"

d0666f289ac013094bbbf547bfbcd616199b7d2d
"evp: prevent underflow in base64 decoding. This patch resolves RT ticket #2608."

a41d5174e27c99d1caefd76a8e927c814ede509e
"Initialize num properly."

8eb094b9460575a328ba04708147c91fc267b394
"Double free in i2o_ECPublicKey. PR: 3338."

9c8dc84ac16a2f21063ae36809d202d0284ecf82
"Fix double frees."

BUG=381169

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

7 weeks agoOpenSSL: fix copy of ssl3.h
agl@chromium.org [Thu, 5 Jun 2014 15:38:16 +0000 (15:38 +0000)]
OpenSSL: fix copy of ssl3.h

Unlike upstream, the headers are not symlinks so also need to be updated.

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

7 weeks agoOpenSSL: add CVE fixes from 1.0.1h
agl@chromium.org [Thu, 5 Jun 2014 14:43:56 +0000 (14:43 +0000)]
OpenSSL: add CVE fixes from 1.0.1h

This change includes the following commits from upstream:
  8011cd56e39a433b1837465259a9bd24a38727fb
  d3152655d5319ce883c8e3ac4b99f8de4c59d846
  006cd7083f76ed5cb0d9a914857e9231ef1bc317
  bc8923b1ec9c467755cd86f7848c50ee8812e441
  1632ef744872edc2aa2a53d487d3e79c965a4ad3

These address the following CVEs:
  CVE-2014-3470
  CVE-2014-0221
  CVE-2014-0224
  CVE-2014-0195

BUG=381169

https://codereview.chromium.org/317183003/

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

2 months agoDisable the chromium_code config in the GN build on ARM.
brettw@chromium.org [Tue, 20 May 2014 23:25:47 +0000 (23:25 +0000)]
Disable the chromium_code config in the GN build on ARM.

The ARM source files do not compile cleanly without warnings.

R=rsleevi@chromium.org

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

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

2 months agoRefactor ssl3_send_client_verify.
davidben@chromium.org [Wed, 14 May 2014 16:27:52 +0000 (16:27 +0000)]
Refactor ssl3_send_client_verify.

The original logic was a confusing spaghetti and mixed up initialization for
all the different cases together. Tidy it up in preparation for having to
adjust this logic later to support asynchronous crypto operations.

BUG=none
R=agl@chromium.org

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

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

2 months agoAdd SSL_get_client_certificate_types.
davidben@chromium.org [Mon, 12 May 2014 20:21:12 +0000 (20:21 +0000)]
Add SSL_get_client_certificate_types.

Exposes the certificate_types parameter in a CertificateRequest.

BUG=165446

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

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

2 months agoNew tls channel id version for OpenSSL
haavardm@opera.com [Thu, 8 May 2014 15:48:32 +0000 (15:48 +0000)]
New tls channel id version for OpenSSL

New tls channel id version extracted from patch 0015-channelid.patch attached to http://crbug.com/366961.

BUG=366961

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

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

2 months agoRevert of New tls channel id version for OpenSSL (https://codereview.chromium.org...
haavardm@opera.com [Tue, 6 May 2014 16:58:09 +0000 (16:58 +0000)]
Revert of New tls channel id version for OpenSSL (https://codereview.chromium.org/259963009/)

Reason for revert:
I was a little quick committing this. If someone adds another OpenSSL patch and rolls OpenSSL version forward in DEPS the current channel id test will fail on Android, since tls lite has not yet been updated. I'll revert and sync commit and DEPS update with commit of TLS lite.

Original issue's description:
> New tls channel id version for OpenSSL
>
> New tls channel id version extracted from patch 0015-channelid.patch attached to http://crbug.com/366961.
>
> BUG=366961

TBR=wtc@chromium.org,rsleevi@chromium.org,agl@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=366961

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

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

2 months agoNew tls channel id version for OpenSSL
haavardm@opera.com [Tue, 6 May 2014 07:24:10 +0000 (07:24 +0000)]
New tls channel id version for OpenSSL

New tls channel id version extracted from patch 0015-channelid.patch attached to http://crbug.com/366961.

BUG=366961

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

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

2 months agoMove ECC SSL extensions to the end in OpenSSL.
davidben@chromium.org [Thu, 1 May 2014 23:51:14 +0000 (23:51 +0000)]
Move ECC SSL extensions to the end in OpenSSL.

WebSphere Application Server 7.0 appears to be intolerant of an
empty extension at the end. To that end, also ensure we never
send an empty padding extension.

BUG=363583

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

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

2 months agoTidy up OpenSSL padding extension code.
davidben@chromium.org [Thu, 1 May 2014 23:35:34 +0000 (23:35 +0000)]
Tidy up OpenSSL padding extension code.

Add (redundant because of SSL3_RT_MAX_PLAIN_LENGTH) length check,
don't pad DTLS, and move the SSL23 special case closer to the SSL23
code.

BUG=none

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

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

2 months agoFix limit checks in ssl_add_clienthello_tlsext and ssl_add_serverhello_tlsext.
davidben@chromium.org [Thu, 1 May 2014 22:05:15 +0000 (22:05 +0000)]
Fix limit checks in ssl_add_clienthello_tlsext and ssl_add_serverhello_tlsext.

Some of the limit checks reference p rather than ret. p is the original buffer
position, not the current one. Fix those and rename p to orig so it's clearer.

BUF_MEM_grow allocates 4/3 the size requested, so it doesn't overflow the
actual allocation.

BUG=none

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

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

2 months agoWhen building OpenSSL as a component build on OS X, by default export all symbols...
rsleevi@chromium.org [Thu, 1 May 2014 16:16:03 +0000 (16:16 +0000)]
When building OpenSSL as a component build on OS X, by default export all symbols (matching Linux)

BUG=none
R=davidben@chromium.org

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

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

3 months agoAdd missing comma to GN build file.
brettw@chromium.org [Mon, 28 Apr 2014 22:55:01 +0000 (22:55 +0000)]
Add missing comma to GN build file.

BUG=http://crbug.com/368019
R=rsleevi@chromium.org

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

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

3 months agoInclude the 'void' in CRYPTO_is_NEON_capable.
davidben@chromium.org [Fri, 18 Apr 2014 18:46:24 +0000 (18:46 +0000)]
Include the 'void' in CRYPTO_is_NEON_capable.

It makes util/mkerr.pl hang. Also K&R C silliness.

BUG=none
R=agl@chromium.org

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

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

3 months agoFix typo in comment in GN buildfile.
brettw@chromium.org [Fri, 11 Apr 2014 21:41:17 +0000 (21:41 +0000)]
Fix typo in comment in GN buildfile.

R=rsleevi@chromium.org

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

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

3 months agoAdd GN build file for OpenSSL.
brettw@chromium.org [Fri, 11 Apr 2014 17:58:26 +0000 (17:58 +0000)]
Add GN build file for OpenSSL.

This sluprs in the existing .gypi file to more easily keep the builds in sync.

TBR=rsleevi@chromium.org

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

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

3 months agoAdds support for compiling OpenSSL on mac.
haavardm@opera.com [Wed, 9 Apr 2014 19:24:17 +0000 (19:24 +0000)]
Adds support for compiling OpenSSL on mac.

This CL adds 32 bit OSX support with optimized assembly.

BUG=None
TEST=None

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

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

3 months agoChange TLSEXT_TYPE_padding to the IANA-assigned value 21.
wtc@chromium.org [Tue, 8 Apr 2014 21:33:12 +0000 (21:33 +0000)]
Change TLSEXT_TYPE_padding to the IANA-assigned value 21.

R=agl@chromium.org,davidben@chromium.org,rsleevi@chromium.org
BUG=361311

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

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

3 months agoFix a malformed patch file.
wtc@chromium.org [Tue, 8 Apr 2014 00:46:59 +0000 (00:46 +0000)]
Fix a malformed patch file.

R=agl@chromium.org,davidben@chromium.org,rsleevi@chromium.org

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

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

3 months agoRemove junk that got added to the last openssl diff.
davidben@chromium.org [Tue, 1 Apr 2014 22:50:02 +0000 (22:50 +0000)]
Remove junk that got added to the last openssl diff.

Accidentally did 'git svn dcommit' instead of 'git cl dcommit' for
https://src.chromium.org/viewvc/chrome?revision=260940&view=revision and that
didn't squash things correctly.

BUG=none
R=wtc@chromium.org

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

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

3 months agoFix const-correctness problem with r260918.
davidben@chromium.org [Tue, 1 Apr 2014 20:42:43 +0000 (20:42 +0000)]
Fix const-correctness problem with r260918.

https://src.chromium.org/viewvc/chrome?view=rev&revision=260918 doesn't build
with clang.

BUG=354132

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

3 months agoUpdate criteria for determining when to False Start.
davidben@chromium.org [Tue, 1 Apr 2014 19:14:44 +0000 (19:14 +0000)]
Update criteria for determining when to False Start.

NPN (or later ALPN) and a PFS cipher suite are required.

BUG=354132
R=agl@chromium.org, rsleevi@chromium.org

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

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

5 months agoAdd BUILD.gn which forwards to the GYP file.
agl@chromium.org [Thu, 27 Feb 2014 21:11:19 +0000 (21:11 +0000)]
Add BUILD.gn which forwards to the GYP file.

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

5 months agoDisable NEON Poly1305 code.
agl@chromium.org [Tue, 11 Feb 2014 22:08:43 +0000 (22:08 +0000)]
Disable NEON Poly1305 code.

See https://code.google.com/p/chromium/issues/detail?id=341598

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

5 months agoSet correct value for RC4_INT on x86_64
agl@chromium.org [Fri, 7 Feb 2014 16:09:07 +0000 (16:09 +0000)]
Set correct value for RC4_INT on x86_64

This caused caused crashes in the assembly versions of the rc4 algorithms,
especially in rc4-md5-x86_64.S.

Also take back in rc4-x86_64.S since it will now work.

BUG=none

https://codereview.chromium.org/153373003/

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

5 months agoA direct dependent of this project should also use the x64 version of
wtc@chromium.org [Wed, 5 Feb 2014 17:14:55 +0000 (17:14 +0000)]
A direct dependent of this project should also use the x64 version of
opensslconf.h when building for the x64 target.

R=agl@chromium.org,davidben@chromium.org,rsleevi@chromium.org
BUG=none
TEST=none

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

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

6 months agoCompile OpenSSL for NaCl
sergeyu@chromium.org [Fri, 10 Jan 2014 01:50:52 +0000 (01:50 +0000)]
Compile OpenSSL for NaCl

The new openssl_nacl target compiles OpenSSL for NaCl. It will be used
for chromoting client.

BUG=276739
R=agl@chromium.org, wtc@chromium.org

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

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

6 months agoOpenSSL: add support for the TLS padding extension.
agl@chromium.org [Tue, 7 Jan 2014 18:08:41 +0000 (18:08 +0000)]
OpenSSL: add support for the TLS padding extension.

This works around a bug in some versions of F5 devices that causes the
connection to hang when the ClientHello record is between 256 and 511 bytes
long.

https://tools.ietf.org/html/draft-agl-tls-padding-02

Based on the upstream patch to do the same thing:
0467ea68624450ecece4cde0d5803499aaff19c2

BUG=none

https://codereview.chromium.org/112933006

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

7 months ago#including the correct header for ssize_t.
yyanagisawa@chromium.org [Thu, 12 Dec 2013 02:06:21 +0000 (02:06 +0000)]
#including the correct header for ssize_t.

AEAD-related code could not be compiled on Mac and Windows
because the proper header file was not included and
SSIZE_MAX macro was missing.
This patch is a sort of workaround to make them compiled on Mac and Windows.

Non goal: care about all platforms that does not have ssize_t.
See the code review for details.

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

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

8 months agoOpenSSL: prefer ChaCha20 ciphersuites.
agl@chromium.org [Thu, 21 Nov 2013 16:34:44 +0000 (16:34 +0000)]
OpenSSL: prefer ChaCha20 ciphersuites.

ChaCha20 is safe and fast on all hardware, while AES-GCM is only so when using
hardware support. Google servers will be using the client's preference to
select between ChaCha20 and AES-GCM and this change makes ChaCha the top
preference on Android.

BUG=310768

https://codereview.chromium.org/76823002/

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

8 months agoAlso remove chacha_vec.c from x86.
agl@chromium.org [Mon, 18 Nov 2013 19:42:05 +0000 (19:42 +0000)]
Also remove chacha_vec.c from x86.

We don't build with SSE2 on x86 it seems.

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

8 months agoUpdate patch files and gyp from r235188.
agl@chromium.org [Thu, 14 Nov 2013 19:07:18 +0000 (19:07 +0000)]
Update patch files and gyp from r235188.

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

8 months agoDon't use poly1305_vec.c on 32-bit x86.
agl@chromium.org [Thu, 14 Nov 2013 18:20:25 +0000 (18:20 +0000)]
Don't use poly1305_vec.c on 32-bit x86.

32-bit x86 doesn't have support for int128, which poly1305_vec.c uses.

(More development via trybots.)

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

8 months agoPatch updates for r234628.
agl@chromium.org [Tue, 12 Nov 2013 21:43:50 +0000 (21:43 +0000)]
Patch updates for r234628.

This change updates the patch files to include the changes from
r234628 (NEON fixes).

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

8 months agoNEON fixes.
agl@chromium.org [Tue, 12 Nov 2013 20:40:33 +0000 (20:40 +0000)]
NEON fixes.

(Doesn't include the patch changes yet. They will be next.)

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

8 months agoUpdate patch files to reflect previous changes.
agl@chromium.org [Mon, 11 Nov 2013 20:47:29 +0000 (20:47 +0000)]
Update patch files to reflect previous changes.

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

8 months agoChange asm files to have a .S extension.
agl@chromium.org [Mon, 11 Nov 2013 19:30:08 +0000 (19:30 +0000)]
Change asm files to have a .S extension.

Development by try-server: hopefully clang dbg doesn't fail on these.

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

8 months agoAdd missing include to Poly1305 code.
agl@chromium.org [Mon, 11 Nov 2013 16:04:45 +0000 (16:04 +0000)]
Add missing include to Poly1305 code.

(More development by try-bot.)

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

8 months agoCompile the NEON asm with -fpic.
agl@chromium.org [Mon, 11 Nov 2013 15:16:10 +0000 (15:16 +0000)]
Compile the NEON asm with -fpic.

(More development by try-bot.)

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

8 months agoForcing the EABI hard-float attribute off.
agl@chromium.org [Fri, 8 Nov 2013 22:08:30 +0000 (22:08 +0000)]
Forcing the EABI hard-float attribute off.

GCC won't link chacha_vec_arm.s with the following error:
  "uses VFP register arguments, output does not".
This appears to be because the .s file specifies hard-float ABI and the rest
of the system is built with soft-float. Since the function in this .s file
doesn't take or return any floating point arguments, this change forces the
EABI flag off in the hope that it'll all work without crashing.

(I don't have a build setup, so this is development-by-buildbot.)

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

8 months agothird_party/openssl: add ChaCha20+Poly1305 support.
agl@chromium.org [Wed, 6 Nov 2013 21:17:55 +0000 (21:17 +0000)]
third_party/openssl: add ChaCha20+Poly1305 support.

This change is not as scary as it appears. Most of the code has already been
reviewed and is running in production without issues. The only new code is the
ARM support.

ARM now builds both the NEON and generic versions of the code and can enable
the NEON code at runtime by calling CRYPTO_set_NEON_capable(1). This patch does
not contain the code to call that, however.

The addition openssl/patches/channelidchromium.patch and
fix_lhash_iteration.patch is noise from the import script.

BUG=310768

https://codereview.chromium.org/59083010/

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

8 months agoFix the patch file from r233053.
agl@chromium.org [Tue, 5 Nov 2013 19:42:31 +0000 (19:42 +0000)]
Fix the patch file from r233053.

The patch file should be a patch that adds a patch, and that patch should do
the actual patching, except for openssl.config, which should be patched
directly.

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

8 months agoAdd patch file missing from r233017.
agl@chromium.org [Tue, 5 Nov 2013 19:28:17 +0000 (19:28 +0000)]
Add patch file missing from r233017.

This addition allows import_from_android.sh to be idempotent again.

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

8 months agosh implementation to avoid unwanted resizes during iteration.
digit@chromium.org [Tue, 5 Nov 2013 17:28:49 +0000 (17:28 +0000)]
sh implementation to avoid unwanted resizes during iteration.

This is a port of the following AOSP patch:
  https://android-review.googlesource.com/#/c/68853/

It fixes a bug that happens when trying to delete items from
a lhash table while it is being iterated over with a call
to lh_doall or lh_doall_arg.

It looks like the source tree is slightly out-of-sync from
the state of running ./import_from_android.sh, but the differences
are minor / not significant.

This patch tries to fix a P1 bug, so doesn't try to address this
(the differences have been removed for easier reviewing).

BUG=298606
R=agl@chromium.org,rsleevi@chromium.org,wtc@chromium.org
TBR=darin@chromium.org

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

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

9 months agothird_party/openssl: fix ChannelID patch.
agl@chromium.org [Tue, 29 Oct 2013 15:18:34 +0000 (15:18 +0000)]
third_party/openssl: fix ChannelID patch.

The old patch file was patching the sources directly, but they get replaced. The
new patch file follows the style of the other patches and adds a .patch file and
updates openssl.config.

(The changes to openssl.config.orig are noise, I believe. But, by including
them, running ./import_from_android.sh is idempotent.)

BUG=none

https://codereview.chromium.org/49053003/

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

9 months agothird_party/openssl: number patches.
agl@chromium.org [Tue, 29 Oct 2013 15:15:50 +0000 (15:15 +0000)]
third_party/openssl: number patches.

Patches generally need to be applied in a specific order. Previously, this was
purely alphabetical and one of the patch names started "z_", presumably as an
ad-hoc attempt to apply ordering.

This change renames the patches to use a specific ordering. The
import_from_android.sh script already uses ls, which will sort these names
correctly.

BUG=none

https://codereview.chromium.org/48183004/

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

9 months agothird_party/openssl: fix import_from_android.sh when using git.
agl@chromium.org [Tue, 29 Oct 2013 15:12:23 +0000 (15:12 +0000)]
third_party/openssl: fix import_from_android.sh when using git.

If there are no .svn directories then SVN fails. Using the -T flag causes it to
create an empty archive instead.

BUG=none

https://codereview.chromium.org/49253003/

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

9 months agothird_party/openssl: add OWNERS file.
agl@chromium.org [Tue, 29 Oct 2013 15:10:57 +0000 (15:10 +0000)]
third_party/openssl: add OWNERS file.

https://codereview.chromium.org/49353003/

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

9 months agoFix comment and variable name in macro definition.
qsr@chromium.org [Fri, 25 Oct 2013 07:52:01 +0000 (07:52 +0000)]
Fix comment and variable name in macro definition.

BUG=306176
R=agl@chromium.org, wtc@chromium.org

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

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

9 months agoFix code style.
qsr@chromium.org [Wed, 23 Oct 2013 07:44:09 +0000 (07:44 +0000)]
Fix code style.

TBR=agl@chromium.org
BUG=306176

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

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

9 months agoUpdate Channel ID API to use a callback.
qsr@chromium.org [Wed, 23 Oct 2013 07:40:57 +0000 (07:40 +0000)]
Update Channel ID API to use a callback.

R=agl@chromium.org, rsleevi@chromium.org

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

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

9 months agoUpdating Channel ID to allow computing the key when the server supports it.
qsr@chromium.org [Tue, 22 Oct 2013 15:11:50 +0000 (15:11 +0000)]
Updating Channel ID to allow computing the key when the server supports it.

The previous API of openssl for channel ID forces the client to set the
private key before knowing if the server supports channel ID. This
updates the API so that the client can set the private key after the
handshake started and the server confirmed it supports the protocol.

R=agl@chromium.org, digit@chromium.org

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

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

9 months agoUse C source for openssl RC4 calculation instead of ASM
yhirano@chromium.org [Tue, 22 Oct 2013 01:10:35 +0000 (01:10 +0000)]
Use C source for openssl RC4 calculation instead of ASM

Due to a problem with rc4-x86_64.S,
We use the C rc4 source instead of the ASM source.
This hurts performance, but it's not a problem because
no production code uses openssl on x86-64.

BUG=240674
R=agl@chromium.org, digit@chromium.org, rsleevi@chromium.org, wtc@chromium.org
TBR=darin

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

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

13 months agoUnder some circumstances, certain TLS connections are dropped by certain
mckev@amazon.com [Sat, 22 Jun 2013 00:20:06 +0000 (00:20 +0000)]
Under some circumstances, certain TLS connections are dropped by certain
remote servers when the TLS ClientHello record exceeds 256 bytes.

This patch changes the number of ECC formats advertised in the ClientHello
to exactly match the same formats advertised by the desktop version of
Chromium during TLS negotiation, netting a savings of approximately 50
bytes in the ClientHello record. This effectively eliminates the occurrence
of the issue.

Patch is named with a 'z' to ensure it is applied after the other patches
in the folder when import_from_android.sh is run, since that script processes
patches in alphabetical order.

R=digit@chromium.org,wtc@chromium.org
BUG:chromium:245500
TEST:
1. With V25, Visit http://campusstatebank.com
2. Enter a fictitious username and click "Submit"
3. The "processing login" page appears.
4. Nothing happens. In some cases, the logo will fail to show.
5. With the proposed patch applied, visit http://campusstatebank.com
6. Enter a fictitious username and click "Submit"
7. The "processing login" page appears.
8. The browser is redirected to a page where the password can be entered.

Contributed by mckev@amazon.com

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

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

13 months agoFix the shared_library build on Linux.
wtc@chromium.org [Sat, 1 Jun 2013 01:06:54 +0000 (01:06 +0000)]
Fix the shared_library build on Linux.

Two source files need to be excluded for x86_64 because they are
replaced by openssl/crypto/bn/asm/x86_64-gcc.c and
openssl/crypto/rc4/asm/rc4-x86_64.S.

R=yfriedman@chromium.org,digit@chromium.org
BUG=none
TEST=none

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

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

15 months ago[MIPS] Add build support for MIPS in openssl.gyp
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

15 months 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

15 months 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

15 months 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

16 months 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

16 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

16 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

18 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

18 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

18 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

19 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

19 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

21 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

22 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

23 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

23 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

2 years 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

2 years 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

2 years 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

2 years 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

2 years 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

2 years 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

2 years 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

3 years 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

3 years 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

3 years 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

3 years 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

3 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

3 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

3 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

3 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

3 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

3 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