summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
* We have EVP_CIPH_FLAG_DEFAULT_ASN1 in evp.h; no need to keep constructs tomiod2014-07-122-68/+56
| | | | | | build on pre-EVP_CIPH_FLAG_DEFAULT_ASN1 codebases. ok jsing@
* Remove private_{Camellia,RC4}_set_key FIPS indirection tentacles, as has beenmiod2014-07-1219-314/+73
| | | | done for other symmetric algorithms recently.
* Provide ssl_version_string() function, which uses one of those modern Cjsing2014-07-128-56/+62
| | | | | | | | constructs (a switch statement) and returns the appropriate string defined by SSL_TXT_* for the given version, including support for DTLSv1 and DTLSv1-bad. Use this function in SSL_get_version() and SSL_SESSION_print(). ok beck@
* In openssl_startup(), call SSL_library_init() and SSL_load_error_strings().jsing2014-07-128-28/+10
| | | | | | | | This allows us to remove the ERR_load_crypto_strings() call, along with the various SSL_load_error_strings() and OpenSSL_add_ssl_algorithms() calls scattered around the place. ok beck@
* Make the BLOCK_CIPHER_{generic,custom} macros expand to more readable structmiod2014-07-122-134/+204
| | | | definitions using C99 field initializers. No functional change.
* Wrap "thread_private.h" with #ifdef __OpenBSD__ so that other systemsderaadt2014-07-121-1/+3
| | | | | | can copy this file (plus chacha_private.h) directly and reuse it trivially. Well, as long as they have a getentropy() as well.. ok beck
* Remove extra parenthesis.jsing2014-07-122-4/+4
|
* need_cert is now always true, so remove the variable and associatedjsing2014-07-122-66/+42
| | | | | | conditionals. ok miod@
* More KNF.jsing2014-07-121-95/+108
|
* Remove #ifndefs for OPENSSL_NO_DH, OPENSSL_NO_ECDH andjsing2014-07-121-41/+0
| | | | | OPENSSL_NO_X509_VERIFY. We're not going to build with these and the same removal has already been done for libssl.
* openssl(1) is only built as a single monolithic binary, so just calljsing2014-07-1239-154/+47
| | | | | | load_config() once when we start. ok miod@
* jsing and I are investigating removal of all? most? 'getenv from library'deraadt2014-07-122-2/+6
| | | | | | | instances. This one for OPENSSL_ALLOW_PROXY_CERTS gets turned off first, especially since it had this special comment: /* A hack to keep people who don't want to modify their software happy */ ok beck jsing
* A few fixes/improvements:miod2014-07-122-40/+38
| | | | | | | | | | | | | | | | - first, BN_free == BN_clear_free in our libcrypto, so we do not need to treat CBIGNUM (crypto BN) separately from BIGNUM (regular BN). - then, in bn_i2c(), since BN_bn2bin returns BN_num_bytes(input), take advantage of this to avoid calling BN_num_bytes() a second time. BN_num_bytes() is cheap, but this not a reason to perform redundant work. - finally, in bn_c2i, if bn_new() fails, return early. Otherwise BN_bin2bn will try to create a BN too, and although this will probably fail since we were already out of memory, if we are on a threaded process and suddenly the allocation succeeds, we will leak it since it will never be stored in *pval. ok jsing@
* Make sure the return value of X509_NAME_oneline(, NULL,) is checked againstmiod2014-07-124-10/+26
| | | | | NULL. ok deraadt@ guenther@ jsing@
* if (x) FOO_free(x) -> FOO_free(x).miod2014-07-12128-1098/+638
| | | | | | | Improves readability, keeps the code smaller so that it is warmer in your cache. review & ok deraadt@
* more MLINKsmiod2014-07-121-1/+4
|
* guard inclusion of sys/sysctl.h so we can detect at compile time andbeck2014-07-122-2/+6
| | | | | keep linux distros happy that don't have it. ok bcook@
* Principle of least surprise: make CMAC_CTX_free(), OCSP_REQ_CTX_free() andmiod2014-07-126-6/+24
| | | | | X509_STORE_CTX_free() accept NULL pointers as input without dereferencing them, like all the other well-behaved *_CTX_free() functions do.
* remove gratuitous differences, ok beckderaadt2014-07-122-78/+80
|
* remove gratuitous differences, ok beck bcookderaadt2014-07-124-24/+24
|
* Split arc4random_uniform into it's own file, to assist other projectsderaadt2014-07-123-39/+60
| | | | | | now using this as upstream code. The particular problem is systems that contain older arc4random derivations lacking arc4random_uniform(). ok tedu miod
* Solaris uses a symbolic link for /dev/urandom which harms best practice ofbeck2014-07-122-36/+68
| | | | | using O_NOFOLLOW - cope with it as best as possible by trying two different paths. - written by deraadt@ and kettenis@
* Remove remnants from PSK, KRB5 and SRP.jsing2014-07-1216-318/+86
| | | | ok beck@ miod@
* typosmiod2014-07-126-10/+10
|
* Place comments in a block above the if statement, rather than attemptingjsing2014-07-124-94/+126
| | | | | to interleave them within the conditions. Also fix wrapping and indentation.
* Make disabling last cipher work.guenther2014-07-122-18/+18
| | | | | From Thijs Alkemade via OpenSSL trunk ok miod@
* -DOPENSSL_NO_KRB5 is no longer neededderaadt2014-07-121-2/+2
| | | | ok guenther
* odds are that some ABI change occured today, no matter how careful everyonederaadt2014-07-122-2/+2
| | | | is
* enough churn, a crank is advised by guenther..deraadt2014-07-122-2/+2
|
* Initial version of libressl - a library that provides a clean, simple,jsing2014-07-129-0/+847
| | | | | | | | | | consistent and secure-by-default API for SSL clients (and soon servers). This is a long way from complete and the interface will likely change substantially - committing now so that further work can happen in the tree. Initiated by tedu@ and inspired by discussions with tedu@, beck@ and other developers.
* As reported by David Ramos, most consumer of ssl_get_message() perform latemiod2014-07-116-106/+296
| | | | | | | | | | | | | | | | | | bounds check, after reading the 2-, 3- or 4-byte size of the next chunk to process. But the size fields themselves are not checked for being entirely contained in the buffer. Since reading past your bounds is bad practice, and may not possible if you are using a secure memory allocator, we need to add the necessary bounds check, at the expense of some readability. As a bonus, a wrong size GOST session key will now trigger an error instead of a printf to stderr and it being handled as if it had the correct size. Creating this diff made my eyes bleed (in the real sense); reviewing it made guenther@'s and beck@'s eyes bleed too (in the literal sense). ok guenther@ beck@
* Provide LIBRESSL_VERSION_NUMBER for people who use such things tobeck2014-07-112-2/+4
| | | | | detect versions distinct from OPENSSL_BLAH_WOOF.. ok jsing@ tedu@ deraadt@
* Another regress test for OpenSSL PR #3397 (Joyent 7704), from agl via OpenSSLmiod2014-07-111-0/+57
| | | | RT.
* Regression test for PKCS5_PBKDF2_HMAC(), written by Christian Heimes ; frommiod2014-07-113-1/+224
| | | | OpenSSL trunk
* missing \deraadt2014-07-111-2/+2
|
* formattingbeck2014-07-111-4/+6
| | | | ok bcook@
* add comment about format requirementsbeck2014-07-111-1/+3
| | | | ok miod@
* Modify formatting to make portable's life a lot easier.beck2014-07-111-7/+6
| | | | ok miod@ bcook@
* adapt addapt spelling to adapt; request from miodderaadt2014-07-112-6/+6
|
* Huge documentation update for libcrypto and libssl, mostly from Matt Caswell,miod2014-07-11100-283/+2781
| | | | | | Jeff Trawick, Jean-Paul Calderone, Michal Bozon, Jeffrey Walton and Rich Salz, via OpenSSL trunk (with some parts not applying to us, such as SSLv2 support, at least partially removed).
* If the application uses tls_session_secret_cb for session resumption, setmiod2014-07-112-4/+6
| | | | the CCS_OK flag. From OpenSSL trunk.
* Avoid invoking EVP_CIPHER_CTX_cleanup() on uninitialized memory; frommiod2014-07-112-4/+4
| | | | Coverity via OpenSSL trunk
* Fix a memory leak in BIO_free() which no current BIO can trigger; OpenSSLmiod2014-07-112-8/+6
| | | | PR #3439 via OpenSSL trunk
* Prevent infinite loop during configuration file parsing; OpenSSL PR #2985miod2014-07-112-4/+4
| | | | via OpenSSL trunk.
* Missing bounds check in do_PVK_body(); OpenSSL RT #2277, from OpenSSL trunk,miod2014-07-112-8/+20
| | | | but without a memory leak.
* OPENSSL_ALGORITHM_DEFINES has been removed from conf.h, no need for it nowtedu2014-07-112-16/+4
|
* In RSA_eay_private_encrypt(), correctly return the smaller BN; OpenSSLmiod2014-07-112-4/+4
| | | | PR #3418 via OpenSSL trunk
* In ssl3_get_cert_verify(), allow for larger messages to accomodate keysmiod2014-07-112-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 macrostedu2014-07-112-116/+2
| | | | | 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 OpenSSLmiod2014-07-112-4/+4
| | | | trunk