summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Prepare for 1.0.2e releaseOpenSSL_1_0_2eMatt Caswell2015-12-034-6/+6
| | | | Reviewed-by: Richard Levitte <[email protected]>
* make updateMatt Caswell2015-12-031-3/+4
| | | | Reviewed-by: Richard Levitte <[email protected]>
* Update CHANGES and NEWSMatt Caswell2015-12-032-1/+63
| | | | | | Update the CHANGES and NEWS files for the new release. Reviewed-by: Richard Levitte <[email protected]>
* Add test for CVE-2015-3194Dr. Stephen Henson2015-12-032-0/+28
| | | | Reviewed-by: Richard Levitte <[email protected]>
* Add PSS parameter check.Dr. Stephen Henson2015-12-031-1/+1
| | | | | | | | | | | | Avoid seg fault by checking mgf1 parameter is not NULL. This can be triggered during certificate verification so could be a DoS attack against a client or a server enabling client authentication. Thanks to Loïc Jonas Etienne (Qnective AG) for discovering this bug. CVE-2015-3194 Reviewed-by: Richard Levitte <[email protected]>
* bn/asm/x86_64-mont5.pl: fix carry propagating bug (CVE-2015-3193).Andy Polyakov2015-12-032-3/+37
| | | | | Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit e7c078db57908cbf16074c68034977565ffaf107)
* Fix leak with ASN.1 combine.Dr. Stephen Henson2015-12-031-2/+5
| | | | | | | | | | | | | | | | | When parsing a combined structure pass a flag to the decode routine so on error a pointer to the parent structure is not zeroed as this will leak any additional components in the parent. This can leak memory in any application parsing PKCS#7 or CMS structures. CVE-2015-3195. Thanks to Adam Langley (Google/BoringSSL) for discovering this bug using libFuzzer. PR#4131 Reviewed-by: Richard Levitte <[email protected]>
* Add cleanup of *.sRichard Levitte2015-12-031-1/+1
| | | | Reviewed-by: Matt Caswell <[email protected]>
* perlasm/ppc-xlate.pl: comply with ABIs that specify vrsave as reserved.Andy Polyakov2015-12-031-0/+20
| | | | | | | RT#4162 Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit b5516cfbd65de9331d827012fc5bdace1953613e)
* _BSD_SOURCE is deprecated, use _DEFAULT_SOURCE insteadRichard Levitte2015-12-021-0/+1
| | | | | | | | | The feature_test_macros(7) manual tells us that _BSD_SOURCE is deprecated since glibc 2.20 and that the compiler will warn about it being used, unless _DEFAULT_SOURCE is defined as well. Reviewed-by: Rich Salz <[email protected]> (cherry picked from commit f9fd35248c9a3b1125d9ab82ffb19d62e86533ac)
* crypto/sparcv9cap.c: add SIGILL-free feature detection for Solaris.Andy Polyakov2015-12-021-0/+47
| | | | | Reviewed-by: Rich Salz <[email protected]> (cherry picked from commit 2238e0e45d03ec9ba15e9547f7739cc6987a8f57)
* Remove cookie validation return value trickMatt Caswell2015-12-011-6/+4
| | | | | | | | | | | | In the DTLS ClientHello processing the return value is stored in |ret| which by default is -1. |ret| is only updated to a positive value once we are past all points where we could hit an error. We wish to return 1 on success or 2 on success *and* we have validated the DTLS cookie. Previously on successful validation of the cookie we were setting |ret| to -2, and then once we were past all error points we set |ret = -ret|. This is non-obvious behaviour and could be error prone. This commit tries to make this a bit more intuitive. Reviewed-by: Andy Polyakov <[email protected]>
* x86_64 assembly pack: tune clang version detection.Andy Polyakov2015-11-3013-11/+21
| | | | | | | | | | | | | RT#4142 Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit 76eba0d94bb418325be6409b272eac5e2bd4a0a9) Resolved conflicts: crypto/bn/asm/x86_64-mont.pl crypto/bn/asm/x86_64-mont5.pl Reviewed-by: Kurt Roeckx <[email protected]>
* Use both sun and __sunKurt Roeckx2015-11-242-3/+3
| | | | Reviewed-by: Andy Polyakov <[email protected]>
* mark openssl configuration as loaded at end of OPENSSL_configMarcus Meissner2015-11-241-0/+1
| | | | | | | | Signed-off-by: Kurt Roeckx <[email protected]> Reviewed-by: Rich Salz <[email protected]> GH: #466 (cherry picked from commit 434b58457c8cca4d09f77a1774d6d2c446604bae)
* ssl3_free(): Return if it wasn't createdPascal Cuoq2015-11-241-1/+1
| | | | | | | | | | | If somewhere in SSL_new() there is a memory allocation failure, ssl3_free() can get called with s->s3 still being NULL. Patch also provided by Willy Tarreau <[email protected]> Signed-off-by: Kurt Roeckx <[email protected]> Reviewed-by: Viktor Dukhovni <[email protected]> (cherry picked from commit 3e7bd2ce0b16f8611298175d6dc7cb35ee06ea6d)
* Set reference count earlierKurt Roeckx2015-11-242-2/+2
| | | | | | | | Backport of 0e04674e964b905e67e3d215bcf888932c92765f Reviewed-by: Steve Henson <[email protected]> RT #4047, #4110, MR #1356
* Fix uninitialised p error.Dr. Stephen Henson2015-11-241-1/+1
| | | | | Reviewed-by: Rich Salz <[email protected]> (cherry picked from commit 63eb10a07ee29a312e50a227f5b3a290b1ad22b4)
* Limit depth of ASN1 parse printing.Dr. Stephen Henson2015-11-241-0/+10
| | | | | | | | | | Thanks to Guido Vranken <[email protected]> for reporting this issue. Reviewed-by: Tim Hudson <[email protected]> (cherry picked from commit 158e5207a794603f5d64ffa95e0247c7808ab445) Conflicts: crypto/asn1/asn1_par.c
* Makefile.org: add LC_ALL=C to unify error [and other] messages.Andy Polyakov2015-11-231-1/+3
| | | | | | | RT#4138 Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit 193ed2d74b1a643b5f32bd46bf50a858fcdd2da4)
* Use defined(__sun) instead of defined(sun)Kurt Roeckx2015-11-222-3/+3
| | | | | | | | | | Strict ISO confirming C compilers only define __sun Reviewed-by: Viktor Dukhovni <[email protected]> RT #4144, MR #1353 (cherry picked from commit 3d32218812e87221344f2985512e42e4aaa88745)
* Add initial AppVeyor configurationAlessandro Ghedini2015-11-211-0/+60
| | | | | | | | | | Original patch by Frank Morgner. Signed-off-by: Kurt Roeckx <[email protected]> Reviewed-by: Rich Salz <[email protected]> GH: #456 (cherry picked from commit 68db80e2d1accdd4c4a6b4763559c6cfe9663820)
* Good hygiene with size_t output argument.Viktor Dukhovni2015-11-211-1/+1
| | | | | | | | | Though the callers check the function return value and ignore the size_t output argument on failure, it is still often not ideal to store -1 in a size_t on error. That might signal an unduly large buffer. Instead set the size_t to 0, to indicate no space. Reviewed-by: Richard Levitte <[email protected]>
* Ensure all EVP calls have their returns checked where appropriateMatt Caswell2015-11-2012-146/+270
| | | | | | | | There are lots of calls to EVP functions from within libssl There were various places where we should probably check the return value but don't. This adds these checks. Reviewed-by: Richard Levitte <[email protected]>
* Fix README version typoRich Salz2015-11-191-1/+1
| | | | Reviewed-by: Steve Marquess <[email protected]>
* Fix release in READMERich Salz2015-11-181-1/+1
| | | | Reviewed-by: Steve Marquess <[email protected]>
* aes/asm/vpaes-ppc.pl: eliminate overhung stores in misaligned cases.Andy Polyakov2015-11-181-61/+135
| | | | | Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit ce24d2ed232a095349886aecc8cb959d5dda8342)
* bn/asm/ppc64-mont.pl: adapt for little-endian.Andy Polyakov2015-11-161-86/+88
| | | | | | | | The problem remained unnoticed so far, because it's never called by default. You have to craft OPENSSL_ppccap environment variable to trigger the problem. Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit e4693b4e2a0c3f6241d4d3e61460c34c7e0013f6)
* bn/asm/s390x.S: improve performance on z196 and z13 by up to 26%. [even z10 ↵Andy Polyakov2015-11-161-37/+72
| | | | | | | is couple percent faster]. Triggered by RT#4128, but solves the problem by real modulo-scheduling. Reviewed-by: Rich Salz <[email protected]> (cherry picked from commit 9d0e4dc6351df7d0c08400c4b4cf17c017022e50)
* aesni-sha256-x86_64.pl: fix crash on AMD Jaguar.Andy Polyakov2015-11-162-5/+13
| | | | | | | | It was also found that stich performs suboptimally on AMD Jaguar, hence execution is limited to XOP-capable and Intel processors. Reviewed-by: Kurt Roeckx <[email protected]> (cherry picked from commit a5fd24d19bbb586b1c6d235c2021e9bead22c9f5)
* RT32671: wrong multiple errs TS_check_status_infoGraeme Perrow2015-11-131-1/+1
| | | | | | | Manual cherry-pick of 0704343f138a38d3882d5af2a4ebe8821e9a8f3a. Signed-off-by: Rich Salz <[email protected]> Reviewed-by: Tim Hudson <[email protected]>
* modes/asm/ghash-armv4.pl: make it compile by clang. RT#3989Andy Polyakov2015-11-111-0/+5
| | | | Reviewed-by: Matt Caswell <[email protected]>
* Stop DTLS servers asking for unsafe legacy renegotiationMatt Caswell2015-11-101-0/+13
| | | | | | | | | | | | | If a DTLS client that does not support secure renegotiation connects to an OpenSSL DTLS server then, by default, renegotiation is disabled. If a server application attempts to initiate a renegotiation then OpenSSL is supposed to prevent this. However due to a discrepancy between the TLS and DTLS code, the server sends a HelloRequest anyway in DTLS. This is not a security concern because the handshake will still fail later in the process when the client responds with a ClientHello. Reviewed-by: Tim Hudson <[email protected]>
* Only call ssl3_init_finished_mac once for DTLSMatt Caswell2015-11-101-2/+1
| | | | | | | | | | | | | In DTLS if an IO retry occurs during writing of a fragmented ClientHello then we can end up reseting the finish mac variables on the retry, which causes a handshake failure. We should only reset on the first attempt not on retries. Thanks to BoringSSL for reporting this issue. RT#4119 Reviewed-by: Tim Hudson <[email protected]>
* Remove redundant check from tls1_get_curvelistMatt Caswell2015-11-101-1/+1
| | | | | | | | | | | | | | The function tls1_get_curvelist() has an explicit check to see if s->cert is NULL or not. However the check appears *after* calling the tls1_suiteb macro which derefs s->cert. In reality s->cert can never be NULL because it is created in SSL_new(). If the malloc fails then the SSL_new call fails and no SSL object is created. Reviewed-by: Tim Hudson <[email protected]> (cherry picked from commit 6329b6092b28b656be8a1e4a8363d2e3bcc32053) Conflicts: ssl/t1_lib.c
* Fix missing malloc return value checksMatt Caswell2015-11-0913-2/+51
| | | | | | | | During work on a larger change in master a number of locations were identified where return value checks were missing. This backports the relevant fixes. Reviewed-by: Richard Levitte <[email protected]>
* Make the match for previous cflags a bit more strictRichard Levitte2015-11-091-2/+2
| | | | | | | | | ./Configure [target] --strict-warnings -Wno-pedantic-ms-format would not add '-pedantic' because it matches '-Wno-pedantic-ms-format', which was added first. Reviewed-by: Matt Caswell <[email protected]> (cherry picked from commit 6703c4ea87b30554283deaa5df1f8d68725d3ee4)
* Reject TLS 1.2 ciphersuites if not allowed.Dr. Stephen Henson2015-11-081-0/+5
| | | | Reviewed-by: Viktor Dukhovni <[email protected]>
* Ensure the dtls1_get_*_methods work with DTLS_ANY_VERSIONMatt Caswell2015-11-043-18/+24
| | | | | | | The various dtls1_get*_methods did not handle the DTLS_ANY_VERSION case, so this needed to be added. Reviewed-by: Tim Hudson <[email protected]>
* Minor EVP_SignInit_ex doc fixMatt Caswell2015-11-041-1/+2
| | | | | | | | EVP_SignInit_ex was missing from the NAME section of its man page so typing "man EVP_SignInit_ex" failed to load the page. Reviewed-by: Stephen Henson <[email protected]> (cherry picked from commit 3d866ea67e8b19777e88ac2a78ee4188e0983168)
* Clarify the preferred way of creating patch filesMatt Caswell2015-11-021-2/+8
| | | | | | | Clarify that git format-patch output is preferred for creating patch files. Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit f89ee71bc81017e04ac50f570d8aed87f495bcf2)
* Various README and CONTRIBUTING updatesRich Salz2015-11-012-114/+67
| | | | | | | | | | | | | Close GH Issue 69 Close GH PR 457/RT4113 Some other updates By Rich Salz, Alessandro Ghedini, Steve Marquess, Collin Anderson (manual cherry-pick of a2aaf8be7e3c22a61ef89f273aa85f482b955336 and b06935f439af7150d3ae566922353c3f210e63ed) Reviewed-by: Kurt Roeckx <[email protected]>
* BN_GF2m_mod_inv(): check bn_wexpand return valuePascal Cuoq2015-10-291-3/+6
| | | | | | | | | Signed-off-by: Kurt Roeckx <[email protected]> Reviewed-by: Rich Salz <[email protected]> MR #1276, RT #4107 (cherry picked from commit 94b3664a528258df5ebcaae213d19bf6568cc47d)
* Remove useless codeAlessandro Ghedini2015-10-2314-47/+6
| | | | | | | | RT#4081 Reviewed-by: Rich Salz <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit 070c23325af4526c9a8532a60d63522c58d5554b)
* Check memory allocationAlessandro Ghedini2015-10-231-4/+12
| | | | | | Reviewed-by: Rich Salz <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit 8cf9d71a3a43d9b98a8a278d47dc08088a954a7b)
* Fix references to various RFCsAlessandro Ghedini2015-10-231-10/+7
| | | | | | Reviewed-by: Rich Salz <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit 3240e7cf5f651d9d94814b4d494fbe294e463b72)
* Fix typosAlessandro Ghedini2015-10-239-12/+12
| | | | | | Reviewed-by: Rich Salz <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit d900a015b5a89ea2018e6122dd2738925e4d68ab)
* Set salt length after the malloc has succeededAlessandro Ghedini2015-10-231-2/+2
| | | | | | Reviewed-by: Rich Salz <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit c2319cf9fce87a2e82efb6e58ced11a85190dc3d)
* Fix memory leaks and other mistakes on errorsAlessandro Ghedini2015-10-239-22/+46
| | | | | | Reviewed-by: Rich Salz <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit 3f6c7691870d1cd2ad0e0c83638cef3f35a0b548)
* Replace malloc+strlcpy with strdupAlessandro Ghedini2015-10-231-2/+1
| | | | | | Reviewed-by: Rich Salz <[email protected]> Reviewed-by: Richard Levitte <[email protected]> (cherry picked from commit 8acaabec429b39f9436f6a88006384d72d292539)