summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-01-28Prepare for 1.0.1r releaseOpenSSL_1_0_1rMatt Caswell
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-01-28TARFILE wasn't correctly setRichard Levitte
This solves an earlier cherry-pick mistake. Reviewed-by: Matt Caswell <matt@openssl.org>
2016-01-28Further updates to CHANGES and NEWSMatt Caswell
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-01-28Update CHANGES and NEWS ready for releaseMatt Caswell
Update CHANGES and NEWS with details of the issues fixed in the forthcoming release. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-01-28Better SSLv2 cipher-suite enforcementViktor Dukhovni
Based on patch by: Nimrod Aviram <nimrod.aviram@gmail.com> CVE-2015-3197 Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-01-28Always generate DH keys for ephemeral DH cipher suitesMatt Caswell
Modified version of the commit ffaef3f15 in the master branch by Stephen Henson. This makes the SSL_OP_SINGLE_DH_USE option a no-op and always generates a new DH key for every handshake regardless. This is a follow on from CVE-2016-0701. This branch is not impacted by that CVE because it does not support X9.42 style parameters. It is still possible to generate parameters based on primes that are not "safe", although by default OpenSSL does not do this. The documentation does sign post that using such parameters is unsafe if the private DH key is reused. However to avoid accidental problems or future attacks this commit has been backported to this branch. Issue reported by Antonio Sanso Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
2016-01-19Fix BSD -rpath parameterRichard Levitte
For BSD systems, Configure adds a shared_ldflags including a reference to the Makefile variable LIBRPATH, but since it must be passed down to Makefile.shared, care must be taken so the value of LIBRPATH doesn't get expanded too early, or it ends up giving an empty string. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (cherry picked from commit c64879d3f3cc4c7f1c436a9fe3bd109847a23629)
2016-01-19Validate ClientHello session_id field length and send alert on failureAlessandro Ghedini
RT#4080 Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
2016-01-19Update license year range to 2016Prayag Verma
Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 02f70372470b4dd3b21443bb615292175f5d2c88)
2016-01-16Empty SNI names are not validViktor Dukhovni
Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-01-14To avoid possible time_t overflow use X509_time_adj_ex()Dr. Stephen Henson
Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (cherry picked from commit 9aa00b187a65b1f30789d6274ec31ea86efe7973) Conflicts: apps/x509.c
2016-01-11Change minimum DH size from 768 to 1024Kurt Roeckx
Reviewed-by: Viktor Dukhovni <openssl-users@dukhovni.org>
2016-01-10File is about s_time, not s_clientKurt Roeckx
Reviewed-by: Dr. Stephen Henson <steve@openssl.org> (cherry picked from commit 1918e01c9f915e2eba31a5e2f86f0a5daa4fafb6)
2016-01-04Fix X509_STORE_CTX_cleanup()Viktor Dukhovni
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
2015-12-28RT4202: Update rt URL's.Rich Salz
Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 41977c53cd04f52b2b5e56d31ace782577620ac3)
2015-12-27Add some documentation for the OCSP callback functionsMatt Caswell
Describe the usage of the OCSP callback functions on both the client and the server side. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (cherry picked from commit c52c3b5e11253afabaa62739a8ee1c4c4bddcd53)
2015-12-27Ensure we don't call the OCSP callback if resuming a sessionMatt Caswell
It makes no sense to call the OCSP status callback if we are resuming a session because no certificates will be sent. Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (cherry picked from commit 0ac6239955965f58f9dddb4229e8cd58e0dba20d)
2015-12-27Fix error when server does not send CertificateStatus messageMatt Caswell
If a server sends the status_request extension then it may choose to send the CertificateStatus message. However this is optional. We were treating it as mandatory and the connection was failing. Thanks to BoringSSL for reporting this issue. RT#4120 Reviewed-by: Viktor Dukhovni <viktor@openssl.org> (cherry picked from commit 905943af3b43116b64ae815db1a6b9c2f15e0356)
2015-12-22Fix memory leak in DSA redo case.David Benjamin
Found by clang scan-build. Signed-off-by: Kurt Roeckx <kurt@roeckx.be> Reviewed-by: Richard Levitte <levitte@openssl.org> RT: #4184, MR: #1496 (cherry picked from commit 679d87515d23ca31491effdc264edc81c695a72a)
2015-12-20Don't check RSA_FLAG_SIGN_VER.Dr. Stephen Henson
Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 6656ba7152dfe4bba865e327dd362ea08544aa80)
2015-12-19BIO_s_datagram() ctrl doesn't support SEEK/TELL, so don't pretend it doesRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 17592f323ac7dad381cc3b512573c291b1a820c0)
2015-12-19Correct or add comments indicating what controls belong to whatRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 6d97060ee00518efc99c5d89a78529dc111780fb)
2015-12-19Document how BIO_get_conn_ip and BIO_get_conn_int_port actually workRichard Levitte
No dummy arguments. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 7eb51251252ea0b269227d267512b98495f51bc4)
2015-12-19Have BIO_get_conn_int_port use BIO_ctrl instead BIO_int_ctrlRichard Levitte
BIO_int_ctrl isn't made for the purpose BIO_get_conn_int_port used it for. This also changes BIO_C_GET_CONNECT to actually return the port instead of assigning it to a pointer that was never returned back to the caller. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 2a60fccdd9b696e01fddaa268e92ea210beb0e8f)
2015-12-19Fix more URLs mangled by reformatMatt Caswell
Fix some more URLs mangled by indent in the reformat. These ones don't exist in master so we have a separate commit. Based on a patch supplied by Arnaud Lacombe <al@aerilon.ca> Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-12-19Fix URLs mangled by reformatMatt Caswell
Some URLs in the source code ended up getting mangled by indent. This fixes it. Based on a patch supplied by Arnaud Lacombe <al@aerilon.ca> Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-12-18Remove the "eay" c-file-style indicatorsRichard Levitte
Since we don't use the eay style any more, there's no point tryint to tell emacs to use it. Reviewed-by: Ben Laurie <ben@openssl.org>
2015-12-16Provide better "make depend" warning.Rich Salz
Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 2e31ef0366d368ac8cf7f5ecc9052bff27337799)
2015-12-14Fix a ** 0 mod 1 = 0 for real this time.Emilia Kasper
Commit 2b0180c37fa6ffc48ee40caa831ca398b828e680 attempted to do this but only hit one of many BN_mod_exp codepaths. Fix remaining variants and add a test for each method. Thanks to Hanno Boeck for reporting this issue. Reviewed-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Dr. Stephen Henson <steve@openssl.org> (cherry picked from commit d911097d7c93e4cfeab624b34d73fe51da158b69) (cherry picked from commit 44e4f5b04b43054571e278381662cebd3f3555e6)
2015-12-14Fix tarball production to keep test/bctest and util/pod2mantestRichard Levitte
Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit 474a53b3a36568d19d7b918ee879efd2707e7c67)
2015-12-10Ensure |rwstate| is set correctly on BIO_flushMatt Caswell
A BIO_flush call in the DTLS code was not correctly setting the |rwstate| variable to SSL_WRITING. This means that SSL_get_error() will not return SSL_ERROR_WANT_WRITE in the event of an IO retry. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 67f60be8c9ae5ff3129fcd6238baf124385a41d8)
2015-12-10Fix DTLS handshake fragment retriesMatt Caswell
If using DTLS and NBIO then if a second or subsequent handshake message fragment hits a retry, then the retry attempt uses the wrong fragment offset value. This commit restores the fragment offset from the last attempt. Reviewed-by: Richard Levitte <levitte@openssl.org> (cherry picked from commit 2ad226e88bee97847496e542d63c67997d5beda6)
2015-12-09Don't use applink for static builds.Dr Stephen Henson
Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 10119938215298ad414468e7c2779d7fd1a0b979)
2015-12-08Refer to website for acknowledgements.Rich Salz
Reviewed-by: Steve Marquess <marquess@openssl.com> (cherry picked from commit ab29c82a55f3583a490733dd521ea6c486e8e2fb)
2015-12-08Not all 'find's know -xtype, use -type insteadRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 3cd7aef34d0d414d27ab00abadb99265a2cffde9)
2015-12-08Adapt the OS X build to use the OS X tarRichard Levitte
As part of this, move release creation to a script to be called from .travis.yml. That makes it much easier to test outside of travis. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 382af61f6213e975b4c2a50fd8b9fedd23d86ab5)
2015-12-08Make it possible to affect the way dists are madeRichard Levitte
Introducing DISTTARVARS to propagate changed variables down to the tar-making target. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 4d3c30a1799bf7b4dc7223b84417c4de992a6b9c)
2015-12-08Cleanup the EVP_MD_CTX before exit rather than afterRichard Levitte
Reviewed-by: Matt Caswell <matt@openssl.org> (cherry picked from commit c44844d928ad3c471c8dbe8baf2df8957900125b)
2015-12-07Change tar owner and group to just 0Richard Levitte
It seems like some tar versions don't like the name:id form for --owner and --group. The closest known anonymous user being 0 (root), that seems to be the most appropriate user/group to assign ownership to. It matters very little when unpacking either way. Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit b91dd150d2b9b5ddca37722e7f52ea59ba7f80da)
2015-12-07Do not add symlinks in the source releaseRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 451a5bdf0386d7acf091c3e3b39107e5ed8be25d)
2015-12-07In travis, build from a "source release" rather than from the build treeRichard Levitte
Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 475fc3d8729190fd12b4ff23d6ec488439fb78f9)
2015-12-07Small changes to creating distsRichard Levitte
Make TARFILE include ../ instead of having that hard coded all over the place. When transforming file names in TAR_COMMAND, use $(NAME) instead of openssl-$(VERSION) Reviewed-by: Rich Salz <rsalz@openssl.org> (cherry picked from commit 4a544810f08539f1549eea9be36bd878c67c8e26)
2015-12-03Prepare for 1.0.1r-devMatt Caswell
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-12-03Prepare for 1.0.1q releaseOpenSSL_1_0_1qMatt Caswell
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-12-03make updateMatt Caswell
Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-12-03Update CHANGES and NEWSMatt Caswell
Update the CHANGES and NEWS files for the new release. Reviewed-by: Richard Levitte <levitte@openssl.org>
2015-12-03Add PSS parameter check.Dr. Stephen Henson
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: Matt Caswell <matt@openssl.org>
2015-12-03Fix leak with ASN.1 combine.Dr. Stephen Henson
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 <levitte@openssl.org>
2015-12-03e_os.h: limit _MSC_VER trickery to older compilers.Andy Polyakov
PR: #3390, backport from 1.0.2. Reviewed-by: Matt Caswell <matt@openssl.org>
2015-12-02typoDr. Stephen Henson
Reviewed-by: Andy Polyakov <appro@openssl.org>
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-07 14:15:51 +0000