openssl.git
3 years agoEnsure SSL_DEBUG works following size_t changes
Matt Caswell [Tue, 25 Oct 2016 14:29:17 +0000 (15:29 +0100)]
Ensure SSL_DEBUG works following size_t changes

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoClarify the return values for the peek functions
Matt Caswell [Tue, 25 Oct 2016 14:27:55 +0000 (15:27 +0100)]
Clarify the return values for the peek functions

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoUpdates various man pages based on review feedback received.
Matt Caswell [Fri, 21 Oct 2016 15:16:20 +0000 (16:16 +0100)]
Updates various man pages based on review feedback received.

Improvements to style, grammar etc.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoFix style issues in HMAC_size()
Matt Caswell [Fri, 21 Oct 2016 14:41:04 +0000 (15:41 +0100)]
Fix style issues in HMAC_size()

Based on review feedback.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoFix some bogus warnings about uninitialised variables
Matt Caswell [Thu, 20 Oct 2016 22:49:41 +0000 (23:49 +0100)]
Fix some bogus warnings about uninitialised variables

Travis was failing in some builds due to a bogus complaint
about uninit variables.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoFix some clashing symbol numbers due to merge conflict
Matt Caswell [Thu, 20 Oct 2016 16:27:59 +0000 (17:27 +0100)]
Fix some clashing symbol numbers due to merge conflict

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoDocument the newly added SSL functions
Matt Caswell [Thu, 20 Oct 2016 14:04:21 +0000 (15:04 +0100)]
Document the newly added SSL functions

Also document SSL_peek() which was missing from the docs.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoRemove a stray TODO that has already been fixed
Matt Caswell [Wed, 19 Oct 2016 16:37:22 +0000 (17:37 +0100)]
Remove a stray TODO that has already been fixed

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoProvide some constant time functions for dealing with size_t values
Matt Caswell [Wed, 19 Oct 2016 16:13:13 +0000 (17:13 +0100)]
Provide some constant time functions for dealing with size_t values

Also implement the using of them

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoEnsure HMAC_size() handles errors correctly
Matt Caswell [Wed, 19 Oct 2016 15:29:01 +0000 (16:29 +0100)]
Ensure HMAC_size() handles errors correctly

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoNow that we can use size_t in PACKET lets use it
Matt Caswell [Wed, 19 Oct 2016 15:28:12 +0000 (16:28 +0100)]
Now that we can use size_t in PACKET lets use it

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoFix misc size_t issues causing Windows warnings in 64 bit
Matt Caswell [Wed, 19 Oct 2016 14:11:24 +0000 (15:11 +0100)]
Fix misc size_t issues causing Windows warnings in 64 bit

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert the mac functions to just return 1 for success and 0 for failure
Matt Caswell [Wed, 19 Oct 2016 13:44:28 +0000 (14:44 +0100)]
Convert the mac functions to just return 1 for success and 0 for failure

Previously they return -1 for failure or the size of the mac. But the size
was never used anywhere.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoFix some ssl3_record code witch converstion to/from size_t
Matt Caswell [Wed, 19 Oct 2016 13:39:55 +0000 (14:39 +0100)]
Fix some ssl3_record code witch converstion to/from size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoAdd some PACKET functions for size_t
Matt Caswell [Wed, 19 Oct 2016 13:39:39 +0000 (14:39 +0100)]
Add some PACKET functions for size_t

And use them in the DTLS code

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert SSL BIO to use SSL_write_ex().
Matt Caswell [Wed, 19 Oct 2016 13:09:02 +0000 (14:09 +0100)]
Convert SSL BIO to use SSL_write_ex().

We also modify the SSL_get_error() function to handle the fact that with
SSL_write_ex() the error return is 0 not -1, and fix some bugs in the
SSL BIO reading.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoFix some missed size_t updates
Matt Caswell [Thu, 6 Oct 2016 18:17:54 +0000 (19:17 +0100)]
Fix some missed size_t updates

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoResolve some outstanding size_t related TODOs
Matt Caswell [Tue, 4 Oct 2016 20:42:28 +0000 (21:42 +0100)]
Resolve some outstanding size_t related TODOs

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoUpdate misc function params in libssl for size_t
Matt Caswell [Tue, 4 Oct 2016 20:22:19 +0000 (21:22 +0100)]
Update misc function params in libssl for size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert some libssl local functions to size_t
Matt Caswell [Tue, 4 Oct 2016 20:14:24 +0000 (21:14 +0100)]
Convert some libssl local functions to size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoUpdate cookie_len for size_t
Matt Caswell [Tue, 4 Oct 2016 20:04:03 +0000 (21:04 +0100)]
Update cookie_len for size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoUpdate numerous misc libssl fields to be size_t
Matt Caswell [Tue, 4 Oct 2016 19:56:11 +0000 (20:56 +0100)]
Update numerous misc libssl fields to be size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert session_id_length and sid_ctx_len to size_t
Matt Caswell [Tue, 4 Oct 2016 19:31:19 +0000 (20:31 +0100)]
Convert session_id_length and sid_ctx_len to size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert master_secret_size code to size_t
Matt Caswell [Mon, 3 Oct 2016 22:22:07 +0000 (23:22 +0100)]
Convert master_secret_size code to size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert various mac_secret_size usage to size_t
Matt Caswell [Mon, 3 Oct 2016 21:34:07 +0000 (22:34 +0100)]
Convert various mac_secret_size usage to size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert ssl3_cbc_digest_record for size_t
Matt Caswell [Mon, 3 Oct 2016 21:26:59 +0000 (22:26 +0100)]
Convert ssl3_cbc_digest_record for size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert some misc record layer functions for size_t
Matt Caswell [Mon, 3 Oct 2016 21:15:10 +0000 (22:15 +0100)]
Convert some misc record layer functions for size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert SSL3_RECORD_clear() and SSL3_RECORD_release() to size_t
Matt Caswell [Mon, 3 Oct 2016 20:12:23 +0000 (21:12 +0100)]
Convert SSL3_RECORD_clear() and SSL3_RECORD_release() to size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert libssl writing for size_t
Matt Caswell [Wed, 7 Sep 2016 10:34:39 +0000 (11:34 +0100)]
Convert libssl writing for size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoFurther libssl size_t-ify of reading
Matt Caswell [Tue, 6 Sep 2016 11:05:25 +0000 (12:05 +0100)]
Further libssl size_t-ify of reading

Writing still to be done

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert record layer to use size_t
Matt Caswell [Tue, 6 Sep 2016 08:24:19 +0000 (09:24 +0100)]
Convert record layer to use size_t

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoRemove an unused field in ossl_shim
Matt Caswell [Fri, 28 Oct 2016 09:09:29 +0000 (10:09 +0100)]
Remove an unused field in ossl_shim

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAdd a wildcard exception for TLS13 tests
Matt Caswell [Fri, 28 Oct 2016 09:07:44 +0000 (10:07 +0100)]
Add a wildcard exception for TLS13 tests

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoSwap header copyrights to standard OpenSSL
Matt Caswell [Fri, 28 Oct 2016 08:57:16 +0000 (09:57 +0100)]
Swap header copyrights to standard OpenSSL

As per permission from Google (Emilia).

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAdd missing bn.h include
Matt Caswell [Tue, 25 Oct 2016 21:13:17 +0000 (22:13 +0100)]
Add missing bn.h include

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoUpdate the BoringSSL suppressions file based on the latest shim
Matt Caswell [Wed, 19 Oct 2016 11:59:26 +0000 (12:59 +0100)]
Update the BoringSSL suppressions file based on the latest shim

The updated shim has the ability to skip tests using unimplemented flags.
This should reduce the number of test failures.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRename BoringSSL style OPENSSL_WINDOWS to OPENSSL_SYS_WINDOWS
Matt Caswell [Wed, 19 Oct 2016 10:37:17 +0000 (11:37 +0100)]
Rename BoringSSL style OPENSSL_WINDOWS to OPENSSL_SYS_WINDOWS

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoFix a code inconsistency
Matt Caswell [Wed, 19 Oct 2016 10:35:55 +0000 (11:35 +0100)]
Fix a code inconsistency

Move from two ifs to a single one with an &&

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRemove some #if 0'd out code
Matt Caswell [Wed, 19 Oct 2016 10:33:59 +0000 (11:33 +0100)]
Remove some #if 0'd out code

It was only a sanity check anyway, so isn't needed

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRemoved scoped_types.h
Matt Caswell [Wed, 19 Oct 2016 10:33:06 +0000 (11:33 +0100)]
Removed scoped_types.h

It is no longer used (replaced with bssl:UniquePtr)

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRemove some flags that are unused in the shim
Matt Caswell [Wed, 19 Oct 2016 10:22:07 +0000 (11:22 +0100)]
Remove some flags that are unused in the shim

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoUse the -allow-unimplemented feature of the BoringSSL runner
Matt Caswell [Wed, 19 Oct 2016 10:21:25 +0000 (11:21 +0100)]
Use the -allow-unimplemented feature of the BoringSSL runner

That way we can remove flags that we don't support

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRemove unused BoringSSL specific flags
Matt Caswell [Wed, 19 Oct 2016 10:03:38 +0000 (11:03 +0100)]
Remove unused BoringSSL specific flags

We will rely on the -allow-unimplemented feature instead.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRemove some unreferenced fields from TestState
Matt Caswell [Wed, 19 Oct 2016 09:53:25 +0000 (10:53 +0100)]
Remove some unreferenced fields from TestState

They were there for BoringSSL only features which are not relevant to us.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRemove some #if 0'd out code
Matt Caswell [Wed, 19 Oct 2016 09:52:47 +0000 (10:52 +0100)]
Remove some #if 0'd out code

It was just a sanity check and isn't needed

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoFix argument order in documentation
Matt Caswell [Sat, 15 Oct 2016 10:24:13 +0000 (11:24 +0100)]
Fix argument order in documentation

git clone has the directory name last

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRemove test/ossl_shim/Makefile
Matt Caswell [Sat, 15 Oct 2016 10:11:23 +0000 (11:11 +0100)]
Remove test/ossl_shim/Makefile

This Makefile was temporary. Building ossl_shim has now been integrated into
to the build system.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAdd documentation on the BoringSSL test suite integration
Matt Caswell [Sat, 15 Oct 2016 10:09:20 +0000 (11:09 +0100)]
Add documentation on the BoringSSL test suite integration

Added the file README.external which describes how to build and run OpenSSL
to use the BoringSSL test suite. Also updated INSTALL to point to it.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAdd -std=c++11 to CXXFLAGS
Matt Caswell [Fri, 14 Oct 2016 19:32:18 +0000 (20:32 +0100)]
Add -std=c++11 to CXXFLAGS

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoFix some unused variable warnings in ossl_shim
Matt Caswell [Fri, 14 Oct 2016 15:18:47 +0000 (16:18 +0100)]
Fix some unused variable warnings in ossl_shim

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAdd a comment to 90-test_external.t to explain why we need filter_run
Matt Caswell [Fri, 14 Oct 2016 14:55:49 +0000 (15:55 +0100)]
Add a comment to 90-test_external.t to explain why we need filter_run

Also rename executable to cmd...otherwise it breaks!

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoConvert 90-test_external.t to using "executable" rather than "system"
Richard Levitte [Fri, 14 Oct 2016 14:52:50 +0000 (15:52 +0100)]
Convert 90-test_external.t to using "executable" rather than "system"

Use the newly added "executable" function rather than "system". Also filter
the output to add a prefix to every line so that the "ok" doesn't confuse
Test::More

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoControl building of ossl_shim through Configure
Matt Caswell [Wed, 12 Oct 2016 15:21:13 +0000 (16:21 +0100)]
Control building of ossl_shim through Configure

Don't build ossl_shim by default. Switch it on through
enable-external-tests.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoIntegrate ossl_shim into the build
Richard Levitte [Wed, 12 Oct 2016 15:05:06 +0000 (16:05 +0100)]
Integrate ossl_shim into the build

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoAdd a shim config file
Matt Caswell [Wed, 12 Oct 2016 14:43:46 +0000 (15:43 +0100)]
Add a shim config file

This just disables all tests that fail at the moment. Over time we will
want to go over these and figure out why they are failing (and fix them if
appropriate)

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAdd ossl_shim to .gitignore
Matt Caswell [Wed, 12 Oct 2016 11:07:33 +0000 (12:07 +0100)]
Add ossl_shim to .gitignore

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRebase shim against latest boringssl code
Matt Caswell [Wed, 12 Oct 2016 09:56:29 +0000 (10:56 +0100)]
Rebase shim against latest boringssl code

Numerous conflicts resolved. rebase was against commit 490469f850.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAdd a test to call the BoringSSL test suite
Matt Caswell [Mon, 10 Oct 2016 11:24:00 +0000 (12:24 +0100)]
Add a test to call the BoringSSL test suite

This adds a test to the OpenSSL test suite to invoke the BoringSSL test
suite.

It assumes you have already compiled the ossl_shim (see previous commit).
It also assumes that you have an environment variable BORING_RUNNER_DIR
set up to point to the ssl/test/runner directory of a checkout of BoringSSL.

This has only been tested with a very old version of BoringSSL (from commit
f277add6c) - since that was the last known checkout where the shim compiles
successfully. Even with that version of BoringSSL this test will fail. There
are lots of Boring tests that are failing for various reasons. Some might
be due to bugs in OpenSSL, some might be due to features that BoringSSL has
that OpenSSL doesn't, some are due to assumptions about the way BoringSSL
behaves that are not true for OpenSSL etc.

To get the verbose BoringSSL test output, run like this:

VERBOSE=1 BORING_RUNNER_DIR=/path/to/boring/ssl/test/runner make \
TESTS="test_external" test

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoIntegrate BoringSSL shim
Matt Caswell [Mon, 10 Oct 2016 11:17:21 +0000 (12:17 +0100)]
Integrate BoringSSL shim

The BoringSSL test suite contains numerous tests which OpenSSL does not.

The BoringSSL test runner uses a shim to launch the library and execute the
tests. This is a version of the BoringSSL shim converted to compile against
OpenSSL instead.

This is primarily based on the work of David Benjamin from the BoringSSL
project who did most of the necessary conversion. It also includes a few
other tweaks for opacity changes etc.

This is based on a *very* old version of BoringSSL from commit f277add6c.
That was the last commit known to work with this patched shim. Later
versions may also work but lots of merge conflicts occur when trying to
bring it up to date.

At the moment this has not been integrated into the build system. There is
a very simple standalone makefile in the ossl_shim directory which should
be executed directly before tyring to use the shim.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoDon't assume to know the shared library extension
Richard Levitte [Thu, 3 Nov 2016 17:48:23 +0000 (18:48 +0100)]
Don't assume to know the shared library extension

test/shlibloadtest.c assumes all Unix style platforms use .so as
shared library extension.  This is not the case for Mac OS X, which
uses .dylib.  Instead of this, have the test recipe find out the
extension from configuration data.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1844)

3 years agoUpdate CRYPTO_set_mem_debug() doc
Rich Salz [Thu, 3 Nov 2016 17:16:26 +0000 (13:16 -0400)]
Update CRYPTO_set_mem_debug() doc

Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1842)

3 years agoEnable memory debugging while testing
Richard Levitte [Thu, 3 Nov 2016 16:08:10 +0000 (17:08 +0100)]
Enable memory debugging while testing

Pre 1.1.0, 'make test' would set the environment variable
OPENSSL_DEBUG_MEMORY to "on".  This got lost when translating the old
build files to the new templates.  This changes reintroduces that
variable.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1840)

3 years agotest/shlibloadtest: small fixes
Richard Levitte [Thu, 3 Nov 2016 15:21:36 +0000 (16:21 +0100)]
test/shlibloadtest: small fixes

- Make sure to initialise SHLIB variables
- Make sure to make local variables static

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1838)

3 years agoClang doesn't like -znodelete, make it a linker flag instead
Richard Levitte [Thu, 3 Nov 2016 14:26:00 +0000 (15:26 +0100)]
Clang doesn't like -znodelete, make it a linker flag instead

gcc is kinder, it silently passes quite a few flags to ld, while clang
is stricter and wants them prefixed with -Wl,

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1836)

3 years agoClean away remaining 'selftest' code
Richard Levitte [Fri, 28 Oct 2016 19:41:12 +0000 (21:41 +0200)]
Clean away remaining 'selftest' code

All of these don't compile cleanly any more, probably haven't for quite
some time

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)

3 years agoFinally, add a test recipe for the internal tests
Richard Levitte [Thu, 27 Oct 2016 21:25:09 +0000 (23:25 +0200)]
Finally, add a test recipe for the internal tests

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)

3 years agoConvert mdc2 test print to internal test
Richard Levitte [Thu, 27 Oct 2016 20:18:50 +0000 (22:18 +0200)]
Convert mdc2 test print to internal test

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)

3 years agoConvert x509 selftests to internal test
Richard Levitte [Thu, 27 Oct 2016 19:42:45 +0000 (21:42 +0200)]
Convert x509 selftests to internal test

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)

3 years agoAdd a HEADER_MODES_H guard in include/openssl/modes.h
Richard Levitte [Thu, 27 Oct 2016 23:32:33 +0000 (01:32 +0200)]
Add a HEADER_MODES_H guard in include/openssl/modes.h

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)

3 years agoConvert modes selftests (cts128 and gcm128) to internal test
Richard Levitte [Thu, 27 Oct 2016 17:57:41 +0000 (19:57 +0200)]
Convert modes selftests (cts128 and gcm128) to internal test

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)

3 years agoConvert asn1 selftests (a_strnid and ameth_lib) into internal test
Richard Levitte [Wed, 26 Oct 2016 21:12:48 +0000 (23:12 +0200)]
Convert asn1 selftests (a_strnid and ameth_lib) into internal test

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)

3 years agoVMS: ignore multiply defined symbols when linking programs
Richard Levitte [Wed, 26 Oct 2016 20:31:29 +0000 (22:31 +0200)]
VMS: ignore multiply defined symbols when linking programs

The Unix and Windows linkers appear to simply ignore if any symbol is
defined multiple times in different object files and libraries.

The VMS linker, on the other hand, warns about it, loud and clear.  It
will still create the executable, but does so screaming.  So we
complicate things by saving the linker output, look through all the
errors and warnings, and if they are only made up of %LINK-W-MULDEF,
we let it pass, otherwise we output the linker output and raise the
same exit code we got from the linker.

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)

3 years agoExplain the deal with internal test programs
Richard Levitte [Thu, 27 Oct 2016 06:44:36 +0000 (08:44 +0200)]
Explain the deal with internal test programs

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)

3 years agoAllow indented comments in build.info
Richard Levitte [Tue, 25 Oct 2016 10:40:32 +0000 (12:40 +0200)]
Allow indented comments in build.info

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)

3 years agoConvert poly1305 selftest into internal test
Richard Levitte [Tue, 25 Oct 2016 22:25:44 +0000 (00:25 +0200)]
Convert poly1305 selftest into internal test

Reviewed-by: Emilia Käsper <emilia@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1789)

3 years agotest/build.info: typo, $ missing
Richard Levitte [Thu, 3 Nov 2016 10:31:12 +0000 (11:31 +0100)]
test/build.info: typo, $ missing

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1832)

3 years agoconf fuzzer: also check for an empty file
Kurt Roeckx [Wed, 2 Nov 2016 19:45:46 +0000 (20:45 +0100)]
conf fuzzer: also check for an empty file

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
GH: #1828

3 years agoImplement GET_MODULE_HANDLE_EX_FLAG_PIN for windows
Matt Caswell [Fri, 28 Oct 2016 10:03:22 +0000 (11:03 +0100)]
Implement GET_MODULE_HANDLE_EX_FLAG_PIN for windows

Rather than leaking a reference, just call GetModuleHandleEx and pin the
module on Windows.

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoLink using -znodelete
Matt Caswell [Tue, 18 Oct 2016 14:11:57 +0000 (15:11 +0100)]
Link using -znodelete

Instead of deliberately leaking a reference to ourselves, use nodelete
which does this more neatly. Only for Linux at the moment.

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoAdd a test to dynamically load and unload the libraries
Matt Caswell [Tue, 18 Oct 2016 13:16:35 +0000 (14:16 +0100)]
Add a test to dynamically load and unload the libraries

This should demonstrate that the atexit() handling is working properly (or
at least not crashing) on process exit.

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoEnsure that libcrypto and libssl do not unload until the process exits
Matt Caswell [Tue, 18 Oct 2016 13:13:25 +0000 (14:13 +0100)]
Ensure that libcrypto and libssl do not unload until the process exits

Because we use atexit() to cleanup after ourselves, this will cause a
problem if we have been dynamically loaded and then unloaded again: the
atexit() handler may no longer be there.

Most modern atexit() implementations can handle this, however there are
still difficulties if libssl gets unloaded before libcrypto, because of
the atexit() callback that libcrypto makes to libssl.

The most robust solution seems to be to ensure that libcrypto and libssl
never unload. This is done by simply deliberately leaking a dlopen()
reference to them.

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoAdd a DSO_dsobyaddr() function
Matt Caswell [Sat, 15 Oct 2016 15:01:40 +0000 (16:01 +0100)]
Add a DSO_dsobyaddr() function

This works the same way as DSO_pathbyaddr() but instead returns a ptr to
the DSO that contains the provided symbol.

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoPartial revert of 3d8b2ec42 to add back DSO_pathbyaddr
Matt Caswell [Sat, 15 Oct 2016 14:23:03 +0000 (15:23 +0100)]
Partial revert of 3d8b2ec42 to add back DSO_pathbyaddr

Commit 3d8b2ec42 removed various unused functions. However now we need to
use one of them! This commit resurrects DSO_pathbyaddr(). We're not going to
resurrect the Windows version though because what we need to achieve can be
done a different way on Windows.

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoAdd a CHANGES entry for the unrecognised record type change
Matt Caswell [Wed, 2 Nov 2016 22:23:16 +0000 (22:23 +0000)]
Add a CHANGES entry for the unrecognised record type change

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoAdd a test for unrecognised record types
Matt Caswell [Wed, 2 Nov 2016 09:41:37 +0000 (09:41 +0000)]
Add a test for unrecognised record types

We should fail if we receive an unrecognised record type

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoFail if an unrecognised record type is received
Matt Caswell [Wed, 2 Nov 2016 09:14:51 +0000 (09:14 +0000)]
Fail if an unrecognised record type is received

TLS1.0 and TLS1.1 say you SHOULD ignore unrecognised record types, but
TLS 1.2 says you MUST send an unexpected message alert. We swap to the
TLS 1.2 behaviour for all protocol versions to prevent issues where no
progress is being made and the peer continually sends unrecognised record
types, using up resources processing them.

Issue reported by 郭志攀

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoTest recipes: remove duplicate OpenSSL::Test usage
Richard Levitte [Tue, 1 Nov 2016 14:03:38 +0000 (15:03 +0100)]
Test recipes: remove duplicate OpenSSL::Test usage

Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1815)

3 years agoFix link to LibFuzzer
Sergey Bronnikov [Fri, 28 Oct 2016 18:52:50 +0000 (22:52 +0400)]
Fix link to LibFuzzer

CLA: trivial
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1801)

3 years agoAdd a read_ahead test
Matt Caswell [Wed, 2 Nov 2016 10:44:15 +0000 (10:44 +0000)]
Add a read_ahead test

This test checks that read_ahead works correctly when dealing with large
records.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoFix read_ahead
Matt Caswell [Wed, 2 Nov 2016 10:34:12 +0000 (10:34 +0000)]
Fix read_ahead

The function ssl3_read_n() takes a parameter |clearold| which, if set,
causes any old data in the read buffer to be forgotten, and any unread data
to be moved to the start of the buffer. This is supposed to happen when we
first read the record header.

However, the data move was only taking place if there was not already
sufficient data in the buffer to satisfy the request. If read_ahead is set
then the record header could be in the buffer already from when we read the
preceding record. So with read_ahead we can get into a situation where even
though |clearold| is set, the data does not get moved to the start of the
read buffer when we read the record header. This means there is insufficient
room in the read buffer to consume the rest of the record body, resulting in
an internal error.

This commit moves the |clearold| processing to earlier in ssl3_read_n()
to ensure that it always takes place.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAdd documentation for DTLS_get_data_mtu()
David Woodhouse [Sun, 23 Oct 2016 16:03:56 +0000 (17:03 +0100)]
Add documentation for DTLS_get_data_mtu()

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoAdd test cases for DTLS_get_data_mtu()
David Woodhouse [Wed, 12 Oct 2016 15:13:31 +0000 (16:13 +0100)]
Add test cases for DTLS_get_data_mtu()

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoAdd unit test for ssl_cipher_get_overhead()
David Woodhouse [Thu, 6 Oct 2016 10:44:29 +0000 (11:44 +0100)]
Add unit test for ssl_cipher_get_overhead()

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoAdd DTLS_get_data_mtu() function
David Woodhouse [Wed, 5 Oct 2016 23:44:59 +0000 (00:44 +0100)]
Add DTLS_get_data_mtu() function

We add ssl_cipher_get_overhead() as an internal function, to avoid
having too much ciphersuite-specific knowledge in DTLS_get_data_mtu()
itself. It's going to need adjustment for TLSv1.3... but then again, so
is fairly much *all* of the SSL_CIPHER handling. This bit is in the noise.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoFix some style issues in ossltest
Matt Caswell [Tue, 1 Nov 2016 18:28:19 +0000 (18:28 +0000)]
Fix some style issues in ossltest

Based on feedback received

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoEnable TLSProxy to talk TLS1.3
Matt Caswell [Fri, 28 Oct 2016 14:57:12 +0000 (15:57 +0100)]
Enable TLSProxy to talk TLS1.3

Now that ossltest knows about a TLS1.3 cipher we can now do TLS1.3 in
TLSProxy

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoMake sure ossltest engine works with TLS1.3
Matt Caswell [Thu, 27 Oct 2016 17:32:36 +0000 (18:32 +0100)]
Make sure ossltest engine works with TLS1.3

This might need more changes once we do a "real" TLS1.3 ciphersuite. But it
should do for now.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConvert a big "if" into a "switch"
Matt Caswell [Mon, 31 Oct 2016 10:00:45 +0000 (10:00 +0000)]
Convert a big "if" into a "switch"

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoUpdate Configure to know about tls1_3
Matt Caswell [Sun, 30 Oct 2016 08:38:52 +0000 (08:38 +0000)]
Update Configure to know about tls1_3

Also we disable TLS1.3 by default (use enable-tls1_3 to re-enable). This is
because this is a WIP and will not be interoperable with any other TLS1.3
implementation.

Finally, we fix some tests that started failing when TLS1.3 was disabled by
default.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoUse ciphersuite id when matching if we've got one
Matt Caswell [Wed, 2 Nov 2016 11:52:22 +0000 (11:52 +0000)]
Use ciphersuite id when matching if we've got one

When matching a ciphersuite if we are given an id, make sure we use it
otherwise we will match another ciphersuite which is identical except for
the TLS version.

Reviewed-by: Rich Salz <rsalz@openssl.org>