oweals/openssl.git
8 years agoFix memory leaks in tls_decrypt_ticket
Matt Caswell [Sat, 13 Feb 2016 23:22:45 +0000 (23:22 +0000)]
Fix memory leaks in tls_decrypt_ticket

Certain code paths in tls_decrypt_ticket could return early without first
freeing the HMAC_CTX or the EVP_CIPHER_CTX.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoGH706: Use NULL for pointer compare.
Zhao Junwang [Thu, 18 Feb 2016 13:59:32 +0000 (21:59 +0800)]
GH706: Use NULL for pointer compare.

As handshake_func is a function pointer, it should compare to NULL

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agotypo
Dr. Stephen Henson [Thu, 18 Feb 2016 02:49:14 +0000 (02:49 +0000)]
typo

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoRemove "experimental" in code and comments, too.
Rich Salz [Wed, 10 Feb 2016 16:10:39 +0000 (11:10 -0500)]
Remove "experimental" in code and comments, too.

Thanks to Viktor for additional review.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoIn the unified scheme, there is no $(TOP), use $(SRCDIR) instead
Richard Levitte [Wed, 17 Feb 2016 23:27:04 +0000 (00:27 +0100)]
In the unified scheme, there is no $(TOP), use $(SRCDIR) instead

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoFix spelling
Richard Levitte [Wed, 17 Feb 2016 23:32:13 +0000 (00:32 +0100)]
Fix spelling

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoFix spelling
Richard Levitte [Wed, 17 Feb 2016 23:11:18 +0000 (00:11 +0100)]
Fix spelling

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoAdd -lresolv to the Solaris ex_libs
Richard Levitte [Wed, 17 Feb 2016 23:07:54 +0000 (00:07 +0100)]
Add -lresolv to the Solaris ex_libs

The reason is that we use hstrerror() and other resolver functions.

Reporter: Erik Forsberg <erik@efca.com>

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoFinish 02f7114a7fbb3f3ac171bae87be8c13bc69e4005
David Woodhouse [Wed, 17 Feb 2016 22:04:47 +0000 (17:04 -0500)]
Finish 02f7114a7fbb3f3ac171bae87be8c13bc69e4005

Reviewed-by: Tim Hudson <tjh@openssl.org>
8 years agoGet conditional priorities right
Richard Levitte [Wed, 17 Feb 2016 21:23:09 +0000 (22:23 +0100)]
Get conditional priorities right

"or" has lower priority than "||" and works better to have Perl less
confused.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoBe more verbose when debugging is on
Richard Levitte [Wed, 17 Feb 2016 21:04:54 +0000 (22:04 +0100)]
Be more verbose when debugging is on

It's near impossible to figure out what goes wrong with the execution
of sub-commands otherwise.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoRT3628: Allow filenames to be eliminated from compiled library
David Woodhouse [Thu, 30 Jul 2015 10:45:25 +0000 (11:45 +0100)]
RT3628: Allow filenames to be eliminated from compiled library

Although I explicitly don't care about the tinfoil-hat reason given in
the initial opening of RT#3628, that "paths usually contain private
information", there *are* situations where it's useful to eliminate the
filenames from the compiled binary.

The two reasons we do care about in the context of firmware such as EDK2
are that it allows for a smaller footprint, and it is also a necessary
component of a binary-reproducible build.

To that end, introduce OPENSSL_FILE and OPENSSL_LINE macros, defining
them to __FILE__ and __LINE__ respectively in the normal case, but to
"" and 0 when OPENSSL_NO_FILENAMES is set.

This is mostly a naïve invocation of
 $ sed 's/__\([FL]I[NL]E\)__/OPENSSL_\1/g' -i `git grep -l __LINE__`
but with a few instances change to just print the function name instead
(although those probably need to die anyway) and test cases left untouched.

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
8 years agoWhen someone configures an out-of-source build, switch to unified
Richard Levitte [Wed, 17 Feb 2016 02:23:04 +0000 (03:23 +0100)]
When someone configures an out-of-source build, switch to unified

For example, this works instead of giving a big error message (note
the lack of '--unified'):

    mkdir ../_build
    (cd ../_build/; ../openssl-src/config; make)

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoFix check of -DOPENSSL_USE_APPLINK in $config{cflags}
Richard Levitte [Tue, 16 Feb 2016 22:27:13 +0000 (23:27 +0100)]
Fix check of -DOPENSSL_USE_APPLINK in $config{cflags}

The previous fix wasn't right.

Also, change all (^|\s) and (\s|$) constructs to (?:^|\s) and (?:\s|$).
Perl seems to like that better.

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoRT4310: Fix varous no-XXX builds
Rich Salz [Wed, 17 Feb 2016 18:33:51 +0000 (13:33 -0500)]
RT4310: Fix varous no-XXX builds

When OPENSSL_NO_ASYNC is set, make ASYNC_{un,}block_pause() do nothing.
This prevents md_rand.c from failing to build. Probably better to do it
this way than to wrap every instance in an explicit #ifdef.

A bunch of new socket code got added to a new file crypto/bio/b_addr.c.
Make it all go away if OPENSSL_NO_SOCK is defined.

Allow configuration with no-ripemd, no-ts, no-ui
We use these for the UEFI build.

Also remove the 'Really???' comment from no-err and no-locking. We use
those too.

We need to drop the crypto/engine directory from the build too, and also
set OPENSSL_NO_ENGINE

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
8 years agoremove redundant code
Dr. Stephen Henson [Wed, 17 Feb 2016 12:44:30 +0000 (12:44 +0000)]
remove redundant code

Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoRT4318: Fix OSSL_SSIZE_MAX for UEFI build
David Woodhouse [Wed, 17 Feb 2016 14:11:32 +0000 (14:11 +0000)]
RT4318: Fix OSSL_SSIZE_MAX for UEFI build

Commit e634b448c ("Defines OSSL_SSIZE_MAX") introduced a definition of
OSSL_SSIZE_MAX which broke the UEFI build. Fix that by making UEFI take
the same definition as Ultrix (ssize_t == int).

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoRT4315: Fix UEFI build in crypto/init.c
David Woodhouse [Wed, 17 Feb 2016 14:54:33 +0000 (14:54 +0000)]
RT4315: Fix UEFI build in crypto/init.c

We don't have atexit() in the EDK2 environment. Firmware never exits.

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoRemove JPAKE
Rich Salz [Sun, 14 Feb 2016 05:17:59 +0000 (00:17 -0500)]
Remove JPAKE

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
8 years agoRT4313: Fix build for !IMPLEMENTED code path in CRYPTO_secure_free()
David Woodhouse [Wed, 17 Feb 2016 13:41:26 +0000 (13:41 +0000)]
RT4313: Fix build for !IMPLEMENTED code path in CRYPTO_secure_free()

Commit 05c7b1631 ("Implement the use of heap manipulator implementions")
added 'file' and 'line' arguments to CRYPTO_free() and friends, but neglected
to fix up the !IMPLEMENTED case within CRYPTO_secure_free(). Add the missing
arguments there too.

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoFixup secmemtest for the change of CRYPTO_free() and friends
Richard Levitte [Wed, 17 Feb 2016 10:03:55 +0000 (11:03 +0100)]
Fixup secmemtest for the change of CRYPTO_free() and friends

Switching it to use OPENSSL_free() et al when appropriate.

Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoFix mismatched curly brace
Dmitry-Me [Wed, 17 Feb 2016 09:10:18 +0000 (12:10 +0300)]
Fix mismatched curly brace

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoUpdate the documentation on heap allocators / deallocators
Richard Levitte [Wed, 17 Feb 2016 01:32:27 +0000 (02:32 +0100)]
Update the documentation on heap allocators /  deallocators

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoImplement the use of heap manipulator implementions
Richard Levitte [Wed, 17 Feb 2016 01:24:25 +0000 (02:24 +0100)]
Implement the use of heap manipulator implementions

- Make use of the functions given through CRYPTO_set_mem_functions().
- CRYPTO_free(), CRYPTO_clear_free() and CRYPTO_secure_free() now receive
  __FILE__ and __LINE__.
- The API for CRYPTO_set_mem_functions() and CRYPTO_get_mem_functions()
  is slightly changed, the implementation for free() now takes a couple
  of extra arguments, taking __FILE__ and __LINE__.
- The CRYPTO_ memory functions will *always* receive __FILE__ and __LINE__
  from the corresponding OPENSSL_ macros, regardless of if crypto-mdebug
  has been enabled or not.  The reason is that if someone swaps out the
  malloc(), realloc() and free() implementations, we can't know if they
  will use them or not.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agomd_rand: FAQ URL to use https and follow a redirect
Viktor Szakats [Tue, 16 Feb 2016 02:31:12 +0000 (03:31 +0100)]
md_rand: FAQ URL to use https and follow a redirect

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoOPENSSL_init_ssl.pod: fix minor typo
Viktor Szakats [Mon, 15 Feb 2016 23:32:22 +0000 (00:32 +0100)]
OPENSSL_init_ssl.pod: fix minor typo
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoOn solaris, the variable name sun clashes, use s_un instead
Richard Levitte [Tue, 16 Feb 2016 09:27:16 +0000 (10:27 +0100)]
On solaris, the variable name sun clashes, use s_un instead

For orthogonality, we change sin -> s_in and sin6 -> s_in6 as well.

Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoCheck for OPENSSL_USE_APPLINK in $config{cflags} as well
Richard Levitte [Tue, 16 Feb 2016 15:49:29 +0000 (16:49 +0100)]
Check for OPENSSL_USE_APPLINK in $config{cflags} as well

Macro definitions "should" be found in $config{defines}, but some
configs haven't transfered macro definitions from their 'cflags'
settings (which isn't mandatory anyway), so check both places.

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoDon't check for gcc or clang on VMS
Richard Levitte [Tue, 16 Feb 2016 15:08:06 +0000 (16:08 +0100)]
Don't check for gcc or clang on VMS

This check is meaningless on VMS and only produce an error because the
underlying shell (DCL) doesn't understand sh syntax such as '2>&1'.

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoLowercase configuration arguments on VMS
Richard Levitte [Tue, 16 Feb 2016 15:07:05 +0000 (16:07 +0100)]
Lowercase configuration arguments on VMS

Depending on user preferences, Configure might get something like
--PREFIX=blah just as well as --prefix=blah, or "SHARED" just as well
as "shared".  On VMS, let's therefore lowercase at least the portion
of the argument before a possible equal sign.

For good measure, we lowercase the arguments to be checked in
config.com as well.  The original argument is sent on to Configure,
however.

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoFix Solaris link_a and link_o
Richard Levitte [Tue, 16 Feb 2016 13:48:36 +0000 (14:48 +0100)]
Fix Solaris link_a and link_o

A long time ago, Solaris cc didn't seem to handle -Wl, linker options,
while gcc on Solaris required it.  Since then, Solaris cc has
developed to understand -Wl, options, and our little dance to figure
out how to pass linker options to the C compiler that's used isn't
needed any more.

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoSimplify tls1_set_ec_id.
Dr. Stephen Henson [Sat, 13 Feb 2016 15:26:15 +0000 (15:26 +0000)]
Simplify tls1_set_ec_id.

Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoUse nid_list table to lookup curve IDs.
Dr. Stephen Henson [Sat, 13 Feb 2016 15:28:25 +0000 (15:28 +0000)]
Use nid_list table to lookup curve IDs.

Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoAdd explanation and warning to TLS id table.
Dr. Stephen Henson [Sat, 13 Feb 2016 15:27:43 +0000 (15:27 +0000)]
Add explanation and warning to TLS id table.

Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoFix use of add() and add_before() in Configurations/*.conf
Richard Levitte [Tue, 16 Feb 2016 01:48:18 +0000 (02:48 +0100)]
Fix use of add() and add_before() in Configurations/*.conf

These two functions take a separator to concatenat the strings with as
first argument.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
8 years agoPrepare for 1.1.0-pre4-dev
Richard Levitte [Mon, 15 Feb 2016 18:37:42 +0000 (19:37 +0100)]
Prepare for 1.1.0-pre4-dev

Reviewed-by: Stephen Henson <steve@openssl.org>
8 years agoPrepare for 1.1.0-pre3 release OpenSSL_1_1_0-pre3
Richard Levitte [Mon, 15 Feb 2016 18:37:20 +0000 (19:37 +0100)]
Prepare for 1.1.0-pre3 release

Reviewed-by: Stephen Henson <steve@openssl.org>
8 years agoCorrect deprecation of OPENSSL_config
Richard Levitte [Mon, 15 Feb 2016 15:14:46 +0000 (16:14 +0100)]
Correct deprecation of OPENSSL_config

Reported in GH#684

Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoFix build-break
Rich Salz [Sun, 14 Feb 2016 21:23:27 +0000 (16:23 -0500)]
Fix build-break

Combination of heartbeats and unit-tests.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoMANSUFFIX should be left empty
Richard Levitte [Mon, 15 Feb 2016 12:37:17 +0000 (13:37 +0100)]
MANSUFFIX should be left empty

That variable isn't for us, it's for any user, distributor or package
builder that wants one after the section number.  "ssl" seems to be
popular...

Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoAddress comments.
Ben Laurie [Sun, 14 Feb 2016 18:41:52 +0000 (18:41 +0000)]
Address comments.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoTests depend on everything.
Ben Laurie [Sun, 14 Feb 2016 05:32:19 +0000 (05:32 +0000)]
Tests depend on everything.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoMake the BIO_ADDR param optional.
Rich Salz [Sun, 14 Feb 2016 20:50:13 +0000 (15:50 -0500)]
Make the BIO_ADDR param optional.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoMisc fixes in util/mk1mf.pl
Richard Levitte [Sun, 14 Feb 2016 21:06:49 +0000 (22:06 +0100)]
Misc fixes in util/mk1mf.pl

mk1mf was wondering about the options no-heartbeats and
no-crypto-mdebug-backtrace, so we add option hooks them.  They only
need to become OPENSSL_NO_ macros in opensslconf.h, so nothing
additional needs to be done.

Also, add "-DOPENSSL_PIC" when shared libraries are produced.

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoDon't call cpuid in test; done as init.
Rich Salz [Sun, 14 Feb 2016 21:15:41 +0000 (16:15 -0500)]
Don't call cpuid in test; done as init.

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoFixes to make no-deprecated work again
Viktor Dukhovni [Sun, 14 Feb 2016 20:25:54 +0000 (15:25 -0500)]
Fixes to make no-deprecated work again

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoConfigurations/00-base-templates.conf: typos in [chacha|poly1305]_asm_src.
Andy Polyakov [Sat, 13 Feb 2016 16:44:45 +0000 (17:44 +0100)]
Configurations/00-base-templates.conf: typos in [chacha|poly1305]_asm_src.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agochacha/asm/chacha*: ensure that zero length is handled (without crash).
Andy Polyakov [Sat, 13 Feb 2016 16:13:53 +0000 (17:13 +0100)]
chacha/asm/chacha*: ensure that zero length is handled (without crash).

RT#4305

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agochacha/asm/chacha-x86[_64].pl: fix typos and logical errors.
Andy Polyakov [Sat, 13 Feb 2016 12:37:25 +0000 (13:37 +0100)]
chacha/asm/chacha-x86[_64].pl: fix typos and logical errors.

Thanks to: David Benjamin of Chromuim.

RT#4305

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agomake update
Richard Levitte [Sun, 14 Feb 2016 18:42:10 +0000 (19:42 +0100)]
make update

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoDon't use libcrypto private headers with mkdef.pl
Richard Levitte [Sun, 14 Feb 2016 18:37:10 +0000 (19:37 +0100)]
Don't use libcrypto private headers with mkdef.pl

Three header files from crypto/include/internal were used by
util/mkdef.pl.  This should never be needed.  Some test program used
these, which made it a valid reason at the time to make the some
internal symbols public in the shared libraries, but that's not the
case any more.

However, to be able to link libssl.so, some symbols found in
include/internal headers still need to be made public.

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoMake sure to use unsigned char for is*() functions
Richard Levitte [Sun, 14 Feb 2016 12:02:15 +0000 (13:02 +0100)]
Make sure to use unsigned char for is*() functions

On some platforms, the implementation is such that a signed char
triggers a warning when used with is*() functions.  On others, the
behavior is outright buggy when presented with a char that happens
to get promoted to a negative integer.

The safest thing is to cast the char that's used to an unsigned char.

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoMake the use of mdebug backtrace a separate option
Richard Levitte [Sun, 14 Feb 2016 11:16:52 +0000 (12:16 +0100)]
Make the use of mdebug backtrace a separate option

To force it on anyone using --strict-warnings was the wrong move, as
this is an option best left to those who know what they're doing.

Use with care!

Reviewed-by: Andy Polyakov <appro@openssl.org>
8 years agoDeclare DllMain internally
Richard Levitte [Sun, 14 Feb 2016 10:48:47 +0000 (11:48 +0100)]
Declare DllMain internally

DllMain is a symbol that needs to be global, but no one needs to know.
However, some compilers will warn if there isn't a declaration before
the function is defined.  Just add a declaration before the function
definition.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
8 years agoDon't test heartbeats when there aren't any.
Ben Laurie [Sun, 14 Feb 2016 05:52:12 +0000 (05:52 +0000)]
Don't test heartbeats when there aren't any.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoMake sure a socklen_t can compare with a sizeof() result
Richard Levitte [Sun, 14 Feb 2016 10:16:37 +0000 (11:16 +0100)]
Make sure a socklen_t can compare with a sizeof() result

Most of the times, it seems that socklen_t is unsigned.
Unfortunately, this isn't always the case, and it doesn't compare with
a size_t without warning.

A cast resolves the issue.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
8 years agoHave dofile.pl say where it was run, for real this time
Richard Levitte [Sun, 14 Feb 2016 07:47:47 +0000 (08:47 +0100)]
Have dofile.pl say where it was run, for real this time

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
8 years agoHave dofile.pl say where it was run
Richard Levitte [Sun, 14 Feb 2016 05:55:45 +0000 (06:55 +0100)]
Have dofile.pl say where it was run

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
8 years agoPrefer IO::Socket::INET6 over IO::Socket::IP
Richard Levitte [Sun, 14 Feb 2016 06:10:38 +0000 (07:10 +0100)]
Prefer IO::Socket::INET6 over IO::Socket::IP

While IO::Socket::IP is a core perl module (since Perl v5.19.8, or so
says corelist), IO::Socket::INET6 has been around longer, is said to
be more widely deployed, and most importantly, seems to have less bugs
hitting us.  We therefore prefer IO::Socket::INET6, and only fall back
to IO::Socket::IP if the former doesn't exist on the local system.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
8 years agocrypto/poly1305: add floating-point reference implementation.
Andy Polyakov [Sat, 12 Dec 2015 11:46:17 +0000 (12:46 +0100)]
crypto/poly1305: add floating-point reference implementation.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoRT4304: Look for plaintext HTTP
Rainer Jung [Sat, 13 Feb 2016 13:03:23 +0000 (08:03 -0500)]
RT4304: Look for plaintext HTTP

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoGH675: make ssl3_ciphers static
Viktor Szakats [Sat, 13 Feb 2016 17:46:30 +0000 (18:46 +0100)]
GH675: make ssl3_ciphers static

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoPass $(CC) to perlasm scripts via the environment
Richard Levitte [Sat, 13 Feb 2016 18:15:52 +0000 (19:15 +0100)]
Pass $(CC) to perlasm scripts via the environment

It seems that on some platforms, the perlasm scripts call the C
compiler for certain checks.  These scripts need the environment
variable CC to have the C compiler command.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoReformat warn variables for easier editing.
Rich Salz [Sat, 13 Feb 2016 17:27:11 +0000 (12:27 -0500)]
Reformat warn variables for easier editing.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoDon't build test programs by default, add convenience targets for unified build
Richard Levitte [Sat, 13 Feb 2016 17:15:51 +0000 (18:15 +0100)]
Don't build test programs by default, add convenience targets for unified build

Test programs are now only built when running "make test" or "make
build_tests".

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoHave the same installation directories in unified as in unixmake
Richard Levitte [Sat, 13 Feb 2016 16:55:48 +0000 (17:55 +0100)]
Have the same installation directories in unified as in unixmake

unix-Makefile.tmpl was lagging behind on this point.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoConfigurations: engage PPC ChaCha20 and Poly1305 modules.
Andy Polyakov [Wed, 10 Feb 2016 10:52:22 +0000 (11:52 +0100)]
Configurations: engage PPC ChaCha20 and Poly1305 modules.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoPPC assembly pack: add ChaCha20 and Poly1305 modules.
Andy Polyakov [Wed, 10 Feb 2016 10:51:23 +0000 (11:51 +0100)]
PPC assembly pack: add ChaCha20 and Poly1305 modules.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoAdd SHARED_RCFLAGS in unified Makefile template
Richard Levitte [Sat, 13 Feb 2016 14:50:59 +0000 (15:50 +0100)]
Add SHARED_RCFLAGS in unified Makefile template

Also remove a spurious extra $(LDFLAGS)

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoasync_win.c: remove unused variable
Viktor Szakats [Sat, 13 Feb 2016 14:20:47 +0000 (15:20 +0100)]
async_win.c: remove unused variable

Silencing this:
    crypto/async/arch/async_win.c: In function 'async_fibre_init_dispatcher':
    crypto/async/arch/async_win.c:112:12: warning: unused variable 'dispatcher' [-Wunused-variable]
         LPVOID dispatcher;
                ^

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoThe unified build may delete installed manual files
Richard Levitte [Sat, 13 Feb 2016 12:52:24 +0000 (13:52 +0100)]
The unified build may delete installed manual files

The installation of man files and html files alike didn't properly
check that file names with different casing could be the same on
case-insensitive file systems.  This change fixes that.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoGH650: Minor tidying around the ocsp app
Benjamin Kaduk [Wed, 10 Feb 2016 02:29:21 +0000 (20:29 -0600)]
GH650: Minor tidying around the ocsp app

The ocsp utility is something of a jack-of-all-trades; most anything
related to the OCSP can be done with it.  In particular, the manual
page calls out that it can be used as either a client or a server
of the protocol, but there are also a few things that it can do
which do not quite fit into either role, such as encoding an OCSP
request but not sending it, printing out a text form of an OCSP
response (or request) from a file akin to the asn1parse utility,
or performing a lookup into the server-side revocation database
without actually sending a request or response.  All three of these
are documented as examples in the manual page, but the documentation
prior to this commit is somewhat misleading, in that when printing
the text form of an OCSP response, the code also attempts to
verify the response, displaying an error message and returning
failure if the response does not verify.  (It is possible that
the response would be able to verify with the given example, since
the default trust roots are used for that verification, but OCSP
responses frequently have alternate certification authorities
that would require passing -CAfile or -CApath for verification.)

Tidy up the documentation by passing -noverify for the case of
converting from binary to textual representation, and also
change a few instances of -respin to -reqin as appropriate, note
that the -url option provides the same functionality as the -host
and -path options, clarify that the example that saves an OCSP
response to a file will also perform verification on that response,
and fix a couple grammar nits in the manual page.

Also remove an always-true conditional for rdb != NULL -- there
are no codepaths in which it could be initialized at the time of
this check.

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
8 years agoDisplay the windres command
Richard Levitte [Sat, 13 Feb 2016 14:01:22 +0000 (15:01 +0100)]
Display the windres command

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoGH643: Cleanup header analysis
Dmitry-Me [Wed, 10 Feb 2016 06:37:52 +0000 (09:37 +0300)]
GH643: Cleanup header analysis

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
8 years agoFree and zero DH/ECDH temporary key after use.
Dr. Stephen Henson [Sat, 13 Feb 2016 02:27:33 +0000 (02:27 +0000)]
Free and zero DH/ECDH temporary key after use.

PR#4303

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
8 years agoRethink the method to place user cflags last
Richard Levitte [Sat, 13 Feb 2016 12:02:35 +0000 (13:02 +0100)]
Rethink the method to place user cflags last

The previous method had some unfortunate consequences with
--strict-warnings.  To counteract, revert part of the previous change
and move down the block of code that adds the user cflags and defines.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoMake sure the OPENSSL_INIT flags are 32 bits and document the ssl range
Richard Levitte [Sat, 13 Feb 2016 11:37:39 +0000 (12:37 +0100)]
Make sure the OPENSSL_INIT flags are 32 bits and document the ssl range

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoRemove 00-test_checkexes.t, as it has lost its relevance
Richard Levitte [Sat, 13 Feb 2016 10:49:56 +0000 (11:49 +0100)]
Remove 00-test_checkexes.t, as it has lost its relevance

In the early stages of creating the new test framework,
00-test_checkexes was a temporary check to ensure we had a recipe for
every test program in test/.  By now, this test has fulfilled its
purpose, and we've learned how to make recipes properly.  It's time
for this check to go away.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoIn templates, output_on() must be used the same way as output_off()
Richard Levitte [Sat, 13 Feb 2016 08:35:02 +0000 (09:35 +0100)]
In templates, output_on() must be used the same way as output_off()

Otherwise, there will be an unbalance.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoC64x+ assembly pack: add ChaCha20 and Poly1305 modules.
Andy Polyakov [Tue, 15 Dec 2015 20:52:01 +0000 (21:52 +0100)]
C64x+ assembly pack: add ChaCha20 and Poly1305 modules.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoConfigurations: engage ARM ChaCha20 and Poly1305 modules.
Andy Polyakov [Wed, 10 Feb 2016 10:59:45 +0000 (11:59 +0100)]
Configurations: engage ARM ChaCha20 and Poly1305 modules.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoARM assembly pack: add ChaCha20 and Poly1305 modules.
Andy Polyakov [Mon, 14 Dec 2015 17:12:07 +0000 (18:12 +0100)]
ARM assembly pack: add ChaCha20 and Poly1305 modules.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoapps/speed.c: initialize c[D_GHASH][i].
Andy Polyakov [Fri, 12 Feb 2016 13:53:51 +0000 (14:53 +0100)]
apps/speed.c: initialize c[D_GHASH][i].

RT#4230

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoDefines OSSL_SSIZE_MAX
Rob Percival [Fri, 12 Feb 2016 15:12:37 +0000 (15:12 +0000)]
Defines OSSL_SSIZE_MAX

Removes SSIZE_MAX definition from bss_bio.c and changes that file to use
OSSL_SSIZE_MAX.

No need to account for OPENSSL_SYS_VXWORKS, since that never actually
gets defined anywhere. It must be a historical artifact.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Ben Laurie <ben@openssl.org>
8 years agoFix some issues near recent chomp changes.
Viktor Dukhovni [Sat, 13 Feb 2016 07:53:13 +0000 (02:53 -0500)]
Fix some issues near recent chomp changes.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agofix warnings on 32 bit builds
Dr. Stephen Henson [Fri, 12 Feb 2016 22:24:39 +0000 (22:24 +0000)]
fix warnings on 32 bit builds

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
8 years agoWe need the linked utils after a full build.
Richard Levitte [Wed, 10 Feb 2016 18:18:33 +0000 (19:18 +0100)]
We need the linked utils after a full build.

We really needs a better util/shlib_wrap.sh, but will have to do for now.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoUnified build - fix make depend
Richard Levitte [Fri, 12 Feb 2016 13:05:06 +0000 (14:05 +0100)]
Unified build - fix make depend

There was a catch 22, where 'make depend' directly after configuring
in an otherwise pristine build tree would fail because buildinf.h
didn't exist yet.

This change has the depend building targets depend on the same other
targets as the object file building targets, so the generation of
buildinf.h and similar files would kick in during 'make depend'.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoMove brace outside #ifdef
Viktor Dukhovni [Fri, 12 Feb 2016 21:36:06 +0000 (16:36 -0500)]
Move brace outside #ifdef

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoevp/e_des[3].c: address compiler warnings, fix formatting.
Andy Polyakov [Fri, 12 Feb 2016 13:46:02 +0000 (14:46 +0100)]
evp/e_des[3].c: address compiler warnings, fix formatting.

RT#4210

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agomodes/ctr128.c: pay attention to ecount_buf alignment in CRYPTO_ctr128_encrypt.
Andy Polyakov [Fri, 12 Feb 2016 13:07:27 +0000 (14:07 +0100)]
modes/ctr128.c: pay attention to ecount_buf alignment in CRYPTO_ctr128_encrypt.

It's never problem if CRYPTO_ctr128_encrypt is called from EVP, because
buffer in question is always aligned within EVP_CIPHER_CTX structure.

RT#4218

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoRename INSTALL_PREFIX to DESTDIR, remove option --install_prefix
Richard Levitte [Fri, 12 Feb 2016 20:14:03 +0000 (21:14 +0100)]
Rename INSTALL_PREFIX to DESTDIR, remove option --install_prefix

INSTALL_PREFIX is a confusing name, as there's also --prefix.
Instead, tag along with the rest of the open source world and adopt
the Makefile variable DESTDIR to designate the desired staging
directory.

The Configure option --install_prefix is removed, the only way to
designate a staging directory is with the Makefile variable (this is
also implemented for VMS' descrip.mms et al).

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoUpdate .gitignore.
Andy Polyakov [Fri, 12 Feb 2016 13:13:06 +0000 (14:13 +0100)]
Update .gitignore.

Not all git versions understand **/Makefile, but all recognize that
filename without any path applies to all directories.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years ago.travis.yml: exclude gcc from MacOS X CI builds.
Andy Polyakov [Fri, 12 Feb 2016 10:45:44 +0000 (11:45 +0100)]
.travis.yml: exclude gcc from MacOS X CI builds.

Contemporary Xcode gcc is a front-end to clang, so that explicit
gcc build is actually redundant on MacOS X.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoPut user flags last for priority.
Rich Salz [Fri, 12 Feb 2016 19:40:33 +0000 (14:40 -0500)]
Put user flags last for priority.

Reviewed-by: Richard Levitte <levitte@openssl.org>
8 years agoec/asm/ecp_nistz256-armv8.pl: fix test_ssl spurious errors.
Andy Polyakov [Fri, 12 Feb 2016 10:28:22 +0000 (11:28 +0100)]
ec/asm/ecp_nistz256-armv8.pl: fix test_ssl spurious errors.

RT#4237

Reviewed-by: Matt Caswell <matt@openssl.org>
8 years agoNow that we have good verbosity, turn it on for Travis
Richard Levitte [Fri, 12 Feb 2016 17:42:46 +0000 (18:42 +0100)]
Now that we have good verbosity, turn it on for Travis

It's nearly impossible to determine what goes wrong in the tests
running there without this.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoDocument the changes in "make test" behavior
Richard Levitte [Fri, 12 Feb 2016 17:33:34 +0000 (18:33 +0100)]
Document the changes in "make test" behavior

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoLet all TLSProxy based tests display debug text conditionally
Richard Levitte [Fri, 12 Feb 2016 17:26:16 +0000 (18:26 +0100)]
Let all TLSProxy based tests display debug text conditionally

If the environment variable HARNESS_ACTIVE isn't defined or
HARNESS_VERBOSE is defined, it's probable that lots of output is
desired.

Reviewed-by: Rich Salz <rsalz@openssl.org>
8 years agoRethink logging of test recipes
Richard Levitte [Fri, 12 Feb 2016 17:16:23 +0000 (18:16 +0100)]
Rethink logging of test recipes

The logging that was performed in OpenSSL::Test was initially set up
as a means not to let messages that test programs write to STDERR get
displayed when a test isn't running in verbose mode.  However, the way
it was implemented, it meant that those messages were never displayed,
and you had to look in a test log.  This also meant that output to
STDERR and output to STDOUT got broken apart, which isn't optimal.

So, we remove the whole test log file implementation, and instead,
we're sending STDERR to the null device unless one of these conditions
apply:

- the test recipe already redirects stderr.  Just let it.
- the environment variable HARNESS_ACTIVE is undefined, meaning the
  recipe is run directly as a perl script instead of being harnessed
  by Test::Harness
- the environment variable HARNESS_VERBOSE is set.

Getting a full log of the tests now becomes as simple as this:

    HARNESS_VERBOSE=yes make test 2>&1 | tee tests.log

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