openssl.git
5 years agoShow errors on CSR verification failure.
Dr. Stephen Henson [Sun, 29 Jun 2014 12:31:57 +0000 (13:31 +0100)]
Show errors on CSR verification failure.

If CSR verify fails in ca utility print out error messages.
Otherwise some errors give misleading output: for example
if the key size exceeds the library limit.

PR#2875
(cherry picked from commit a30bdb55d1361b9926eef8127debfc2e1bb8c484)

5 years agoMake no-ssl3 no-ssl2 do more sensible things.
Dr. Stephen Henson [Sun, 29 Jun 2014 02:02:51 +0000 (03:02 +0100)]
Make no-ssl3 no-ssl2 do more sensible things.
(cherry picked from commit 7ae6a4b659facfd7ad8131238aa1d349cb3fc951)

5 years agoClarify protocols supported.
Dr. Stephen Henson [Sat, 28 Jun 2014 20:54:13 +0000 (21:54 +0100)]
Clarify protocols supported.

Update protocols supported and note that SSLv2 is effectively disabled
by default.

PR#3184
(cherry picked from commit 1b13a4f38dfc385d5e776f6b3e06c5795874cf9b)

5 years agox86_64 assembly pack: refine clang detection.
Andy Polyakov [Sat, 28 Jun 2014 15:23:21 +0000 (17:23 +0200)]
x86_64 assembly pack: refine clang detection.
(cherry picked from commit a356e488ad50ca9de3fc4955839441c5aff11ed3)

Resolved conflicts:

crypto/bn/asm/rsaz-avx2.pl

5 years agoTypo.
Dr. Stephen Henson [Sat, 28 Jun 2014 11:42:04 +0000 (12:42 +0100)]
Typo.

PR#3107
(cherry picked from commit 7c206db9280865ae4af352dbc14e9019a6c4795d)

5 years agoDon't disable state strings with no-ssl2
Dr. Stephen Henson [Fri, 27 Jun 2014 23:54:32 +0000 (00:54 +0100)]
Don't disable state strings with no-ssl2

Some state strings were erronously not compiled when no-ssl2
was set.

PR#3295
(cherry picked from commit 0518a3e19e18cfc441cab261b28441b8c8bd77bf)

5 years agoFix compilation with -DSSL_DEBUG -DTLS_DEBUG -DKSSL_DEBUG
yogesh nagarkar [Fri, 27 Jun 2014 23:40:26 +0000 (00:40 +0100)]
Fix compilation with -DSSL_DEBUG -DTLS_DEBUG -DKSSL_DEBUG

PR#3141
(cherry picked from commit d183545d4589f1e7a40190400b8b99ea3d1f7f97)

5 years agoFix typo in ideatest.c
Andreas Westfeld [Fri, 27 Jun 2014 23:04:56 +0000 (00:04 +0100)]
Fix typo in ideatest.c
(cherry picked from commit d1d4382dcb3fdcad4758ef7e7dd7b61dbf5abbfe)

5 years agoRemove redundant check.
Ken Ballou [Fri, 27 Jun 2014 22:17:47 +0000 (23:17 +0100)]
Remove redundant check.

PR#3174
(cherry picked from commit fd331c0bb9b557903dd2ce88398570a3327b5ef0)

5 years agoFix for EVP_PBE_alg_add().
Dr. Stephen Henson [Fri, 27 Jun 2014 21:56:37 +0000 (22:56 +0100)]
Fix for EVP_PBE_alg_add().

In EVP_PBE_alg_add don't use the underlying NID for the cipher
as it may have a non-standard key size.

PR#3206
(cherry picked from commit efb7caef637a1de8468ca109efd355a9d0e73a45)

5 years agox86_64 assembly pack: addendum to last clang commit.
Andy Polyakov [Tue, 24 Jun 2014 06:37:05 +0000 (08:37 +0200)]
x86_64 assembly pack: addendum to last clang commit.
(cherry picked from commit 7eb048828008f195fb6edceb8f767622694e7426)

5 years agox86_64 assembly pack: allow clang to compile AVX code.
Andy Polyakov [Tue, 24 Jun 2014 06:24:25 +0000 (08:24 +0200)]
x86_64 assembly pack: allow clang to compile AVX code.
(cherry picked from commit ac171925ab527a55fbb27872ff69af94f7ec995b)

5 years agobn/asm/rsaz-avx2.pl: fix occasional failures.
Andy Polyakov [Fri, 27 Jun 2014 20:41:58 +0000 (22:41 +0200)]
bn/asm/rsaz-avx2.pl: fix occasional failures.
(cherry picked from commit 406d4af050cff0f52c5435504186eaf03ca69698)

5 years agoTolerate critical AKID in CRLs.
Dr. Stephen Henson [Fri, 27 Jun 2014 17:49:32 +0000 (18:49 +0100)]
Tolerate critical AKID in CRLs.

PR#3014
(cherry picked from commit 11da66f8b1fbe5777fe08cc6ace9e1f2c1576a50)

5 years agoHandle IPv6 addresses in OCSP_parse_url.
Tom Greenslade [Fri, 27 Jun 2014 16:30:59 +0000 (17:30 +0100)]
Handle IPv6 addresses in OCSP_parse_url.

PR#2783
(cherry picked from commit b36f35cda964544a15d53d3fdfec9b2bab8cacb1)

5 years agoRebuild OID table.
Dr. Stephen Henson [Fri, 27 Jun 2014 15:58:41 +0000 (16:58 +0100)]
Rebuild OID table.

5 years agoFix OID encoding for one component.
Dr. Stephen Henson [Fri, 27 Jun 2014 02:17:15 +0000 (03:17 +0100)]
Fix OID encoding for one component.

OIDs with one component don't have an encoding.

PR#2556 (Bug#1)
(cherry picked from commit 95791bf94150f2e3dc96fd2462627aaf354e92e4)

5 years agoDon't advertise ECC ciphersuits in SSLv2 compatible client hello.
Tomas Mraz [Fri, 27 Jun 2014 15:49:22 +0000 (16:49 +0100)]
Don't advertise ECC ciphersuits in SSLv2 compatible client hello.

PR#3374
(cherry picked from commit 0436369fccd128cb7f6a8538d5fed1c876c437af)

5 years agoClarify docs.
Jeffrey Walton [Fri, 27 Jun 2014 15:33:06 +0000 (16:33 +0100)]
Clarify docs.

Document that the certificate passed to SSL_CTX_add_extra_chain_cert()
should not be freed by the application.

PR#3409
(cherry picked from commit 0535c2d67ca2d684087ef90be35d5fb207aab227)

5 years agoMemory leak and NULL dereference fixes.
Dr. Stephen Henson [Fri, 27 Jun 2014 02:21:10 +0000 (03:21 +0100)]
Memory leak and NULL dereference fixes.

PR#3403
(cherry picked from commit d2aea038297e0c64ca66e6844cbb37377365885e)

5 years agoRemove ancient obsolete files under pkcs7.
Dr. Stephen Henson [Thu, 26 Jun 2014 11:36:44 +0000 (12:36 +0100)]
Remove ancient obsolete files under pkcs7.
(cherry picked from commit 7be6b27aaf5ed77f13c93dc89a2c27a42082db3f)

5 years agoMake sure BN_sqr can never return a negative value.
Huzaifa Sidhpurwala [Thu, 26 Jun 2014 22:45:58 +0000 (23:45 +0100)]
Make sure BN_sqr can never return a negative value.

PR#3410
(cherry picked from commit e14e764c0d5d469da63d0819c6ffc0e1e9e7f0bb)

5 years agobn_exp.c: move check for AD*X to rsaz-avx2.pl.
Andy Polyakov [Thu, 26 Jun 2014 22:07:15 +0000 (00:07 +0200)]
bn_exp.c: move check for AD*X to rsaz-avx2.pl.

This ensures high performance is situations when assembler supports
AVX2, but not AD*X.
(cherry picked from commit f3f620e1e0fa3553116f0b3e8c8d68b070fcdb79)

Resolved conflicts:

crypto/bn/asm/rsaz-avx2.pl

5 years agoaesv8-armx.pl: rigid input verification in key setup.
Andy Polyakov [Wed, 25 Jun 2014 20:10:45 +0000 (22:10 +0200)]
aesv8-armx.pl: rigid input verification in key setup.
(cherry picked from commit 7b8c8c4d7973f17bbbee45d4718224c5853d9dc7)

5 years agoX509_check_mumble() failure is <= 0, not just 0
Viktor Dukhovni [Mon, 23 Jun 2014 00:14:53 +0000 (20:14 -0400)]
X509_check_mumble() failure is <= 0, not just 0
(cherry picked from commit a48fb0400c9c45d56144966b774998ebe37804ef)

5 years agoMore complete input validation of X509_check_mumble
Viktor Dukhovni [Mon, 23 Jun 2014 00:18:53 +0000 (20:18 -0400)]
More complete input validation of X509_check_mumble
(cherry picked from commit 29edebe95c2a51470c78c7e769c926719965eeb1)

5 years agoDrop hostlen from X509_VERIFY_PARAM_ID.
Viktor Dukhovni [Sun, 22 Jun 2014 05:35:44 +0000 (01:35 -0400)]
Drop hostlen from X509_VERIFY_PARAM_ID.

Just store NUL-terminated strings.  This works better when we add
support for multiple hostnames.
(cherry picked from commit b3012c698a086937319ed413a113ed7bec1edd1a)

5 years agoMore complete X509_check_host documentation.
Viktor Dukhovni [Sun, 22 Jun 2014 05:31:00 +0000 (01:31 -0400)]
More complete X509_check_host documentation.
(cherry picked from commit d241b804099ce28c053ba988eb5532b1a32dd51e)

5 years agoaesv8-armx.pl: inclrease interleave factor.
Andy Polyakov [Tue, 24 Jun 2014 06:08:58 +0000 (08:08 +0200)]
aesv8-armx.pl: inclrease interleave factor.

This is to compensate for higher aes* instruction latency on Cortex-A57.
(cherry picked from commit 015364baf3328b93dbed2613e59170715a2a11a6)

5 years agoARMv8 assembly pack: add Cortex performance numbers.
Andy Polyakov [Tue, 24 Jun 2014 06:06:05 +0000 (08:06 +0200)]
ARMv8 assembly pack: add Cortex performance numbers.
(cherry picked from commit 0f777aeb50b109052d41b8a55d97faecf728ea00)

5 years agoFix off-by-one errors in ssl_cipher_get_evp()
Miod Vallat [Wed, 4 Jun 2014 07:59:58 +0000 (03:59 -0400)]
Fix off-by-one errors in ssl_cipher_get_evp()

In the ssl_cipher_get_evp() function, fix off-by-one errors in index validation before accessing arrays.

Bug discovered and fixed by Miod Vallat from the OpenBSD team.

PR#3375

5 years agoRevert "Fix off-by-one errors in ssl_cipher_get_evp()"
Matt Caswell [Sun, 22 Jun 2014 22:17:40 +0000 (23:17 +0100)]
Revert "Fix off-by-one errors in ssl_cipher_get_evp()"

This reverts commit 3d86077427f93dc46b18fee706b567ec32ac232a.

Incorrect attribution.

5 years agoFixed Windows compilation failure
Matt Caswell [Mon, 26 May 2014 23:26:55 +0000 (00:26 +0100)]
Fixed Windows compilation failure

5 years agoMake sure test/tests.com exit gracefully, even when openssl.exe wasn't
Richard Levitte [Wed, 18 Jun 2014 11:41:54 +0000 (13:41 +0200)]
Make sure test/tests.com exit gracefully, even when openssl.exe wasn't
properly built.

5 years agoAdjust VMS build to Unix build. Most of all, make it so the disabled
Richard Levitte [Tue, 17 Jun 2014 13:57:04 +0000 (15:57 +0200)]
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.

5 years agoFix signed/unsigned comparisons.
Felix Laurie von Massenbach [Sun, 15 Jun 2014 10:58:33 +0000 (11:58 +0100)]
Fix signed/unsigned comparisons.
(cherry picked from commit 50cc4f7b3d64621b6062ad1f16a7630b7c730d9b)

5 years agoFix shadow declaration.
Felix Laurie von Massenbach [Sun, 15 Jun 2014 10:52:06 +0000 (11:52 +0100)]
Fix shadow declaration.
(cherry picked from commit 1f61d8b5b1bda282015236fe9860d2f6de127356)

5 years agoRemove unused DANE macros. This should be the last DANE stuff...
Richard Levitte [Tue, 17 Jun 2014 10:38:20 +0000 (12:38 +0200)]
Remove unused DANE macros.  This should be the last DANE stuff...

5 years agoDCL doesn't do well with empty lines, or lines starting with #
Richard Levitte [Mon, 16 Jun 2014 11:24:41 +0000 (13:24 +0200)]
DCL doesn't do well with empty lines, or lines starting with #

5 years agoSpaces were added in some strings for better readability. However, those spaces...
Richard Levitte [Mon, 16 Jun 2014 11:24:04 +0000 (13:24 +0200)]
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

5 years agoaesni-sha[1|256]-x86_64.pl: fix logical error and MacOS X build.
Andy Polyakov [Mon, 16 Jun 2014 08:11:45 +0000 (10:11 +0200)]
aesni-sha[1|256]-x86_64.pl: fix logical error and MacOS X build.
(cherry picked from commit 9024b84b7c9a36f75bffc5c77cc86bbe2911653e)

5 years agoEnforce _X509_CHECK_FLAG_DOT_SUBDOMAINS internal-only
Viktor Dukhovni [Sat, 14 Jun 2014 03:45:56 +0000 (23:45 -0400)]
Enforce _X509_CHECK_FLAG_DOT_SUBDOMAINS internal-only
(cherry picked from commit d435e23959f1c2cb4feadbfba9ad884c59f37db9)

5 years agoAccept CCS after sending finished.
Dr. Stephen Henson [Sat, 14 Jun 2014 21:24:08 +0000 (22:24 +0100)]
Accept CCS after sending finished.

Allow CCS after finished has been sent by client: at this point
keys have been correctly set up so it is OK to accept CCS from
server. Without this renegotiation can sometimes fail.

PR#3400
(cherry picked from commit 99cd6a91fcb0931feaebbb4832681d40a66fad41)

5 years agoevp/e_aes_cbc_sha[1|256].c: fix -DPEDANTIC build.
Andy Polyakov [Sat, 14 Jun 2014 21:15:39 +0000 (23:15 +0200)]
evp/e_aes_cbc_sha[1|256].c: fix -DPEDANTIC build.
(cherry picked from commit ce00c64df9eb78402950e179b54e7745210b04f2)

5 years agoAdjust VMS build files to the Unix ones
Richard Levitte [Sat, 14 Jun 2014 14:10:40 +0000 (16:10 +0200)]
Adjust VMS build files to the Unix ones

5 years agoMake sure that disabling the MAYLOSEDATA3 warning is only done when the
Richard Levitte [Sat, 14 Jun 2014 13:13:44 +0000 (15:13 +0200)]
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.

5 years agoUpdate the VMS tests according to the latest unixly tests.
Richard Levitte [Thu, 12 Jun 2014 14:59:47 +0000 (16:59 +0200)]
Update the VMS tests according to the latest unixly tests.
Partly provided by Zoltan Arpadffy <arpadffy@polarhome.com>

5 years agoaesni-sha256-x86_64.pl: add missing rex in shaext.
Andy Polyakov [Sat, 14 Jun 2014 14:03:06 +0000 (16:03 +0200)]
aesni-sha256-x86_64.pl: add missing rex in shaext.

PR: 3405
(cherry picked from commit 91a6bf80f8af5fcafececc443e7fbc7981af127b)

5 years agosha1-x86_64.pl: add missing rex prefix in shaext.
Andy Polyakov [Sat, 14 Jun 2014 13:26:14 +0000 (15:26 +0200)]
sha1-x86_64.pl: add missing rex prefix in shaext.

PR: 3405
(cherry picked from commit c9cf29cca22d4d724a1e772bc5fdc201b2822f1d)

5 years agoFixed incorrect return code handling in ssl3_final_finish_mac.
Matt Caswell [Tue, 10 Jun 2014 22:24:28 +0000 (23:24 +0100)]
Fixed incorrect return code handling in ssl3_final_finish_mac.
Based on an original patch by Joel Sing (OpenBSD) who also originally identified the issue.

5 years agoRevert "Fixed incorrect return code handling in ssl3_final_finish_mac"
Matt Caswell [Fri, 13 Jun 2014 14:50:28 +0000 (15:50 +0100)]
Revert "Fixed incorrect return code handling in ssl3_final_finish_mac"

This reverts commit 728bd41a159ea16a60111e7c1120ec2a005507b3.

Missing attribution.

5 years agoClient-side namecheck wildcards.
Viktor Dukhovni [Thu, 12 Jun 2014 05:56:31 +0000 (01:56 -0400)]
Client-side namecheck wildcards.

A client reference identity of ".example.com" matches a server
certificate presented identity that is any sub-domain of "example.com"
(e.g. "www.sub.example.com).

With the X509_CHECK_FLAG_SINGLE_LABEL_SUBDOMAINS flag, it matches
only direct child sub-domains (e.g. "www.sub.example.com").
(cherry picked from commit e52c52f10bb8e34aaf8f28f3e5b56939e8f6b357)

5 years agoFix off-by-one errors in ssl_cipher_get_evp()
Kurt Cancemi [Wed, 4 Jun 2014 07:59:58 +0000 (03:59 -0400)]
Fix off-by-one errors in ssl_cipher_get_evp()

In the ssl_cipher_get_evp() function, fix off-by-one errors in index validation before accessing arrays.

PR#3375

5 years agoFacilitate back-porting of AESNI and SHA modules.
Andy Polyakov [Thu, 12 Jun 2014 19:45:41 +0000 (21:45 +0200)]
Facilitate back-porting of AESNI and SHA modules.
Fix SEH and stack handling in Win64 build.
(cherry picked from commit 977f32e85241cba8be53e44dade32231e8a91718)

5 years agoAdded OPENSSL_assert check as per PR#3377 reported by Rainer Jung <rainer.jung@kippda...
Matt Caswell [Thu, 12 Jun 2014 19:38:45 +0000 (20:38 +0100)]
Added OPENSSL_assert check as per PR#3377 reported by Rainer Jung <rainer.jung@kippdata.de>

5 years agoremove some more DANE code
Dr. Stephen Henson [Thu, 12 Jun 2014 10:08:52 +0000 (11:08 +0100)]
remove some more DANE code

5 years agomake update
Dr. Stephen Henson [Thu, 12 Jun 2014 09:50:12 +0000 (10:50 +0100)]
make update

5 years agoFix Windows build.
Dr. Stephen Henson [Thu, 12 Jun 2014 09:48:24 +0000 (10:48 +0100)]
Fix Windows build.

5 years agoRemove unimplemented functions.
Dr. Stephen Henson [Thu, 12 Jun 2014 09:45:24 +0000 (10:45 +0100)]
Remove unimplemented functions.

5 years agoUpdate the VMS build according to the latest unixly build.
Richard Levitte [Thu, 12 Jun 2014 14:59:47 +0000 (16:59 +0200)]
Update the VMS build according to the latest unixly build.
Partly provided by Zoltan Arpadffy <arpadffy@polarhome.com>

5 years agoThe 1.0.2 cms-test.pl had some changes that don't quite work on VMS...
Richard Levitte [Thu, 12 Jun 2014 14:58:39 +0000 (16:58 +0200)]
The 1.0.2 cms-test.pl had some changes that don't quite work on VMS...

5 years agoBring in the 1.0.1g to 1.0.1h changes into CHANGES.
Richard Levitte [Thu, 12 Jun 2014 10:21:58 +0000 (12:21 +0200)]
Bring in the 1.0.1g to 1.0.1h changes into CHANGES.

5 years agoSmall cleanup, double entry in CHANGES.
Richard Levitte [Thu, 12 Jun 2014 10:18:13 +0000 (12:18 +0200)]
Small cleanup, double entry in CHANGES.

5 years agoEnable multi-block support by default.
Andy Polyakov [Wed, 11 Jun 2014 18:40:51 +0000 (20:40 +0200)]
Enable multi-block support by default.
(cherry picked from commit 77a27a5066e8c0975d78be635ed356749a6f16db)

5 years agoFix compilation with no-comp
Dr. Stephen Henson [Wed, 11 Jun 2014 13:31:08 +0000 (14:31 +0100)]
Fix compilation with no-comp
(cherry picked from commit 7239a09c7b5757ed8d0e9869f3e9b03c0e11f4d1)

5 years agoghash-x86_64.pl: optimize for upcoming Atom.
Andy Polyakov [Wed, 11 Jun 2014 09:34:18 +0000 (11:34 +0200)]
ghash-x86_64.pl: optimize for upcoming Atom.
(cherry picked from commit 1cf8f57b43a99275ac0938e9e230bd0434699d87)

5 years agoAdd support for Intel SHA extension.
Andy Polyakov [Wed, 11 Jun 2014 08:27:45 +0000 (10:27 +0200)]
Add support for Intel SHA extension.
(cherry picked from commit 619b94667cc7a097f6d1e2123c4f4c2c85afb8f7)

5 years agoSeparate the SCT List parser from the SCT List viewer
Rob Stradling [Mon, 12 May 2014 13:40:19 +0000 (14:40 +0100)]
Separate the SCT List parser from the SCT List viewer
(cherry picked from commit fd2309aa29e3ea00e445f03407820398962c0b94)

5 years agoFixed incorrect return code handling in ssl3_final_finish_mac
Matt Caswell [Tue, 10 Jun 2014 22:24:28 +0000 (23:24 +0100)]
Fixed incorrect return code handling in ssl3_final_finish_mac

5 years agoEngage GHASH for ARMv8.
Andy Polyakov [Fri, 6 Jun 2014 18:48:35 +0000 (20:48 +0200)]
Engage GHASH for ARMv8.
(cherry picked from commit 82741e9c8980f96e4b3bba9e54e5904bc3e385bd)

5 years agoAdd GHASH for ARMv8 Crypto Extension.
Andy Polyakov [Fri, 6 Jun 2014 18:43:02 +0000 (20:43 +0200)]
Add GHASH for ARMv8 Crypto Extension.

Result of joint effort with Ard Biesheuvel.
(cherry picked from commit 2d5a799d27d36ee0477b2e05a7aa14394e3ad4fc)

5 years agoEngage ARMv8 AES support [from HEAD].
Andy Polyakov [Tue, 10 Jun 2014 22:08:03 +0000 (00:08 +0200)]
Engage ARMv8 AES support [from HEAD].

5 years agoAdd AES module for ARMv8 Crypto Extension [from HEAD].
Andy Polyakov [Tue, 10 Jun 2014 22:06:27 +0000 (00:06 +0200)]
Add AES module for ARMv8 Crypto Extension [from HEAD].

5 years agosha[1|512]-armv8.pl: get instruction endianness right.
Andy Polyakov [Fri, 6 Jun 2014 18:50:43 +0000 (20:50 +0200)]
sha[1|512]-armv8.pl: get instruction endianness right.

Submitted by: Ard Biesheuvel.
(cherry picked from commit cd91fd7c32428c0deb503f19b8061e0980476876)

5 years agolinux-aarch64: engage SHA modules.
Andy Polyakov [Sun, 1 Jun 2014 16:03:51 +0000 (18:03 +0200)]
linux-aarch64: engage SHA modules.
(cherry picked from commit f8aab6174c217fe4764652dab926e434e7838ce8)

5 years agoAdd SHA for ARMv8.
Andy Polyakov [Sun, 1 Jun 2014 16:02:11 +0000 (18:02 +0200)]
Add SHA for ARMv8.
(cherry picked from commit ddb6b965da0087dadea5488fe11646e3777c66e1)

5 years agoAdd linux-aarch64 taget.
Andy Polyakov [Sun, 1 Jun 2014 15:21:06 +0000 (17:21 +0200)]
Add linux-aarch64 taget.

armcap.c is shared between 32- and 64-bit builds and features link-time
detection of getauxval.

Submitted by: Ard Biesheuvel.
(cherry picked from commit e8d93e342b4b7d43c73e955e81e227c514d389d9)

5 years agoaesni-mb-x86_64.pl: add Win64 SEH.
Andy Polyakov [Tue, 10 Jun 2014 21:08:06 +0000 (23:08 +0200)]
aesni-mb-x86_64.pl: add Win64 SEH.
(cherry picked from commit e2eabed110b6d88fd15ac3063cab23dcd5090b44)

5 years agoARM assembly pack: get ARMv7 instruction endianness right.
Andy Polyakov [Fri, 6 Jun 2014 19:27:18 +0000 (21:27 +0200)]
ARM assembly pack: get ARMv7 instruction endianness right.

Pointer out and suggested by: Ard Biesheuvel.
(cherry picked from commit 5dcf70a1c57c2019bfad640fe14fd4a73212860a)

5 years agoarmv4cpuid.S: switch to CNTVCT tick counter.
Andy Polyakov [Sun, 1 Jun 2014 20:32:55 +0000 (22:32 +0200)]
armv4cpuid.S: switch to CNTVCT tick counter.
(cherry picked from commit 723463282fab13a686a30779c401b98b82134a62)

5 years agosha[1|256]-armv4: harmonize with arm_arch.h.
Andy Polyakov [Sun, 1 Jun 2014 20:29:50 +0000 (22:29 +0200)]
sha[1|256]-armv4: harmonize with arm_arch.h.
(cherry picked from commit 797d24bee9523e5cac14fe82a4dad356d1ec67f9)

5 years agosha/asm/sha1-armv4-large.pl: add NEON and ARMv8 code paths.
Andy Polyakov [Sun, 4 May 2014 08:57:55 +0000 (10:57 +0200)]
sha/asm/sha1-armv4-large.pl: add NEON and ARMv8 code paths.
sha/asm/sha256-armv4.pl: add ARMv8 code path.
(cherry picked from commit 9250a30692e182957d3fe48e3e07b1824ca1453a)

5 years agocrypto/armcap.c: detect ARMv8 capabilities [in 32-bit build].
Andy Polyakov [Sun, 4 May 2014 08:55:49 +0000 (10:55 +0200)]
crypto/armcap.c: detect ARMv8 capabilities [in 32-bit build].
(cherry picked from commit 4afa9f033dd58465b4c2d119a9d8cd737edeba26)

5 years agobackport changes to ciphers(1) man page
Hubert Kario [Tue, 10 Jun 2014 11:53:12 +0000 (13:53 +0200)]
backport changes to ciphers(1) man page

Backport of patch:
add ECC strings to ciphers(1), point out difference between DH and ECDH

and backport of other other assorted fixes to this man page

 * Make a clear distinction between DH and ECDH key exchange.
 * Group all key exchange cipher suite identifiers, first DH then ECDH
 * add descriptions for all supported *DH* identifiers
 * add ECDSA authentication descriptions
 * add example showing how to disable all suites that offer no
   authentication or encryption
 * update status of static DH (it's now supported)
 * backport descriptions of AES128, AES256, AESGCM
 * backport descriptions of CAMELLIA128, CAMELLIA256
 * backport listing of standard names for ECC cipher suites
   and TLSv1.2 cipher suites
 * backport description of PSK cipher suites

5 years agoCreate test/testutil.h for unit test helper macros
Mike Bland [Sat, 7 Jun 2014 17:05:50 +0000 (13:05 -0400)]
Create test/testutil.h for unit test helper macros

Defines SETUP_TEST_FIXTURE and EXECUTE_TEST, and updates ssl/heartbeat_test.c
using these macros. SETUP_TEST_FIXTURE makes use of the new TEST_CASE_NAME
macro, defined to use __func__ or __FUNCTION__ on platforms that support those
symbols, or to use the file name and line number otherwise. This should fix
several reported build problems related to lack of C99 support.

5 years agoRemove experimental DANE code.
Dr. Stephen Henson [Fri, 6 Jun 2014 17:56:24 +0000 (18:56 +0100)]
Remove experimental DANE code.

Remove experimental DANE/dnssec code: not ready for use in an
official release yet.

5 years agoFix null pointer errors.
Dr. Stephen Henson [Tue, 10 Jun 2014 13:47:29 +0000 (14:47 +0100)]
Fix null pointer errors.

PR#3394
(cherry picked from commit 7a9d59c148b773f59a41f8697eeecf369a0974c2)

5 years agoSRP ciphersuite correction.
Dr. Stephen Henson [Mon, 9 Jun 2014 11:03:12 +0000 (12:03 +0100)]
SRP ciphersuite correction.

SRP ciphersuites do not have no authentication. They have authentication
based on SRP. Add new SRP authentication flag and cipher string.
(cherry picked from commit a86b88acc373ac1fb0ca709a5fb8a8fa74683f67)

5 years agoUpdate strength_bits for 3DES.
Dr. Stephen Henson [Mon, 9 Jun 2014 07:55:37 +0000 (08:55 +0100)]
Update strength_bits for 3DES.

Fix strength_bits to 112 for 3DES.
(cherry picked from commit 837c203719205ab19b5609b2df7151be8df05687)

5 years agoLink heartbeat_test with the static version of the libraries
Kurt Roeckx [Sat, 7 Jun 2014 11:32:23 +0000 (13:32 +0200)]
Link heartbeat_test with the static version of the libraries

It's using an internal API that that might not be available in the shared
library.

5 years agoCreate ~/.rnd with mode 0600 instead of 0666
Jakub Wilk [Sat, 7 Jun 2014 12:37:17 +0000 (14:37 +0200)]
Create ~/.rnd with mode 0600 instead of 0666

Because of a missing include <fcntl.h> we don't have O_CREATE and don't create
the file with open() using mode 0600 but fall back to using fopen() with the
default umask followed by a chmod().

Problem found by Jakub Wilk <jwilk@debian.org>.

5 years agoMake tls_session_secret_cb work with CVE-2014-0224 fix.
Dr. Stephen Henson [Sat, 7 Jun 2014 14:21:13 +0000 (15:21 +0100)]
Make tls_session_secret_cb work with CVE-2014-0224 fix.

If application uses tls_session_secret_cb for session resumption
set the CCS_OK flag.
(cherry picked from commit 953c592572e8811b7956cc09fbd8e98037068b58)

5 years agoUpdate NEWS.
Dr. Stephen Henson [Fri, 6 Jun 2014 18:05:59 +0000 (19:05 +0100)]
Update NEWS.

5 years agoFixed minor duplication in docs
Matt Caswell [Sat, 7 Jun 2014 11:30:18 +0000 (12:30 +0100)]
Fixed minor duplication in docs

6 years agoFix for CVE-2014-0195
Dr. Stephen Henson [Tue, 13 May 2014 17:48:31 +0000 (18:48 +0100)]
Fix for CVE-2014-0195

A buffer overrun attack can be triggered by sending invalid DTLS fragments
to an OpenSSL DTLS client or server. This is potentially exploitable to
run arbitrary code on a vulnerable client or server.

Fixed by adding consistency check for DTLS fragments.

Thanks to Jüri Aedla for reporting this issue.
(cherry picked from commit 1632ef744872edc2aa2a53d487d3e79c965a4ad3)

6 years agoFix for CVE-2014-0224
Dr. Stephen Henson [Fri, 16 May 2014 11:49:48 +0000 (12:49 +0100)]
Fix for CVE-2014-0224

Only accept change cipher spec when it is expected instead of at any
time. This prevents premature setting of session keys before the master
secret is determined which an attacker could use as a MITM attack.

Thanks to KIKUCHI Masashi (Lepidum Co. Ltd.) for reporting this issue
and providing the initial fix this patch is based on.
(cherry picked from commit bc8923b1ec9c467755cd86f7848c50ee8812e441)

6 years agoAdditional CVE-2014-0224 protection.
Dr. Stephen Henson [Fri, 16 May 2014 11:55:16 +0000 (12:55 +0100)]
Additional CVE-2014-0224 protection.

Return a fatal error if an attempt is made to use a zero length
master secret.
(cherry picked from commit 006cd7083f76ed5cb0d9a914857e9231ef1bc317)

6 years agoFix CVE-2014-0221
Dr. Stephen Henson [Fri, 16 May 2014 12:00:45 +0000 (13:00 +0100)]
Fix CVE-2014-0221

Unnecessary recursion when receiving a DTLS hello request can be used to
crash a DTLS client. Fixed by handling DTLS hello request without recursion.

Thanks to Imre Rad (Search-Lab Ltd.) for discovering this issue.
(cherry picked from commit d3152655d5319ce883c8e3ac4b99f8de4c59d846)

6 years agoFix CVE-2014-3470
Dr. Stephen Henson [Thu, 29 May 2014 14:00:05 +0000 (15:00 +0100)]
Fix CVE-2014-3470

Check session_cert is not NULL before dereferencing it.
(cherry picked from commit 8011cd56e39a433b1837465259a9bd24a38727fb)

6 years agoCorrected OPENSSL_NO_EC_NISTP_64_GCC_128 usage in ec_lcl.h. PR#3370
Libor Krystek [Tue, 3 Jun 2014 22:14:40 +0000 (23:14 +0100)]
Corrected OPENSSL_NO_EC_NISTP_64_GCC_128 usage in ec_lcl.h. PR#3370