aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2016-03-08Convert CRYPTO_LOCK_UI to new multi-threading APIAlessandro Ghedini4-3/+13
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Convert CRYPTO_LOCK_EC_* to new multi-threading APIAlessandro Ghedini9-20/+128
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Convert CRYPTO_LOCK_EVP_PKEY to new multi-threading APIAlessandro Ghedini9-14/+31
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Convert CRYPTO_LOCK_BIO to new multi-threading APIAlessandro Ghedini5-14/+46
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Only enable ccache if it's availableRichard Levitte1-1/+3
Reviewed-by: Emilia Käsper <emilia@openssl.org>
2016-03-08Use ccache for the unified buildsRichard Levitte1-0/+3
This may speed up our builds considerably Reviewed-by: Emilia Käsper <emilia@openssl.org>
2016-03-08For unified builds, make a separate build directory and build thereRichard Levitte1-5/+16
Reviewed-by: Emilia Käsper <emilia@openssl.org>
2016-03-08SPARCv9 assembly pack: unify build rules and argument handling.Andy Polyakov33-100/+119
Make all scripts produce .S, make interpretation of $(CFLAGS) pre-processor's responsibility, start accepting $(PERLASM_SCHEME). [$(PERLASM_SCHEME) is redundant in this case, because there are no deviataions between Solaris and Linux assemblers. This is purely to unify .pl->.S handling across all targets.] Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-03-08Fix build; ssltestRich Salz1-3/+3
Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-03-08Tweak some more information in INSTALLRichard Levitte1-6/+11
The summary on how to add configs and how Makefile et al wasn't quite correct any more. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08GH787: Fix ALPNTodd Short2-7/+10
* Perform ALPN after the SNI callback; the SSL_CTX may change due to that processing * Add flags to indicate that we actually sent ALPN, to properly error out if unexpectedly received. * clean up ssl3_free() no need to explicitly clear when doing memset * document ALPN functions Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Add an SSL_has_pending() functionMatt Caswell1-5/+0
This is similar to SSL_pending() but just returns a 1 if there is data pending in the internal OpenSSL buffers or 0 otherwise (as opposed to SSL_pending() which returns the number of bytes available). Unlike SSL_pending() this will work even if "read_ahead" is set (which is the case if you are using read pipelining, or if you are doing DTLS). A 1 return value means that we have unprocessed data. It does *not* necessarily indicate that there will be application data returned from a call to SSL_read(). The unprocessed data may not be application data or there could be errors when we attempt to parse the records. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Add an ability to set the SSL read buffer sizeMatt Caswell1-0/+5
This capability is required for read pipelining. We will only read in as many records as will fit in the read buffer (and the network can provide in one go). The bigger the buffer the more records we can process in parallel. Reviewed-by: Tim Hudson <tjh@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Add cipher query functionsTodd Short9-7/+242
Add functions to determine authentication, key-exchange, FIPS and AEAD. Reviewed-by: Emilia Käsper <emilia@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Convert ERR_STRING_DATA to new multi-threading APIAlessandro Ghedini2-23/+39
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Convert ERR_STATE to new multi-threading APIAlessandro Ghedini7-190/+48
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Convert CRYPTO_LOCK_EX_DATA to new multi-threading APIAlessandro Ghedini2-8/+20
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Convert CRYPTO_LOCK_DSO to new multi-threading APIAlessandro Ghedini3-11/+28
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Convert CRYPTO_LOCK_{DH,DSA,RSA} to new multi-threading APIAlessandro Ghedini12-55/+79
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08Convert CRYPTO_LOCK_GET*BYNAME to new multi-threading APIAlessandro Ghedini2-6/+13
Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-08GH815: The ChaCha20/Poly1305 codepoints are officialBenjamin Kaduk1-1/+1
CCA8, CCA9, CCAA, CCAB, CCAC, CCAD, and CCAE are now present in https://www.iana.org/assignments/tls-parameters/tls-parameters.xhtml so remove the "as per draft-ietf-tls-chacha20-poly1305-03" note accordingly. Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Matt Caswell <matt@openssl.org>
2016-03-08GH787: Fix ALPNTodd Short13-151/+432
* Perform ALPN after the SNI callback; the SSL_CTX may change due to that processing * Add flags to indicate that we actually sent ALPN, to properly error out if unexpectedly received. * clean up ssl3_free() no need to explicitly clear when doing memset * document ALPN functions Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Emilia Käsper <emilia@openssl.org>
2016-03-08Make mk1mf recognise the --classic flagRichard Levitte1-0/+1
Reviewed-by: Matt Caswell <matt@openssl.org>
2016-03-08Fix configurations such as 'dist' and tar buildingRichard Levitte3-6/+10
For config targets such as 'dist', which doesn't have a BASE template, we still need to have a default build scheme. Additionally, the unified Makefile template's target 'tar' wasn't quite as flexible as the unixmake one. Finally, .travis-create-release.sh can be somewhat simplified now that it builds with the unified build scheme. Reviewed-by: Matt Caswell <matt@openssl.org>
2016-03-08We've switch to unified build scheme by default, reflect it in travisRichard Levitte1-2/+2
We want to preserve a couple of classic builds still, the quickest is to change all --unified to --classic Reviewed-by: Matt Caswell <matt@openssl.org>
2016-03-08Fix engine/asm/e_padlock-x86.pl for newer semanticsRichard Levitte1-0/+5
Reviewed-by: Andy Polyakov <appro@openssl.org>
2016-03-08Change the INSTALL documentation for unified buildsRichard Levitte3-213/+235
Because of the unified scheme, building on different platforms is very similar. We currently have Unix and OpenVMS on the unified scheme, which means that a separate INSTALL.VMS is no longer needed. Reviewed-by: Matt Caswell <matt@openssl.org>
2016-03-08Make unified builds the default on UnixRichard Levitte1-4/+1
Reviewed-by: Matt Caswell <matt@openssl.org>
2016-03-08Add the Configure option --classic, to fall back on classic build schemesRichard Levitte1-1/+23
Reviewed-by: Matt Caswell <matt@openssl.org>
2016-03-08Revert "unified build scheme: Try to nudge users to try the "unified" build"Richard Levitte1-49/+1
This reverts commit 242ffb05a2e4aa3fc7ffc131037e077b7e242189. Reviewed-by: Matt Caswell <matt@openssl.org>
2016-03-08Fix building without multiblock supportMatt Caswell2-2/+3
Not all platforms support multiblock. Building without it fails prior to this fix. RT#4396 Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-03-07Don't free NCONF obtained valuesViktor Dukhovni1-9/+15
Bug reported by Michel Sales. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-07Remove kinv/r fields from DSA structure.Dr. Stephen Henson3-14/+2
The kinv/r fields in the DSA structure are not used by OpenSSL internally and should not be used in general. Reviewed-by: Rich Salz <rsalz@openssl.org>
2016-03-07GH812: Fix for no-ui build on WindowsMat1-0/+2
Add UI to known algorithms in mkdef.pl Signed-off-by: Rich Salz <rsalz@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org>
2016-03-07AppVeyor: Only use the latest VS versionKurt Roeckx1-13/+0
Reviewed-by: Rich Salz <rsalz@openssl.org> GH: #811
2016-03-07Rename the numpipes argument to ssl3_enc/tls1_encMatt Caswell2-22/+25
The numpipes argument to ssl3_enc/tls1_enc is actually the number of records passed in the array. To make this clearer rename the argument to |n_recs|. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Rename a functionMatt Caswell1-2/+2
Rename the have_whole_app_data_record_waiting() function to include the ssl3_record prefix...and make it a bit shorter. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Refactor dasync cipher implementations to improve code reuseMatt Caswell1-144/+97
Move out most of the boiler plate code that is common between aes128-cbc and aes128-cbc-hmac-sha1 into helper functions to improve code reuse. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Move the _hidden_* static variables in dasync to be constructed in bindMatt Caswell1-61/+83
The _hidden_* variables were being created on-the-fly. It is better to create them once up front during bind to avoid any potential race conditions. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Fix typo in SSL_pending docsMatt Caswell1-1/+1
Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Rename EVP_CIPHER_CTX_cipher_data to EVP_CIPHER_CTX_get_cipher_dataMatt Caswell18-47/+4790
We had the function EVP_CIPHER_CTX_cipher_data which is newly added for 1.1.0. As we now also need an EVP_CIPHER_CTX_set_cipher_data it makes more sense for the former to be called EVP_CIPHER_CTX_get_cipher_data. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Fix s_server/s_client handling of the split_send_frag argumentMatt Caswell2-4/+10
Ensure that a value of 0 is correctly handled for the split_send_frag argument. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Add documentation for the EVP_CIPHER_CTX_cipher_data functionsMatt Caswell1-0/+41
The new pipeline code added a new function EVP_CIPHER_CTX_set_cipher_data(). Add documentation for this and the existing EVP_CIPHER_CTX_cipher_data() function. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Remove the wrec record layer fieldMatt Caswell4-32/+25
We used to use the wrec field in the record layer for keeping track of the current record that we are writing out. As part of the pipelining changes this has been moved to stack allocated variables to do the same thing, therefore the field is no longer needed. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Update a commentMatt Caswell1-2/+2
Update a comment that was out of date due to the pipelining changes Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Add documentation for new s_server/s_client optionsMatt Caswell4-2/+54
Document the new split_send_frag, max_pipelines and read_buf options. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Add documentation for SSL_has_pending()Matt Caswell3-24/+44
A previous commit added the SSL_has_pending() function which provides a method for knowing whether OpenSSL has buffered, but as yet unprocessed record data. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Add pipelining documentationMatt Caswell1-0/+126
Add some documentation for all of the SSL/SSL_CTX functions/ctrls for conrolling read and write pipelining. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Fix erroneous fall thgrough in switch statementMatt Caswell1-0/+2
Fix an erroenous fall through when setting the max_pipelines value. Reviewed-by: Tim Hudson <tjh@openssl.org>
2016-03-07Ensure s_client and s_server work when read_ahead is setMatt Caswell2-3/+3
Previously s_client and s_server relied on using SSL_pending() which does not take into account read_ahead. For read pipelining to work, read_ahead gets set automatically. Therefore s_client and s_server have been converted to use SSL_has_pending() instead. Reviewed-by: Tim Hudson <tjh@openssl.org>