summaryrefslogtreecommitdiffstats
path: root/ssl
AgeCommit message (Collapse)Author
2014-07-02Make disabling last cipher work.Thijs Alkemade
(cherry picked from commit 7cb472bd0d0fd9da3d42bed1acc56c3a79fc5328)
2014-07-02Fix possible buffer overrun.Ben Laurie
(cherry picked from commit 2db3ea29298bdc347f15fbfab6d5746022f05101) Conflicts: ssl/ssl_locl.h ssl/t1_lib.c
2014-06-29Fix memory leak.Dr. Stephen Henson
PR#2531 (cherry picked from commit 44724beeadf95712a42a8b21dc71bf110e89a262)
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 compilation with -DSSL_DEBUG -DTLS_DEBUG -DKSSL_DEBUGyogesh nagarkar
PR#3141 (cherry picked from commit d183545d4589f1e7a40190400b8b99ea3d1f7f97)
2014-06-27Remove redundant check.Ken Ballou
PR#3174 (cherry picked from commit fd331c0bb9b557903dd2ce88398570a3327b5ef0)
2014-06-27Don't advertise ECC ciphersuits in SSLv2 compatible client hello.Tomas Mraz
PR#3374 (cherry picked from commit 0436369fccd128cb7f6a8538d5fed1c876c437af)
2014-06-22Fix 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 3d86077427f93dc46b18fee706b567ec32ac232a. Incorrect attribution.
2014-06-22Fixed Windows compilation failureMatt Caswell
2014-06-17Fix signed/unsigned comparisons.Felix Laurie von Massenbach
(cherry picked from commit 50cc4f7b3d64621b6062ad1f16a7630b7c730d9b)
2014-06-17Remove unused DANE macros. This should be the last DANE stuff...Richard Levitte
2014-06-16Spaces were added in some strings for better readability. However, those ↵Richard Levitte
spaces do not belong in file names, so when picking out the individual parts, remove the spaces
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-14Adjust VMS build files to the Unix onesRichard Levitte
2014-06-14Make sure that disabling the MAYLOSEDATA3 warning is only done when theRichard Levitte
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.
2014-06-13Fixed incorrect return code handling in ssl3_final_finish_mac.Matt Caswell
Based on an original patch by Joel Sing (OpenBSD) who also originally identified the issue.
2014-06-13Revert "Fixed incorrect return code handling in ssl3_final_finish_mac"Matt Caswell
This reverts commit 728bd41a159ea16a60111e7c1120ec2a005507b3. Missing attribution.
2014-06-12Fix 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-12Added OPENSSL_assert check as per PR#3377 reported by Rainer Jung ↵Matt Caswell
<rainer.jung@kippdata.de>
2014-06-12Remove unimplemented functions.Dr. Stephen Henson
2014-06-11Enable multi-block support by default.Andy Polyakov
(cherry picked from commit 77a27a5066e8c0975d78be635ed356749a6f16db)
2014-06-10Fixed incorrect return code handling in ssl3_final_finish_macMatt Caswell
2014-06-10Create test/testutil.h for unit test helper macrosMike Bland
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.
2014-06-10Remove experimental DANE code.Dr. Stephen Henson
Remove experimental DANE/dnssec code: not ready for use in an official release yet.
2014-06-10Fix null pointer errors.Dr. Stephen Henson
PR#3394 (cherry picked from commit 7a9d59c148b773f59a41f8697eeecf369a0974c2)
2014-06-09SRP ciphersuite correction.Dr. Stephen Henson
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)
2014-06-09Update strength_bits for 3DES.Dr. Stephen Henson
Fix strength_bits to 112 for 3DES. (cherry picked from commit 837c203719205ab19b5609b2df7151be8df05687)
2014-06-07Make tls_session_secret_cb work with CVE-2014-0224 fix.Dr. Stephen Henson
If application uses tls_session_secret_cb for session resumption set the CCS_OK flag. (cherry picked from commit 953c592572e8811b7956cc09fbd8e98037068b58)
2014-06-05Fix 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. (cherry picked from commit 1632ef744872edc2aa2a53d487d3e79c965a4ad3)
2014-06-05Fix 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. (cherry picked from commit bc8923b1ec9c467755cd86f7848c50ee8812e441)
2014-06-05Additional CVE-2014-0224 protection.Dr. Stephen Henson
Return a fatal error if an attempt is made to use a zero length master secret. (cherry picked from commit 006cd7083f76ed5cb0d9a914857e9231ef1bc317)
2014-06-05Fix 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. (cherry picked from commit d3152655d5319ce883c8e3ac4b99f8de4c59d846)
2014-06-05Fix CVE-2014-3470Dr. Stephen Henson
Check session_cert is not NULL before dereferencing it. (cherry picked from commit 8011cd56e39a433b1837465259a9bd24a38727fb)
2014-06-02Check there is enough room for extension.David Benjamin
(cherry picked from commit 7d89b3bf42e4b4067371ab33ef7631434e41d1e4)
2014-06-02Free up s->d1->buffered_app_data.q properly.zhu qun-ying
PR#3286 (cherry picked from commit 71e95000afb2227fe5cac1c79ae884338bcd8d0b)
2014-06-02Typo: set i to -1 before goto.Sami Farin
PR#3302 (cherry picked from commit 9717f01951f976f76dd40a38d9fc7307057fa4c4)
2014-06-01Added SSLErr call for internal error in dtls1_buffer_recordMatt Caswell
2014-06-01Delays the queue insertion until after the ssl3_setup_buffers() call due to ↵David Ramos
use-after-free bug. PR#3362
2014-06-01Option to disable padding extension.Dr. Stephen Henson
Add TLS padding extension to SSL_OP_ALL so it is used with other "bugs" options and can be turned off. This replaces SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG which is an ancient option referring to SSLv2 and SSLREF. PR#3336 (cherry picked from commit 758415b2259fa45d3fe17d8e53ae1341b7b6e482) Conflicts: ssl/t1_lib.c
2014-06-01Allocate extra space when NETSCAPE_HANG_BUG defined.David Ramos
Make sure there is an extra 4 bytes for server done message when NETSCAPE_HANG_BUG is defined. PR#3361 (cherry picked from commit 92d81ba622396425764d676ba4fb3f0dac273f17)
2014-05-30Use correct digest when exporting keying material.Dr. Stephen Henson
PR#3319 (cherry picked from commit 84691390eae86befd33c83721dacedb539ae34e6)
2014-05-30Don't compile heartbeat test code on Windows (for now).Dr. Stephen Henson
(cherry picked from commit 2c575907d2c8601a18716f718ce309ed4e1f1783)
2014-05-22Fix heartbeat_test for -DOPENSSL_NO_HEARTBEATSMike Bland
Replaces the entire test with a trivial implementation when OPENSSL_NO_HEARTBEATS is defined.
2014-05-20Fix signed/unsigned warning.Ben Laurie
2014-05-20For portability use BUF_strndup instead of strndup.Dr. Stephen Henson
(cherry picked from commit dcca7b13e9066443237dd3001ae52fd103151c98)
2014-05-20Adding padding extension to trace code.Dr. Stephen Henson
(cherry picked from commit 6db14dbc514d6b8017827baebea4c75af8bb1976)
2014-05-18Unit/regression test for TLS heartbeats.Mike Bland
Regression test against CVE-2014-0160 (Heartbleed). More info: http://mike-bland.com/tags/heartbleed.html (based on commit 35cb55988b75573105eefd00d27d0138eebe40b1)
2014-05-12Check sk_SSL_CIPHER_num() after assigning sk.Kurt Roeckx
2014-05-12Replace manual ASN1 decoder with ASN1_get_objectSerguei E. Leontiev
Replace manual ASN.1 decoder with ASN1_get object. This will decode the tag and length properly and check against it does not exceed the supplied buffer length. PR#3335 (cherry picked from commit b0308dddd1cc6a8e1de803ef29ba6da25ee072c2)