Merge tag 'upstream/1.0.2m' into tizen_4.0_base

Upstream version 1.0.2m

Change-Id: I0324687ff87ce098888b7b6918c2f8c2bb4a5e73

Imported Upstream version 1.0.2m

Fixup PIE compilation flags

Change 'fPIE' to 'fPIC' (the former causes compilation failure on some
architectures).

Change-Id: Icd5930d8bd03715d82f5315cba7ee9a8f4bc6101
Signed-off-by: Igor Kotrasinski <i.kotrasinsk@partner.samsung.com>

Add PIE flags to config

Add flags for Configure script, as it passes them down to compiler and
linker. Fixes openssl binary not building as PIE (for ASLR).

Change-Id: Iaac6de23c28809aed8d5c92e85e5ef56e12b56b1
Signed-off-by: Igor Kotrasinski <i.kotrasinsk@partner.samsung.com>

Merge tag 'upstream/1.0.2k' into tizen_base

Upstream version 1.0.2k

Change-Id: Ibb94241d3263d8efc2c93a6f485049b24aea52f6
Signed-off-by: Lukasz Pawelczyk <l.pawelczyk@samsung.com>

Imported Upstream version 1.0.2k

make debug pakcages to strip binary

Change-Id: I97248db08b47ecdcada7469fc0c16f27654aaf11
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

Add -64bit package for .NET i586 build

.NET runtime has a dependency with openssl library.
There is no toolchain for i586 build in .NET runtime,
so to build it for i586,
it needs i586 package which contains x86_64 library.

Signed-off-by: Jiyoung Yun <jy910.yun@samsung.com>
Change-Id: Ib6a6ed21006bf83c5de22bc2d88486f8115dad1b

Add license files to packaging

Change-Id: I073939ffc69ad49810129af5248d333948d9bcfe
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

Change license name from BSD-2.0 to BSD-3-Clause

Change-Id: Id9f411da1e2272abff72472440d23a7ff3a2c65b
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

Add Apache-2.0 and BSD-2.0 licenses in spec file

- BSD-2.0 : rasz_exp.h, rsaz-svx2.pl, rsaz-x86_64.pl
- Apache-2.0 : ecp_nistp224.c, ecp_nistp256.c, ecp_nistp512.c, ecp_nistputil.c,
               ecp_nistz256.c, ecp_nistz256-avx2.pl, ecp_nistz256-x86_64.pl

Change-Id: I6466e9f7a78869737b815cc2dcab2f9297511d59
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

Merge tag 'upstream/1.0.2j' into tizen_base

Change-Id: I05036caf74c3d9b0b33053458c4a9ec8640dae79
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

Imported Upstream version 1.0.2j

Change-Id: I57424e369a568144838d2a7b8e2ca3a5737adf58
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

Merge tag 'upstream/1.0.2i' into tizen_base

Change-Id: I16b1811518d680619ab815e05e75a8c83bc8d0dc
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

Imported Upstream version 1.0.2i

Change-Id: Ie36b37cac23a47c82793df31244ade44f98093fa
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

Restore rpms (openssl, mic, doc) for compatability

Change-Id: I306944c611a4c870d98ee093bfcb3a174e3f41bb
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

Cleanup packaging and spec

Clean up legacy configures which comes from opensuse project.
Newly fixed code is based on Tizen 2.4 and spec from upstream.

Change-Id: I44cc9b76855e9651cb666f2bb48d451559da3bce
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

Upgrade upstream version to 1.0.2h

no-ssl2-method option added for not adding any symbol
compare with previous version(1.0.2g) because they're already removed

Change-Id: I89185548c0a04748d93ffcd3740f940e99fefb24
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

Imported Upstream version 1.0.2h

Change-Id: Ica9a30d71f52395a402accf32110b52f46851c11
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

modify mcpu and march flag in case for mcpu=cortex-a15.cortex-a7 or march=armv7ve

Change-Id: I5cf5bae46a34aca5faf9ef049172118b41e542e6
Signed-off-by: Dongsun Lee <ds73.lee@samsung.com>

Revert "enable SSLV2 about openssl"

This reverts commit 28eaea79ada396f5eaf8c0609943e07ad4f666d5.

Change-Id: I81f0b114d56637216cbd68c55d1fa28d05988bbc

enable SSLV2 about openssl

Change-Id: I47ba88b5c8ce924e63f438f5474552337580379f
Signed-off-by: sangsu <sangsu.choi@samsung.com>

Merge branch 'upstream' into tizen_base

Change-Id: I6c175d41a528ea498db65ba5c8114f82881e5e91
Signed-off-by: sangsu <sangsu.choi@samsung.com>

Imported Upstream version 1.0.2g

Change-Id: I2b5f4248ba97b6abbe363a5da33c953e623e0a7e
Signed-off-by: sangsu <sangsu.choi@samsung.com>

Add missing license files

Change-Id: I6e9adc80f104a42722fdf0cd95a80648cdc19533
Signed-off-by: sangsu <sangsu.choi@samsung.com>

Update License in openssl.spec file

Change-Id: Iebe5bde3149fde75b16be390b30ee47cf1640061
Signed-off-by: sangsu <sangsu.choi@samsung.com>

Add no-asm option

Signal handler cannot registered on some target so SIGILL
makes crash when detecting cpu capability. To use HW capability
is dependent on individual product projects.

Change-Id: I8d96eee86601755f2aa6cd05dfb57669eb815427
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

Merge upgrade commit (v1.0.2e) into tizen_base

Change-Id: If254724f73f6f886a7991afdd4782036278484ee
Signed-off-by: sangwan.kwon <sangwan.kwon@samsung.com>

Upgrade Upstream version 1.0.2e

Change-Id: If6afd73ecd5ef4548b9389eca6e53946aac3b9f2

Imported Upstream version 1.0.2e

Change-Id: Ib2b4a8546eecf9f4d4a80d8f91b48dbf50bff173

Remove /etc/ssl/certs dir from rpm files

ca-certificates package handles all of system certificates resource

Change-Id: Ifa25a170486dbccf34902096687d2f72673b64dd
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

Move library path to default libdir

Change-Id: I70356e1ef2e74b817bd4008dc4e68473ed29d843
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

Fix diff between upstream and tizen

Change-Id: I30681b310869557c60a2d8ab3b76d999c9c2fa97
Signed-off-by: Kyungwook Tak <k.tak@samsung.com>

Upgrade upstream version to 1.0.2d

Change-Id: I68b01267078a01007964c693440489151bc8ba2f

Imported Upstream version 1.0.2d

Change-Id: I565a3e3ac5176f83139175faa2d2a11a334e8908
Signed-off-by: Yury Usishchev <y.usishchev@samsung.com>

Upgrade openssl version to 1.0.1p

Change-Id: I4adbd2d17c72f228aea1396678f1e11a67b63bdc

Imported Upstream version 1.0.1p

Change-Id: I297624cdcb5d68a3442cdf4666722e66ce7a264b

Upgrade openssl version to 1.0.1m

Conflicts:
ssl/ssl_lib.c

Change-Id: Ib400e515e742c87075578ed5e7ff82ccf4f195af
Signed-off-by: kyungwook tak <k.tak@samsung.com>

Imported Upstream version 1.0.1m

Change-Id: Ifa60e86d772dade7afe158c8899e6d36c5561bba

Upgrade openssl version to 1.0.1l

Change-Id: Ia57c845afb0e9f2eb99fdb167441ef0b6157b50c

Imported Upstream version 1.0.1l

Change-Id: I99680d38528c4117e59bb5377cc54820b22b93a2

Move openssl version from 1.0.1h to 1.0.1j
for CVE-2014-3513 CVE-2014-3567 CVE-2014-3566 (SSLv3 POODLE)
CVE-2014-3568 fixes

Change-Id: I7f10ab3e6459da4553c298c2ed26db0dc3623d0e
Signed-off-by: Janusz Kozerski <j.kozerski@samsung.com>

Move openssl version from 1.0.1g to 1.0.1h
for CVE-2014-0224, CVE-2014-0221, CVE-2014-0195,
CVE-2014-0198, CVE-2010-5298, CVE-2014-3470 fixes

Change-Id: Ifa69d7a46f9a000d0ee8cf4da86e3e1d7113cfdc
Signed-off-by: John L. Whiteman <john.l.whiteman@intel.com>

Move openssl version to 1.0.1g for CVE-2014-160 (Heartbleed)

Change-Id: Ia8dc1aada13143a27be097574f985414b998159f
Signed-off-by: Michael Demeter <michael.demeter@intel.com>

Move to OpenSSL 1.0.1e from 1.0.1c.

resetting manifest requested domain to floor

Fixed package groups

Fixed package group

Fixed package groups

enable md2

do not run tests for now

remove patches

enable md2

add packaging

Imported Upstream version 1.0.1e

Prepare for 1.0.1j release

Reviewed-by: Stephen Henson <steve@openssl.org>

Updates to NEWS

Reviewed-by: Dr Stephen Henson <steve@openssl.org>

Add updates to CHANGES file

Reviewed-by: Bodo Möller <bodo@openssl.org>

Fix no-ssl3 configuration option

CVE-2014-3568

Reviewed-by: Emilia Kasper <emilia@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>

Fix for session tickets memory leak.

CVE-2014-3567

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 5dc6070a03779cd524f0e67f76c945cb0ac38320)

Fix SRTP compile issues for windows

Related to CVE-2014-3513

This fix was developed by the OpenSSL Team

Reviewed-by: Tim Hudson <tjh@openssl.org>

Fix for SRTP Memory Leak

CVE-2014-3513

This issue was reported to OpenSSL on 26th September 2014, based on an origi
issue and patch developed by the LibreSSL project. Further analysis of the i
was performed by the OpenSSL team.

The fix was developed by the OpenSSL team.

Reviewed-by: Tim Hudson <tjh@openssl.org>

Fix SSL_R naming inconsistency.

Reviewed-by: Tim Hudson <tjh@openssl.org>

aesni-x86_64.pl: make ECB subroutine Windows ABI compliant.

RT: 3553
Reviewed-by: Emilia Kasper <emilia@openssl.org>
(cherry picked from commit 69d5747f90136aa026a96204f26ab39549dfc69b)

Add constant_time_locl.h to HEADERS,
so the Win32 compile picks it up correctly.

Reviewed-by: Richard Levitte <levitte@openssl.org>

Add the constant time test to the VMS build and tests

Reviewed-by: Tim Hudson <tjh@openssl.org>
Conflicts:
test/maketests.com
test/tests.com

Include "constant_time_locl.h" rather than "../constant_time_locl.h".
The different -I compiler parameters will take care of the rest...

Reviewed-by: Tim Hudson <tjh@openssl.org>

Spaces were added in some strings for better readability. However, those spaces do not belong in file names, so when picking out the individual parts, remove the spaces

Reviewed-by: Tim Hudson <tjh@openssl.org>

Adjust VMS build to Unix build.  Most of all, make it so the disabled
algorithms MD2 and RC5 don't get built.
Also, disable building the test apps in crypto/des and crypto/pkcs7, as
they have no support at all.

Reviewed-by: Tim Hudson <tjh@openssl.org>

Make sure test/tests.com exit gracefully, even when openssl.exe wasn't properly built.

Reviewed-by: Tim Hudson <tjh@openssl.org>

Update the VMS build according to the latest unixly build. Partly provided by Zoltan Arpadffy <arpadffy@polarhome.com>

Reviewed-by: Tim Hudson <tjh@openssl.org>

Make sure that disabling the MAYLOSEDATA3 warning is only done when the compiler supports it. Otherwise, there are warnings about it lacking everywhere, which is quite tedious to read through while trying to check for other warnings.

Reviewed-by: Tim Hudson <tjh@openssl.org>

Support TLS_FALLBACK_SCSV.

Reviewed-by: Rich Salz <rsalz@openssl.org>

Preserve digests for SNI.

SSL_set_SSL_CTX is normally called for SNI after ClientHello has
received and the digest to use for each certificate has been decided.
The original ssl->cert contains the negotiated digests and is now
copied to the new ssl->cert.

PR: 3560
Reviewed-by: Tim Hudson <tjh@openssl.org>

Removed duplicate definition of PKCS7_type_is_encrypted

Patch supplied by Matthieu Patou <mat@matws.net>, and modified to also
remove duplicate definition of PKCS7_type_is_digest.

PR#3551

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit e0fdea3e49e7454aa76bd5ecf3a3747641354c68)

Add additional DigestInfo checks.

Reencode DigestInto in DER and check against the original: this
will reject any improperly encoded DigestInfo structures.

Note: this is a precautionary measure, there is no known attack
which can exploit this.

Thanks to Brian Smith for reporting this issue.
Reviewed-by: Tim Hudson <tjh@openssl.org>

Add missing tests

Accidentally omitted from commit 455b65dfab0de51c9f67b3c909311770f2b3f801

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
(cherry picked from commit fdc35a9d3e8cf4cfd9330d5df9883f42cf5648ad)

Use correct function name: CMS_add1_signer()

Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit 5886354dcca4f8445ed35b6995a035b75409590c)

crypto/bn/bn_nist.c: work around MSC ARM compiler bug.

RT: 3541
Reviewed-by: Emilia Kasper <emilia@openssl.org>
(cherry picked from commit 8b07c005fe006044d0e4a795421447deca3c9f2c)

RT3425: constant-time evp_enc

Do the final padding check in EVP_DecryptFinal_ex in constant time to
avoid a timing leak from padding failure.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 4aac102f75b517bdb56b1bcfd0a856052d559f6e)

Conflicts:
crypto/evp/evp_enc.c

(cherry picked from commit 738911cde68b2b3706e502cf8daf5b14738f2f42)

RT3067: simplify patch

(Original commit adb46dbc6dd7347750df2468c93e8c34bcb93a4b)

Use the new constant-time methods consistently in s3_srvr.c

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
(cherry picked from commit 455b65dfab0de51c9f67b3c909311770f2b3f801)

This change alters the processing of invalid, RSA pre-master secrets so
that bad encryptions are treated like random session keys in constant
time.

(cherry picked from commit adb46dbc6dd7347750df2468c93e8c34bcb93a4b)

Reviewed-by: Rich Salz <rsalz@openssl.org>

RT3066: rewrite RSA padding checks to be slightly more constant time.

Also tweak s3_cbc.c to use new constant-time methods.
Also fix memory leaks from internal errors in RSA_padding_check_PKCS1_OAEP_mgf1

This patch is based on the original RT submission by Adam Langley <agl@chromium.org>,
as well as code from BoringSSL and OpenSSL.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Conflicts:
crypto/rsa/rsa_oaep.c

Fixed error introduced in commit f2be92b94dad3c6cbdf79d99a324804094cf1617
that fixed PR#3450 where an existing cast masked an issue when i was changed
from int to long in that commit

Picked up on z/linux (s390) where sizeof(int)!=sizeof(long)

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
(cherry picked from commit b5ff559ff90124c6fd53bbb49dae5edb4e821e0a)

RT2560: missing NULL check in ocsp_req_find_signer

If we don't find a signer in the internal list, then fall
through and look at the internal list; don't just return NULL.

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
(cherry picked from commit b2aa38a980e9fbf158aafe487fb729c492b241fb)

RT3301: Discard too-long heartbeat requests

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit af4c6e348e4bad6303e7d214cdcf2536487aabe4)

psk_client_callback, 128-byte id bug.

Fix a bug in handling of 128 byte long PSK identity in
psk_client_callback.

OpenSSL supports PSK identities of up to (and including) 128 bytes in
length. PSK identity is obtained via the psk_client_callback,
implementors of which are expected to provide a NULL-terminated
identity. However, the callback is invoked with only 128 bytes of
storage thus making it impossible to return a 128 byte long identity and
the required additional NULL byte.

This CL fixes the issue by passing in a 129 byte long buffer into the
psk_client_callback. As a safety precaution, this CL also zeroes out the
buffer before passing it into the callback, uses strnlen for obtaining
the length of the identity returned by the callback, and aborts the
handshake if the identity (without the NULL terminator) is longer than
128 bytes.

(Original patch amended to achieve strnlen in a different way.)

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit be0d851732bad7370640702bc9c4a33189ede287)

Ensure that x**0 mod 1 = 0.

(cherry picked from commit 2b0180c37fa6ffc48ee40caa831ca398b828e680)

Reviewed-by: Ben Laurie <ben@openssl.org>

Followup on RT3334 fix: make sure that a directory that's the empty
string returns 0 with errno = ENOENT.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 360928b7d0f16dde70e26841bbf9e1af727e8b8f)

RT3334: Fix crypto/LPdir_win.c

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 6a14fe7576e7a14a46ba14df8be8fe478536b4fb)

Make the inline const-time functions static.

"inline" without static is not correct as the compiler may choose to ignore it
and will then either emit an external definition, or expect one.

Reviewed-by: Geoff Thorpe <geoff@openssl.org>
(cherry picked from commit 86f50b36e63275a916b147f9d8764e3c0c060fdb)

md5-x86_64.pl: work around warning.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 4d86e8df6be69ed13abb73fd564f1f894eea0a98)

Add tags/TAGS

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 9d6253cfd3395dfe7147dae134579c6b16544c53)

RT2119,3407: Updated to dgst.pod

Re-order algorithm list.
Be consistent in command synopsis.
Add content about signing.
Add EXAMPLE section
Add some missing options: -r, -fips-fingerprint -non-fips-allow
Various other fixes.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit 6aa9dbab0f9b90060b7ee609b8c3c726ce4faf21)

RT1941: c_rehash.pod is missing

Add the file written by James Westby, graciously contributed
under the terms of the OpenSSL license.

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit cf2239b3b397174a8a6b1cc84ff68aba34ed5941)

RT2379: Bug in BIO_set_accept_port.pod

The doc says that port can be "*" to mean any port.
That's wrong.

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
(cherry picked from commit 07e3b31fae98b985d3d2aad7066144b11833f688)

Constant-time utilities

Pull constant-time methods out to a separate header, add tests.

Reviewed-by: Bodo Moeller <bodo@openssl.org>
(cherry picked from commit 9a9b0c0401cae443f115ff19921d347b20aa396b)

Conflicts:
test/Makefile

RT2400: ASN1_STRING_to_UTF8 missing initializer

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit f9fb43e176ad2a914108cd2b403425dc1ebc7262)

RT2308: Add extern "C" { ... } wrapper

Add the wrapper to all public header files (Configure
generates one).  Don't bother for those that are just
lists of #define's that do renaming.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(cherry picked from commit 089f10e69ece75ce31540501fe0898b15e898552)

Explicitly check for empty ASN.1 strings in d2i_ECPrivateKey

The old code implicitly relies on the ASN.1 code returning a \0-prefixed buffer
when the buffer length is 0. Change this to verify explicitly that the ASN.1 string
has positive length.

Reviewed-by: Dr Stephen Henson <steve@openssl.org>
(cherry picked from commit 82dc08de54ce443c2a9ac478faffe79e76157795)