Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Prevent infinite loop during configuration file parsing; OpenSSL PR #2985 | miod | 2014-07-11 | 1 | -2/+2 |
| | | | | via OpenSSL trunk. | ||||
* | Missing bounds check in do_PVK_body(); OpenSSL RT #2277, from OpenSSL trunk, | miod | 2014-07-11 | 1 | -4/+10 |
| | | | | but without a memory leak. | ||||
* | OPENSSL_ALGORITHM_DEFINES has been removed from conf.h, no need for it now | tedu | 2014-07-11 | 1 | -8/+2 |
| | |||||
* | In RSA_eay_private_encrypt(), correctly return the smaller BN; OpenSSL | miod | 2014-07-11 | 1 | -2/+2 |
| | | | | PR #3418 via OpenSSL trunk | ||||
* | In ssl3_get_cert_verify(), allow for larger messages to accomodate keys | miod | 2014-07-11 | 2 | -6/+4 |
| | | | | | larger than 4096-bit RSA which the most paranoid of us are using; OpenSSL PR #319 via OpenSSL trunk. | ||||
* | it has been 4888 days since the transient feature to define short macros | tedu | 2014-07-11 | 1 | -58/+1 |
| | | | | | for apps that haven't had time to make the appropriate changes was added. time's up. | ||||
* | Apparently better fix for OpenSSL PR #3397 (Joyent bug #7704), from OpenSSL | miod | 2014-07-11 | 1 | -2/+2 |
| | | | | trunk | ||||
* | Also make these files parsable by pod2man.. | beck | 2014-07-11 | 1 | -6/+6 |
| | | | | ok bcook@ | ||||
* | Make this file parsable by pod2man without errors. | beck | 2014-07-11 | 1 | -6/+6 |
| | | | | ok bcook@ | ||||
* | In ASN1_get_object(), reject primitive encodings using the indefinite length | miod | 2014-07-11 | 1 | -1/+4 |
| | | | | constructed form. OpenSSL PR #2438 via OpenSSL trunk | ||||
* | Fix copy for CCM, GCM and XTS. | miod | 2014-07-11 | 1 | -12/+70 |
| | | | | | | | | Internal pointers in CCM, GCM and XTS contexts should either be NULL or set to point to the appropriate key schedule. This needs to be adjusted when copying contexts. OpenSSL PR #3272 with further fixes, from OpenSSL trunk | ||||
* | In asn1_get_length(), tolerate leading zeroes in BER encoding. | miod | 2014-07-11 | 1 | -5/+8 |
| | | | | OpenSSL PR #2746 via OpenSSL trunk | ||||
* | In EVP_PBE_alg_add don't use the underlying NID for the cipher | miod | 2014-07-11 | 1 | -2/+2 |
| | | | | as it may have a non-standard key size; OpenSSL PR #3206 via OpenSSL trunk. | ||||
* | additional features: no buffer freelists and no heartbleed | tedu | 2014-07-11 | 1 | -0/+3 |
| | |||||
* | no compression is also a feature of libressl | tedu | 2014-07-11 | 1 | -0/+4 |
| | |||||
* | move all the feature settings to a common header. | tedu | 2014-07-11 | 1 | -0/+72 |
| | | | | probably ok beck jsing miod | ||||
* | Tolerate critical AKID in CRLs; OpenSSL PR #3014 via OpenSSL trunk, and | miod | 2014-07-11 | 1 | -7/+8 |
| | | | | also update the comments to reflect what the code now does. | ||||
* | Fix OID encoding for single components. OpenSSL PR #2556 via OpenSSL trunk. | miod | 2014-07-11 | 1 | -1/+1 |
| | | | | (be sure to make cleandir and make includes before building) | ||||
* | More memory leaks and unchecked allocations; OpenSSL PR #3403 via OpenSSL | miod | 2014-07-11 | 4 | -7/+19 |
| | | | | trunk. (note we had already fixed some of the issues in that PR independently) | ||||
* | Make sure BN_sqr never returns negative numbers. | miod | 2014-07-11 | 1 | -1/+2 |
| | | | | OpenSSL PR #3400 via OpenSSL trunk. | ||||
* | Accept CCS again after `finished' has been sent by the client; at this point | miod | 2014-07-11 | 2 | -10/+12 |
| | | | | | | | keys have been correctly set up so it is ok to accept CCS from the server. Without renegotiation can sometimes fail. OpenSSL PR #3400 via OpenSSL trunk. | ||||
* | In dtls1_clear_queues(), free buffered_add_data.q correctly, it's made of | miod | 2014-07-11 | 2 | -8/+8 |
| | | | | | | DTLS1_RECORD_DATA, not hm_fragment. OpenSSL PR #3286 via OpenSSL trunk. | ||||
* | Fix version number processing in cms_sd_set_version(); OpenSSL PR #3249 via | miod | 2014-07-11 | 1 | -3/+3 |
| | | | | OpenSSL trunk. | ||||
* | Remove duplicate 0x for salt len in output; Martin Kaiser via OpenSSL trunk. | miod | 2014-07-11 | 1 | -2/+2 |
| | |||||
* | When looking for the issuer of a certificate, if the current candidate is | miod | 2014-07-11 | 3 | -13/+97 |
| | | | | | | | expired or not valid yet, continue looking; only return an expired certificate if no valid certificates have been found. OpenSSL PR #3359 via OpenSSL trunk. | ||||
* | In ssl3_get_client_key_exchange() parsing a GOST session key, invoke the | miod | 2014-07-11 | 2 | -26/+16 |
| | | | | | regular ASN.1 parser rather than trying to handroll one and potentially misbehave; OpenSSL PR #3335 via OpenSSL trunk. | ||||
* | Missing calloc() return value check in dgram_sctp_ctrl(); from Kurt Roeckx via | miod | 2014-07-11 | 1 | -11/+21 |
| | | | | OpenSSL trunk | ||||
* | Make CMS_decrypt_set1_pkey() return an error if no recipient type matches, | miod | 2014-07-11 | 1 | -3/+4 |
| | | | | instead of returning a random key; OpenSSL PR #3348 via OpenSSL trunk | ||||
* | Missing initialization for error line in error paths; from Coverity via | miod | 2014-07-11 | 2 | -2/+8 |
| | | | | OpenSSL trunk. | ||||
* | Missing initialization; OpenSSL PR#3289 and #3345 via OpenSSL trunk. | miod | 2014-07-11 | 1 | -2/+3 |
| | |||||
* | Provide correct version details for LibreSSL. | jsing | 2014-07-11 | 1 | -77/+3 |
| | | | | ok beck@ deraadt@ miod@ | ||||
* | Clean up versioning and remove #ifdefs that we do not define. | jsing | 2014-07-11 | 1 | -34/+9 |
| | | | | ok beck@ | ||||
* | Suspicions confirmed by sthen's searching that nothing uses ossl_ssize_t | deraadt | 2014-07-11 | 1 | -3/+1 |
| | | | | except embedded openssl's in other trees. | ||||
* | pour some water on an ass ember | deraadt | 2014-07-11 | 1 | -1/+1 |
| | | | | spotted by doctor jsing, always keeping an eye out for these | ||||
* | Fetch the specific license which will be used from | deraadt | 2014-07-11 | 1 | -0/+24 |
| | | | | | | https://www.openssl.org/~appro/camellia/dist/BSD_license.txt It isn't our concern to supply the other licences mentioned in source files; that is realy not our problem. | ||||
* | Remove the commentary about the majority of this code being under | deraadt | 2014-07-11 | 2 | -6/+4 |
| | | | | | | | 'BSD-style Open Source licenses'. It is a bit improper of OpenSSL to classify themselves into the BSD community without a clear justification for the extra clauses / terms... | ||||
* | More e_os2.h clean up. Also move the includes inside the guard. | jsing | 2014-07-11 | 1 | -20/+12 |
| | | | | ok deraadt@ who also has a similar diff. | ||||
* | Revert change that snuck into previous commit. | jsing | 2014-07-11 | 1 | -3/+1 |
| | |||||
* | Remove the PSK code. We don't need to drag around this | beck | 2014-07-11 | 25 | -1507/+27 |
| | | | | | baggage. ok miod@ jsing@ | ||||
* | The only thing openssl is consistant about is inconsistancy, so there | deraadt | 2014-07-11 | 2 | -2/+2 |
| | | | | | | | are many variations of their license and we need to say: licenses which follow: rather than license which follows: | ||||
* | say hi to the bitbucket | deraadt | 2014-07-11 | 5 | -12388/+0 |
| | |||||
* | replace u_int8_t with uint8_t | bcook | 2014-07-11 | 1 | -3/+5 |
| | | | | ok beck@ | ||||
* | Only import cryptlib.h in the four source files that actually need it. | jsing | 2014-07-11 | 345 | -1097/+1145 |
| | | | | | | | | Remove the openssl public includes from cryptlib.h and add a small number of includes into the source files that actually need them. While here, also sort/group/tidy the includes. ok beck@ miod@ | ||||
* | Add a small note about LibReSSL at the start of this. | beck | 2014-07-11 | 2 | -0/+14 |
| | | | | ok jsing@ | ||||
* | No need to keep ssl23_foo() flavours mapping to ssl3_foo(). | miod | 2014-07-11 | 9 | -86/+24 |
| | | | | ok tedu@ | ||||
* | Remove JPAKE remnants - there is no jpake.h, so if OPENSSL_NO_JPAKE was | jsing | 2014-07-11 | 2 | -8/+1 |
| | | | | removed from opensslconf.h, this would no longer compile. | ||||
* | Explicitly include <openssl/opensslconf.h> in every file that references | jsing | 2014-07-10 | 197 | -275/+731 |
| | | | | | | | | | an OPENSSL_NO_* define. This avoids relying on something else pulling it in for us, plus it fixes several cases where the #ifndef OPENSSL_NO_XYZ is never going to do anything, since OPENSSL_NO_XYZ will never defined, due to the fact that opensslconf.h has not been included. This also includes some miscellaneous sorting/tidying of headers. | ||||
* | OPENSSL_stderr() is unused so nuke it. OPENSSL_showfatal() is only used by | jsing | 2014-07-10 | 2 | -12/+3 |
| | | | | | | OpenSSLDie(), which is in the same file, so just make it static. ok miod@ | ||||
* | Use size_t as realloc() size argument whenever possible. ok tedu@ | miod | 2014-07-10 | 2 | -6/+8 |
| | |||||
* | Simplify realloc() usage; ok tedu@ | miod | 2014-07-10 | 1 | -15/+6 |
| |