summaryrefslogtreecommitdiff
path: root/src/lib/libc/stdlib/merge.c (unfollow)
Commit message (Collapse)AuthorFilesLines
2014-05-27Fix ia64 cross-gcc target.tobiasu2-0/+6
opensslconf.h is just a dummy, we're lightyears away from working userspace. ok deraadt@
2014-05-26Replace the following logic:miod4-68/+98
if (nothing to allocate) ptr = malloc(1) else { if ((ptr = malloc(size to allocate)) memcpy(ptr, data to copy, size to allocate) } if (ptr == NULL) OMG ERROR with a saner logic where the NULL pointer check if moved to the actual malloc branch, so that we do not need to malloc a single byte, just to avoid having a NULL pointer. Whoever thought allocating a single byte was a smart idea was obviously not taking his meds. ok beck@ guenther@
2014-05-26Unchecked malloc() return value in SSL_COMP_add_compression_method(), in themiod2-0/+8
!OPENSSL_NO_COMP case. Does not affect OpenBSD as we compile the opposite code path.
2014-05-26We don't really to keep history in constructs such as:miod4-24/+2
#if 1 /* new with openssl 0.9.4 */ current code; #else obsolete code; #endif
2014-05-26tls_decrypt_ticket(): memory leak and uncleaned EVP_CIPHER_CTX upon error.miod2-2/+8
2014-05-26Make sure all error paths in dtls1_buffer_record() invoke SSLErr bymiod2-40/+24
factoring error handling. ok jsing@
2014-05-26There is no need to include <openssl/e_os2.h> here, except for the factjsing5-5/+2
that it brings in <openssl/opensslconf.h>, so just do that instead (currently via apps.h).
2014-05-26Update the aead regress to work with the improved EVP AEAD API.jsing1-22/+14
2014-05-26Implement an improved version of the EVP AEAD API. Thejsing10-212/+218
EVP_AEAD_CTX_{open,seal} functions previously returned an ssize_t that was overloaded to indicate success/failure, along with the number of bytes written as output. This change adds an explicit *out_len argument which is used to return the number of output bytes and the return value is now an int that is purely used to identify success or failure. This change effectively rides the last libcrypto crank (although I do not expect there to be many users of the EVP AEAD API currently). Thanks to Adam Langley for providing the improved code that this diff is based on. ok miod@
2014-05-26Use C99 initialisers for BIO_METHOD.jsing2-18/+18
2014-05-26KNF.jsing6-720/+958
2014-05-26repair some KNF missed by the script; ok jsingderaadt2-12/+20
2014-05-26KNF.jsing14-1076/+1312
2014-05-26KNF.jsing12-2886/+3110
2014-05-26move all stats collecting under MALLOC_STATS; ok krw@otto1-28/+33
2014-05-25Fix resource descriptor leaks.logan1-0/+4
CID: 966576 & 966577 OK from guenther@ and "Yup. looks good." from tedu@
2014-05-25-noout mentions a CRL, which is incorrect. Use "no output of encoded sessionlogan1-1/+1
info." instead. From Martin Kaiser. OK from tedu@
2014-05-25heartbearts->heartbeats fixlogan2-2/+2
From Marcos Marado: OK from tedu@
2014-05-25calloc instead of malloc/memset. from Benjamin Baiertedu26-80/+42
2014-05-25"for every change..."tedu2-2/+2
2014-05-25remove OPENSSL_memcmp before somebody tries to use it. ok beck miodtedu2-12/+0
2014-05-25remove OPENSSL_isservice. not used internally, no sane posix software willtedu2-12/+0
call it, and windows service software can figure this out on its own. ok beck miod
2014-05-25remove unused shit. from Alexander Schrijvertedu8-42/+4
2014-05-25define LIBRESSL_INTERNAL, and use it to hide the bad stuff from ourselvestedu4-4/+8
ok beck
2014-05-25Remove TLS_DEBUG, SSL_DEBUG, CIPHER_DEBUG and OPENSSL_RI_DEBUG. Much ofjsing18-296/+0
this is sporadic, hacked up and can easily be put back in an improved form should we ever need it. ok miod@
2014-05-25There is little interest in supporting Watt-32 TCP/IP debugging. Forderaadt1-7/+0
reference, check out http://www.watt-32.net/ ok jsing
2014-05-25Turn off MemCheck_on and MemCheck_off. These calls are pointless since thejsing4-30/+6
crypto memory debugging code has been castrated. ok miod@ "kill it" beck@
2014-05-25The ssl_ciper_get_evp() function is currently overloaded to also return thejsing13-62/+107
compression associated with the SSL session. Based on one of Adam Langley's chromium diffs, factor out the compression handling code into a separate ssl_cipher_get_comp() function. Rewrite the compression handling code to avoid pointless duplication and so that failures are actually returned to and detectable by the caller. ok miod@
2014-05-25Whitespace fixes to align define values.jsing2-170/+172
2014-05-24In ssl_cipher_get_evp(), fix off-by-one in index validation before accessingmiod2-4/+4
arrays. "kind of scary" deraadt@, ok guenther@
2014-05-24I'm so sorry to learn that the Diab compiler can't (or used not to) parse Cmiod2-10/+2
code. Remove workaround.
2014-05-24Use C99 initialisers for SSL3_ENC_METHOD structs.jsing8-108/+126
ok miod@
2014-05-24Remove the _shadow_ indirection, which is unnecessary in a world withoutjsing6-14/+8
OPENSSL_EXPORT_VAR_AS_FUNCTION. ok miod@
2014-05-24KNF.jsing30-4436/+3826
2014-05-24More KNF.jsing2-4/+4
2014-05-24Add the RFC 7027 test vectors; from OpenSSL HEADmiod1-0/+171
2014-05-24KNF.jsing8-182/+182
2014-05-24Enable three brainpool elliptic curves for TLS, as specified in RFC 7027;miod2-2/+26
from OpenSSL HEAD. ok beck@ deraadt@ jsing@
2014-05-24Code using malloc() in ssl23_get_client_hello() got removed 12 years ago,miod2-64/+54
it's time to remove the test for a possible need to free(). ok jsing@
2014-05-24Use sizeof(cryptopro_ext) instead of 36 when applicable.miod2-8/+8
ok jsing@
2014-05-24Invoke OPENSSL_cleanse() with the size of the variable you are cleaning.miod2-2/+2
ok jsing@
2014-05-24We have shared global variables - unifdef OPENSSL_EXPORT_VAR_AS_FUNCTION.jsing5-146/+0
ok miod@ beck@
2014-05-24Move ssltest.c to a regress test.jsing7-0/+330
2014-05-24remove OPENSSL_malloc and CRYPTO_malloc goo from the regress tests.beck6-77/+22
ok miod@ jsing@ guenther@
2014-05-24make this compile again - actually include stdio and friends ourselves.beck1-1/+3
2014-05-24Move the regress tests that are in lib/libssl to usr.sbin/openssl,jsing8-245/+0
since they are really testing openssl(1) (although this also tests libcrypto and libssl), rather than actual parts of the libssl library. Discussed with miod@
2014-05-24Expand the OPENSSL_.*GLOBAL.* macros and stop including e_os2.h.jsing6-16/+14
ok miod@ beck@
2014-05-24Include <openssl/opensslconf.h> - currently ssl.h is relying on it beingjsing2-2/+4
pulled in elsewhere, even though it is makes use of the OPENSSL_NO_* defines. While here, remove kssl.h since it is a no-op. ok beck@ miod@
2014-05-24DeIMPLEMENT libssl. Expand the IMPLEMENT_* macros since it is far morejsing24-412/+1308
readable and one less layer of abstraction. Use C99 initialisers for clarity, grepability and to protect from future field reordering/removal. ok miod@ (tedu@ also thought it was a wonderful idea, beck@ also agreed, but ran away squealing since it reminded him of the VOP layer...)
2014-05-24Another e_os2.h -> opensslconf.h.jsing2-2/+6