summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2014-07-07Prevent infinite loop loading config files.David Lloyd
PR#2985 (cherry picked from commit 9d23f422a32cb333a5e803199ae230706b1bf9f5)
2014-07-07Fix ECC SSLv2 exclusion on OpenSSL 0.9.8.Dr. Stephen Henson
2014-07-06Update ticket callback docs.Dr. Stephen Henson
(cherry picked from commit a23a6e85d8dcd5733a343754f434201f3c9aa6f0)
2014-07-06Fixes for newer versions of pod2manMatt Caswell
2014-07-06Fixed error in pod files with latest versions of pod2manMatt Caswell
(cherry picked from commit 07255f0a76d9d349d915e14f969b9ff2ee0d1953)
2014-07-05Return smaller of ret and f.Alan Hryngle
PR#3418. (cherry picked from commit fdea4fff8fb058be928980600b24cf4c62ef3630)
2014-07-05Don't limit message sizes in ssl3_get_cert_verify.Dr. Stephen Henson
PR#319 (reoponed version). (cherry picked from commit 7f6e9578648728478e84246fd3e64026b8b6a48e) Conflicts: ssl/s3_srvr.c
2014-07-03More doc fixes.Dr. Stephen Henson
2014-07-03More bugfixes from the doc-fix merge; errors found by DrH, thanks.Rich Salz
2014-07-03Fix errors with last cherry-pick; SSL_CONF_* and s_clientRich Salz
-verify_return_error aren't in this release.
2014-07-03Merge branch 'rsalz-docfixes'Rich Salz
(cherry picked from commit b5071dc2f67d7667ab3cbbe50a30342f999b896a) Conflicts: doc/apps/s_client.pod doc/apps/verify.pod doc/apps/x509v3_config.pod doc/crypto/ASN1_generate_nconf.pod doc/ssl/SSL_CONF_CTX_set_ssl_ctx.pod doc/ssl/SSL_CONF_cmd.pod doc/ssl/SSL_CONF_cmd_argv.pod doc/ssl/SSL_CTX_set_cert_cb.pod doc/ssl/SSL_CTX_set_security_level.pod
2014-07-03Close 3170, remove reference to Ariel Glenn's old 0.9.8 docRich Salz
(cherry picked from commit f1112985e847286033ac573e70bdee752d26f46f)
2014-07-02Fix doc typo.Matt Smart
ERR_get_error(3) references the non-existent ERR_get_last_error_line_data instead of the one that does exist, ERR_peek_last_error_line_data. PR#3283 (cherry picked from commit 5cc99c6cf5e908df6b00b04af7f08e99c0698c7b)
2014-07-02util/mkerr.pl: fix perl warningGeoff Thorpe
Gets rid of this; defined(@array) is deprecated at ../util/mkerr.pl line 792. (Maybe you should just omit the defined()?) defined(@array) is deprecated at ../util/mkerr.pl line 800. (Maybe you should just omit the defined()?) Signed-off-by: Geoff Thorpe <geoff@openssl.org> (cherry picked from commit 647f360e2e86818cee1f2d0429e071d14814e0b5)
2014-07-02ASN1 sanity check.Dr. Stephen Henson
Primitive encodings shouldn't use indefinite length constructed form. PR#2438 (partial). (cherry picked from commit 398e99fe5e06edb11f55a39ce0883d9aa633ffa9)
2014-06-29Fix memory leak.Dr. Stephen Henson
PR#2531. (cherry picked from commit 59899c4d1b4b6ee4066a540bad2b62cb22ac3d91)
2014-06-29Typo.Ken Ballou
PR#3173 (cherry picked from commit 76ed5a42ea68dd08bba44e4003b7e638e5d8a4a3)
2014-06-29Show errors on CSR verification failure.Dr. Stephen Henson
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)
2014-06-28Typo.Dr. Stephen Henson
PR#3107 (cherry picked from commit 7c206db9280865ae4af352dbc14e9019a6c4795d)
2014-06-28Don't disable state strings with no-ssl2Dr. Stephen Henson
Some state strings were erronously not compiled when no-ssl2 was set. PR#3295 (cherry picked from commit 0518a3e19e18cfc441cab261b28441b8c8bd77bf)
2014-06-28Fix typo in ideatest.cAndreas Westfeld
(cherry picked from commit d1d4382dcb3fdcad4758ef7e7dd7b61dbf5abbfe)
2014-06-27Remove redundant check.Ken Ballou
PR#3174 (cherry picked from commit fd331c0bb9b557903dd2ce88398570a3327b5ef0)
2014-06-27Handle IPv6 addresses in OCSP_parse_url.Tom Greenslade
PR#2783 (cherry picked from commit b36f35cda964544a15d53d3fdfec9b2bab8cacb1)
2014-06-27Don't advertise ECC ciphersuits in SSLv2 compatible client hello.Tomas Mraz
PR#3374 (cherry picked from commit 0436369fccd128cb7f6a8538d5fed1c876c437af)
2014-06-27Clarify docs.Jeffrey Walton
Document that the certificate passed to SSL_CTX_add_extra_chain_cert() should not be freed by the application. PR#3409 Add restrictions section present in other branches. (cherry picked from commit 86cac6d3b25342ff17a2b6564f7592fd7c6829e8)
2014-06-27Memory leak and NULL dereference fixes.Dr. Stephen Henson
PR#3403 (cherry picked from commit d2aea038297e0c64ca66e6844cbb37377365885e) Conflicts: apps/crl2p7.c crypto/asn1/a_utctm.c crypto/asn1/ameth_lib.c crypto/asn1/bio_asn1.c
2014-06-27Remove ancient obsolete files under pkcs7.Dr. Stephen Henson
(cherry picked from commit 7be6b27aaf5ed77f13c93dc89a2c27a42082db3f)
2014-06-26Make sure BN_sqr can never return a negative value.Huzaifa Sidhpurwala
PR#3410 (cherry picked from commit e14e764c0d5d469da63d0819c6ffc0e1e9e7f0bb)
2014-06-22 Fix off-by-one errors in ssl_cipher_get_evp()Miod Vallat
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
2014-06-22Revert " Fix off-by-one errors in ssl_cipher_get_evp()"Matt Caswell
This reverts commit def1490717c091c6ef669da9fc5ea4c8b2a4d776. Incorrect attribution
2014-06-14Accept CCS after sending finished.Dr. Stephen Henson
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)
2014-06-12 Fix off-by-one errors in ssl_cipher_get_evp()Kurt Cancemi
In the ssl_cipher_get_evp() function, fix off-by-one errors in index validation before accessing arrays. PR#3375
2014-06-12Allow the maximum value.Ben Laurie
(Backported as a result of PR#3377 reported by Rainer Jung <rainer.jung@kippdata.de>)
2014-06-10Fix null pointer errors.Dr. Stephen Henson
PR#3394 (cherry picked from commit 7a9d59c148b773f59a41f8697eeecf369a0974c2)
2014-06-09Clarify NEWS.Dr. Stephen Henson
2014-06-06Use correct wording for website scripts.Dr. Stephen Henson
2014-06-06Add two known issues to NEWS.Dr. Stephen Henson
2014-06-06Fix 0.9.8 FIPS capable OpenSSL build.Dr. Stephen Henson
The object file bn_lib.o is excluded from FIPS builds which causes a linker error for BN_consttime_swap. So move definition from bn_lib.c to bn_gf2m.c This change is *only* needed for OpenSSL 0.9.8 which uses the 1.2 FIPS module.
2014-06-05Fixed Windows compilation failureMatt Caswell
2014-06-05Prepare for 0.9.8zb-devDr. Stephen Henson
2014-06-05Prepare for 0.9.8za releaseOpenSSL_0_9_8zaDr. Stephen Henson
2014-06-05Update CHANGES and NEWSDr. Stephen Henson
2014-06-03Fix CVE-2014-3470Dr. Stephen Henson
Check session_cert is not NULL before dereferencing it.
2014-06-03Fix CVE-2014-0221Dr. Stephen Henson
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.
2014-06-03Additional CVE-2014-0224 protection.Dr. Stephen Henson
Return a fatal error if an attempt is made to use a zero length master secret.
2014-06-03Fix for CVE-2014-0224Dr. Stephen Henson
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.
2014-06-03Fix for CVE-2014-0195Dr. Stephen Henson
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.
2014-06-02Free up s->d1->buffered_app_data.q properly.zhu qun-ying
PR#3286 (cherry picked from commit 71e95000afb2227fe5cac1c79ae884338bcd8d0b)
2014-06-02ecdsa.pod: typo.Andy Polyakov
PR: 2678 Submitted by: Annie Yousar (cherry picked from commit d572544a2cccc9dad7afcef24de11232e5506c99)
2014-06-02Typo: set i to -1 before goto.Sami Farin
PR#3302 (cherry picked from commit 9717f01951f976f76dd40a38d9fc7307057fa4c4)