openssl.git
3 years agoProduce buildinf.h on Windows the same way as on Unix
Richard Levitte [Wed, 10 Feb 2016 18:11:40 +0000 (19:11 +0100)]
Produce buildinf.h on Windows the same way as on Unix

Because ENGINESDIR and OPENSSLDIR typically contains backslashes, they
need to be escaped just right.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoQuote the CFLAG in Unixly Makefiles, for buildinf.h
Richard Levitte [Wed, 10 Feb 2016 18:09:05 +0000 (19:09 +0100)]
Quote the CFLAG in Unixly Makefiles, for buildinf.h

Because the command line definitions of OPENSSLDIR and ENGINESDIR
contain quotes, we need a variant of CFLAG where backslashes and
quotes are escaped when we produce buildinf.h

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoMake sure to escape backslashes and single quotes for buildinf.h
Richard Levitte [Wed, 10 Feb 2016 18:06:54 +0000 (19:06 +0100)]
Make sure to escape backslashes and single quotes for buildinf.h

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoMake it possible to get ENGINESDIR info from OpenSSL_versions
Richard Levitte [Wed, 10 Feb 2016 17:51:15 +0000 (18:51 +0100)]
Make it possible to get ENGINESDIR info from OpenSSL_versions

Have apps/openssl display the result along with OPENSSLDIR

As part of this, add ENGINESDIR in util/mk1mf.pl

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoAdd some documentation about init after deinit
Matt Caswell [Wed, 10 Feb 2016 16:17:01 +0000 (16:17 +0000)]
Add some documentation about init after deinit

Attempting to init after deinit is an error. Update the documentation
accordingly.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoUpdate CHANGES following init function renaming
Matt Caswell [Wed, 10 Feb 2016 16:02:49 +0000 (16:02 +0000)]
Update CHANGES following init function renaming

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoAttempt to log an error if init failed
Matt Caswell [Wed, 10 Feb 2016 15:16:06 +0000 (15:16 +0000)]
Attempt to log an error if init failed

If init failed we'd like to set an error code to indicate that. But if
init failed then when the error system tries to load its strings its going
to fail again. We could get into an infinite loop. Therefore we just set
a single error the first time around. After that no error is set.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoThe new init functions can now fail so shouldn't be void
Matt Caswell [Wed, 10 Feb 2016 13:59:15 +0000 (13:59 +0000)]
The new init functions can now fail so shouldn't be void

The new init functions can fail if the library has already been stopped. We
should be able to indicate failure with a 0 return value.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoVariable was declared static when it shouldn't be
Matt Caswell [Wed, 10 Feb 2016 16:46:33 +0000 (16:46 +0000)]
Variable was declared static when it shouldn't be

The local variable tmp was declared static when it shouldn't be. This
is in the no-threads implementation, and it was immediately initialised
to something else on every invokation of the function so it doesn't break
anything...but still shouldn't be there.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
3 years agoImprove recent option help string additions
Viktor Dukhovni [Tue, 9 Feb 2016 19:18:15 +0000 (14:18 -0500)]
Improve recent option help string additions

Make these more correct, concise and less tautological.

Reviewed-by: Stephen Henson <steve@openssl.org>
3 years agoDeprecate the -issuer_checks debugging option
Viktor Dukhovni [Tue, 9 Feb 2016 19:17:13 +0000 (14:17 -0500)]
Deprecate the -issuer_checks debugging option

This was a developer debugging feature and was never a useful public
interface.

Added all missing X509 error codes to the verify(1) manpage, but
many still need a description beyond the associated text string.

Sorted the errors in x509_txt.c by error number.

Reviewed-by: Stephen Henson <steve@openssl.org>
3 years agoThe guard macro to be defined didn't match the guard macro checked
Richard Levitte [Wed, 10 Feb 2016 17:02:59 +0000 (18:02 +0100)]
The guard macro to be defined didn't match the guard macro checked

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoUpdate unified build after store removal
Rich Salz [Wed, 10 Feb 2016 15:33:18 +0000 (10:33 -0500)]
Update unified build after store removal

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
3 years agoRename INIT funtions, deprecate old ones.
Rich Salz [Tue, 9 Feb 2016 16:52:40 +0000 (11:52 -0500)]
Rename INIT funtions, deprecate old ones.

Man, there were a lot of renamings :)

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoNo dynamic-init fix; merge goof.
Rich Salz [Wed, 10 Feb 2016 13:42:33 +0000 (08:42 -0500)]
No dynamic-init fix; merge goof.

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agounified build system: add CHANGES & NEWS
Richard Levitte [Sat, 30 Jan 2016 06:17:01 +0000 (07:17 +0100)]
unified build system: add CHANGES & NEWS

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agounified build scheme: rewrite INSTALL.VMS
Richard Levitte [Sat, 30 Jan 2016 06:15:59 +0000 (07:15 +0100)]
unified build scheme: rewrite INSTALL.VMS

There is more to be added, but this will at least tell people how to try.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoclean away old VMS cruft
Richard Levitte [Sat, 30 Jan 2016 06:15:30 +0000 (07:15 +0100)]
clean away old VMS cruft

The old building scripts get removed, they are hopelessly gone in bit
rot by now.

Also remove the old symbol hacks.  They were needed needed to shorten
some names to 31 characters, and to resolve other symbol clashes.
Because we now compile with /NAMES=(AS_IS,SHORTENED), this is no
longer required.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agounified build scheme: add a "unified" template for VMS descrip.mms
Richard Levitte [Sat, 30 Jan 2016 06:14:58 +0000 (07:14 +0100)]
unified build scheme: add a "unified" template for VMS descrip.mms

As part of this, change util/mkdef.pl to stop adding libraries to
depend on in its output.  mkdef.pl should ONLY output a symbol
vector.

Because symbol names can't be longer than 31 characters, we use the
compiler to shorten those that are longer down to 23 characters plus
an 8 character CRC.  To make sure users of our header files will pick
up on that automatically, add the DEC C supported extra headers files
__decc_include_prologue.h and __decc_include_epilogue.h.

Furthermore, we add a config.com, so VMS people can configure just as
comfortably as any Unix folks, thusly:

    @config

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agounified build scheme: add instructions for travis to build with --unified
Richard Levitte [Thu, 4 Feb 2016 15:40:40 +0000 (16:40 +0100)]
unified build scheme: add instructions for travis to build with --unified

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agounified build scheme: Try to nudge users to try the "unified" build
Richard Levitte [Sat, 30 Jan 2016 02:31:52 +0000 (03:31 +0100)]
unified build scheme: Try to nudge users to try the "unified" build

This commit SHALL be reverted before final release.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agounified build scheme: add the tweaks to build on Cygwin & Mingw
Richard Levitte [Sat, 30 Jan 2016 04:45:29 +0000 (05:45 +0100)]
unified build scheme: add the tweaks to build on Cygwin & Mingw

Cygwin and Mingw name their libraries a bit differently from the rest
of the POSIXly universe, we need to adapt to that.

In Makefile.tmpl, it means that some hunks will only be output
conditionally.

This also means that shared_extension for the Cygwin and Mingw
configurations in Configurations/10-main.conf are changing from .dll.a
to .dll.  Makefile.shared does a fine job without having them
specified, and it's much easier to work with tucking an extra .a at
the end of files in the installation recipes than any amount of name
rewrites, especially with the support of the SHARED_NAME in the top
build.info.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agounified build scheme: add a "unified" template for Unix Makefile
Richard Levitte [Sat, 30 Jan 2016 02:25:40 +0000 (03:25 +0100)]
unified build scheme: add a "unified" template for Unix Makefile

This also adds all the raw sections needed for some files.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agounified build scheme: give util/dofile.pl the possibility to output selectively
Richard Levitte [Sat, 30 Jan 2016 02:21:39 +0000 (03:21 +0100)]
unified build scheme: give util/dofile.pl the possibility to output selectively

Under certain conditions, one might not want to output certain
sections of a template file.  This adds the functions output_off() and
output_on(), reachable inside the templates.  And example usage in a
Makefile template could be this:

@ : {- output_off() if $config{no_shared}; "" -}
... lines dealing with shared libraries
@ : {- output_on() -}

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConfigure et al: move the installation directory logic to Makefiles
Richard Levitte [Sat, 30 Jan 2016 01:57:19 +0000 (02:57 +0100)]
Configure et al: move the installation directory logic to Makefiles

The logic to figure out the combinations of --prefix and --openssldir
has stayed in Configure so far, with Unix paths as defaults.

However, since we're making Configure increasingly platform agnostic,
these defaults need to change and adapt to the platform, along with
the logic to combine them.

The easiest to provide for this is to move the logic and the defaults
away from Configure and into the build files.

This also means that the definition of the macros ENGINESDIR and
OPENSSLDIR move away from include/openssl/opensslconf.h and into the
build files.

Makefile.in is adapted accordingly.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoConfigure et al: treat C defines separately
Richard Levitte [Sat, 30 Jan 2016 01:17:05 +0000 (02:17 +0100)]
Configure et al: treat C defines separately

With some compilers, C macros are defined differently on the command
line than on Unix.  It could be that the flad to define them isn't -D,
it could also be that they need to be grouped together and not be mixed
in with the other compiler flags (that's how it's done on VMS, for
example).

On Unix family platform configurations, we can continue to have macro
definitions mixed in with the rest of the flags, so the changes in
Configurations/*.conf are kept to an absolute minimum.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoCan't re-init after stop.
Rich Salz [Wed, 10 Feb 2016 05:39:29 +0000 (00:39 -0500)]
Can't re-init after stop.

Remoce DYANMIC once-init stuff.
After the library is stopped, you can't restart it.

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoRemove store.
Rich Salz [Wed, 10 Feb 2016 12:52:49 +0000 (07:52 -0500)]
Remove store.

Rebased and merged by me, with Ben's approval.

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Ben Laurie <ben@openssl.org>
3 years agoIf we've not been inited don't deinit
Matt Caswell [Wed, 10 Feb 2016 09:47:51 +0000 (09:47 +0000)]
If we've not been inited don't deinit

If you call an explicit deinit when we've not been inited then a seg
fault can occur. We should check that we've been inited before attempting
to deinit.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoms/uplink-x86.pl: make it work.
Andy Polyakov [Tue, 9 Feb 2016 10:53:11 +0000 (11:53 +0100)]
ms/uplink-x86.pl: make it work.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agochacha/asm/chacha-x86.pl: fix nasm compilation.
Andy Polyakov [Wed, 10 Feb 2016 10:02:12 +0000 (11:02 +0100)]
chacha/asm/chacha-x86.pl: fix nasm compilation.

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoConfigurations: engage x86[_64] ChaCha20 and Poly1305 modules.
Andy Polyakov [Tue, 9 Feb 2016 22:08:30 +0000 (23:08 +0100)]
Configurations: engage x86[_64] ChaCha20 and Poly1305 modules.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agopoly1305/poly1305.c: work around -Wshadow warnings with POLY1305_ASM.
Andy Polyakov [Sat, 19 Dec 2015 13:16:47 +0000 (14:16 +0100)]
poly1305/poly1305.c: work around -Wshadow warnings with POLY1305_ASM.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agox86[_64] assembly pack: add ChaCha20 and Poly1305 modules.
Andy Polyakov [Sun, 13 Dec 2015 20:40:20 +0000 (21:40 +0100)]
x86[_64] assembly pack: add ChaCha20 and Poly1305 modules.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoVMS getnameinfo() seems to have a bug with returned service string
Richard Levitte [Wed, 10 Feb 2016 04:12:52 +0000 (05:12 +0100)]
VMS getnameinfo() seems to have a bug with returned service string

It seems like it gives back gibberish.  If we asked for a numeric
service, it's easy to check for a digit in the first position, and
if there isn't any, rewrite it using older methods.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoSimplify the specification of include dirs in the build dir
Richard Levitte [Wed, 10 Feb 2016 01:18:38 +0000 (02:18 +0100)]
Simplify the specification of include dirs in the build dir

In build.info files, make the include directory in the build directory
absolute, or Configure will think it should be added to the source
directory top.  Configure will turn it into a relative path if
possible.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoMake the processing of build.info files more aware of absolute dirs
Richard Levitte [Wed, 10 Feb 2016 01:00:37 +0000 (02:00 +0100)]
Make the processing of build.info files more aware of absolute dirs

There were cases where some input was absolute, and concatenating it
to the diretory to the source or build top could fail spectacularly.
Let's check the input first to see if it's absolute.

And while we're on the subject of checking if a file or dir spec is
absolute using file_name_is_absolute() has its own quirks on VMS,
where a logical name is considered absolute under most circumstances.
This is perfectly correct from a VMS point of view, but when parsing
the build.info files, we want single word file or directory names to
only be checked syntactically.  A function isabsolute() that does the
right thing is the solution.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoMake sure to always include string.h so memset gets declared.
Richard Levitte [Wed, 10 Feb 2016 02:54:45 +0000 (03:54 +0100)]
Make sure to always include string.h so memset gets declared.

memset() is used by CRYPTO_secure_zalloc(), which isn't hidden away
behind IMPLEMENTED.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoDon't run RC4 test with no-rc4
Rich Salz [Wed, 10 Feb 2016 00:45:17 +0000 (19:45 -0500)]
Don't run RC4 test with no-rc4

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoUse NON_EMPTY_TRANSLATION_UNIT, consistently.
Rich Salz [Sun, 31 Jan 2016 18:08:23 +0000 (13:08 -0500)]
Use NON_EMPTY_TRANSLATION_UNIT, consistently.

This also closes RT 4123

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoMake some global variables static
Matt Caswell [Tue, 9 Feb 2016 23:59:17 +0000 (23:59 +0000)]
Make some global variables static

Make some global variables that are only ever accessed from one file
static.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoNULL the thread_local_inits_st pointer after use
Matt Caswell [Tue, 9 Feb 2016 23:09:44 +0000 (23:09 +0000)]
NULL the thread_local_inits_st pointer after use

After the final use of the thread_local_inits_st we should ensure it is
set to NULL, just in case OPENSSL_INIT_thread_stop gets called again and
it tries to use garbage.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoStop library before checking for mem leaks
Matt Caswell [Tue, 9 Feb 2016 22:09:56 +0000 (22:09 +0000)]
Stop library before checking for mem leaks

With the new init framework resources aren't released until the process
exits. This means checking for mem leaks before that point finds a lot of
things! We should explicitly close down the library if we're checking for
mem leaks.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoGH649: Fix: version32.rc was not created on Windows
Mat [Tue, 9 Feb 2016 21:53:14 +0000 (22:53 +0100)]
GH649: Fix: version32.rc was not created on Windows

version32.rc was not created on Windows. The if condition has been corrected.

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoPortability fix
Rich Salz [Tue, 9 Feb 2016 21:01:25 +0000 (16:01 -0500)]
Portability fix

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoConfigurations: engage s390x ChaCha20 and Poly1305 modules.
Andy Polyakov [Sun, 31 Jan 2016 22:05:17 +0000 (23:05 +0100)]
Configurations: engage s390x ChaCha20 and Poly1305 modules.

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agos390x assembly pack: add ChaCha20 and Poly1305 modules.
Andy Polyakov [Mon, 14 Dec 2015 22:23:20 +0000 (23:23 +0100)]
s390x assembly pack: add ChaCha20 and Poly1305 modules.

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoGH645: Fix typo: ctificates -> certificates
Quanah Gibson-Mount [Mon, 8 Feb 2016 20:59:33 +0000 (14:59 -0600)]
GH645: Fix typo: ctificates -> certificates

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Signed-off-by: Rich Salz <rsalz@openssl.org>
3 years agoGH646: Update help for s_server command.
A J Mohan Rao [Tue, 9 Feb 2016 15:55:42 +0000 (10:55 -0500)]
GH646: Update help for s_server command.

    * added missing help option messages
    * ecdh_single option is removed as it is a no-op and not an option
    supported in earlier versions
    * ssl_ctx_security_debug() was invoked before ctx check for NULL
    * trusted_first option can be removed, as it is always enabled in 1.1.
    But not removed the option, require confirmation.

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoUpdates for auto init/deinit review comments
Matt Caswell [Tue, 9 Feb 2016 13:12:34 +0000 (13:12 +0000)]
Updates for auto init/deinit review comments

Fixes for the auto-init/deinit code based on review comments

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAdd a CHANGES entry for auto-init and de-init
Matt Caswell [Tue, 9 Feb 2016 12:04:03 +0000 (12:04 +0000)]
Add a CHANGES entry for auto-init and de-init

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoCorrect copyright date for internal header file
Matt Caswell [Tue, 9 Feb 2016 11:55:41 +0000 (11:55 +0000)]
Correct copyright date for internal header file

The newly added internal async.h header file had last years date in it.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoUpdate build.info files for auto-init/de-init
Matt Caswell [Tue, 9 Feb 2016 11:09:10 +0000 (11:09 +0000)]
Update build.info files for auto-init/de-init

Various Makefile.in files have changes for auto-init/de-init. Make the
equivalent changes in build.info.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAvoid a race condition in loading config settings
Matt Caswell [Tue, 9 Feb 2016 10:55:21 +0000 (10:55 +0000)]
Avoid a race condition in loading config settings

A race condition can occur when sending config settings to
OPENSSL_INIT_crypto_library_start()

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoProvide documentation for auto-init/auto-deinit
Matt Caswell [Tue, 9 Feb 2016 10:17:59 +0000 (10:17 +0000)]
Provide documentation for auto-init/auto-deinit

Provide some man pages for auto-init/deinit. Also update the INSTALL
documentation for information on the new Configure options implemented as
part of this.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAdd an OPENSSL_NO_AUTOERRINIT option
Matt Caswell [Tue, 9 Feb 2016 09:39:07 +0000 (09:39 +0000)]
Add an OPENSSL_NO_AUTOERRINIT option

This option disables automatic loading of the crypto/ssl error strings in
order to keep statically linked executable file size down

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoProvide a thread stop API
Matt Caswell [Tue, 9 Feb 2016 09:13:45 +0000 (09:13 +0000)]
Provide a thread stop API

Add the OPENSSL_INIT_thread_stop() function.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoClean up the tests for auto-init/de-init
Matt Caswell [Mon, 8 Feb 2016 16:45:35 +0000 (16:45 +0000)]
Clean up the tests for auto-init/de-init

Remove the need to explicitly initialise/deinitialise for the tests

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoGet the apps to use auto-init/de-init
Matt Caswell [Mon, 8 Feb 2016 16:44:58 +0000 (16:44 +0000)]
Get the apps to use auto-init/de-init

Clean up the apps so that we make use of the new auto-init/de-init feature.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAuto init/de-init libssl
Matt Caswell [Mon, 8 Feb 2016 16:44:26 +0000 (16:44 +0000)]
Auto init/de-init libssl

Building on the pervious commit to auto initialise and de-initialise libssl

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoAuto init/deinit libcrypto
Matt Caswell [Mon, 8 Feb 2016 16:43:03 +0000 (16:43 +0000)]
Auto init/deinit libcrypto

This builds on the previous commit to auto initialise/deinitialise
libcrypto.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoProvide framework for auto initialise/deinitialise of the library
Matt Caswell [Tue, 9 Feb 2016 11:26:14 +0000 (11:26 +0000)]
Provide framework for auto initialise/deinitialise of the library

This commit provides the basis and core code for an auto initialisation
and deinitialisation framework for libcrypto and libssl. The intention is
to remove the need (in many circumstances) to call explicit initialise and
deinitialise functions. Explicit initialisation will still be an option,
and if non-default initialisation is needed then it will be required.
Similarly for de-initialisation (although this will be a lot easier since
it will bring all de-initialisation into a single function).

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoFix 90-test_networking.t
Richard Levitte [Tue, 9 Feb 2016 14:11:01 +0000 (15:11 +0100)]
Fix 90-test_networking.t

The previous fix wasn't complete, it was missing a 'use OpenSSL::Test::Utils'

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoUse rel2abs() on VMS, rather than realpath()
Richard Levitte [Tue, 9 Feb 2016 09:15:13 +0000 (10:15 +0100)]
Use rel2abs() on VMS, rather than realpath()

It seems realpath() is quite buggy on VMS, or will at least give quite
surprising results.  On the other hand, realpath() is the better on
Unix to clean out clutter like foo/../bar on Unix.

So we make out own function to get the absolute directory for a given
input, and use rel2abs() or realpath() depending on the platform
Configure runs on.

Issue reported by Steven M. Schweda <sms@antinode.info>

Reviewed-by: Andy Polyakov <appro@openssl.org>
3 years agoUpdate 90-test-networking.t to do the same checks as other TLSProxy tests
Richard Levitte [Tue, 9 Feb 2016 10:16:05 +0000 (11:16 +0100)]
Update 90-test-networking.t to do the same checks as other TLSProxy tests

Reviewed-by: Andy Polyakov <appro@openssl.org>
3 years agounified build scheme: adjust test framework for out of source build tree
Richard Levitte [Sat, 30 Jan 2016 00:05:33 +0000 (01:05 +0100)]
unified build scheme: adjust test framework for out of source build tree

To be able to run tests when we've built in a directory other than
the source tree, the testing framework needs a few adjustments.

test/testlib/OpenSSL/Test.pm needs to know where it can find
shlib_wrap.sh, and a number of other tests need to be told a different
place to find engines than what they may be able to figure out on
their own.  Relying to $TOP is not enough, $SRCTOP and $BLDTOP can be
used as an alternative.

As part of this change, top_file and top_dir are removed and
srctop_file, bldtop_file, srctop_dir and bldtop_dir take their place.

Reviewed-by: Ben Laurie <ben@openssl.org>
3 years agounified build scheme: adjust some scripts
Richard Levitte [Fri, 29 Jan 2016 23:03:58 +0000 (00:03 +0100)]
unified build scheme: adjust some scripts

util/mkdef.pl and Makefile.shared needs to know about the source and
the build directories.

Additionally, Makefile.shared needs to know how to build shared
libraries in a directory other than the current one.

Reviewed-by: Ben Laurie <ben@openssl.org>
3 years agounified build scheme: add a design document
Richard Levitte [Mon, 8 Feb 2016 04:11:25 +0000 (05:11 +0100)]
unified build scheme: add a design document

This documents describes the three steps from build.info files via the
%unified_info database to the build-file templates, along with some
examples showing how the data gets processed along the way.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agounified build scheme: add and document the "unified" driving engine
Richard Levitte [Fri, 29 Jan 2016 23:57:33 +0000 (00:57 +0100)]
unified build scheme: add and document the "unified" driving engine

common.tmpl will be used together with the template build file, and is
the engine that connects the information gathered from all the
build.info files with making the build file itself.

This file expects there to be a template section in the build file
template that defines a number perl functions designed to return
strings with appropriate lines for the build system at hand.  The
exact functions, what they can expect as arguments and what output
they're expected to produce is documented in Configurations/README.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoSmall fixes
Richard Levitte [Mon, 8 Feb 2016 20:42:00 +0000 (21:42 +0100)]
Small fixes

- One typo fixed in crypto/bio/b_addr.c
- Add a comment in doc/crypto/BIO_parse_hostserv.pod to explain the
  blank lines with one lonely space each.

Reviewed-by: Andy Polyakov <appro@openssl.org>
3 years agoadd missing file p12_lcl.h
Dr. Stephen Henson [Mon, 8 Feb 2016 21:14:50 +0000 (21:14 +0000)]
add missing file p12_lcl.h

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoSuppress DANE TLSA reflection when verification fails
Viktor Dukhovni [Mon, 8 Feb 2016 00:07:57 +0000 (19:07 -0500)]
Suppress DANE TLSA reflection when verification fails

As documented both SSL_get0_dane_authority() and SSL_get0_dane_tlsa()
are expected to return a negative match depth and nothing else when
verification fails.  However, this only happened when verification
failed during chain construction.  Errors in verification of the
constructed chain did not have the intended effect on these functions.

This commit updates the functions to check for verify_result ==
X509_V_OK, and no longer erases any accumulated match information
when chain construction fails.  Sophisticated developers can, with
care, use SSL_set_verify_result(ssl, X509_V_OK) to "peek" at TLSA
info even when verification fail.  They must of course first check
and save the real error, and restore the original error as quickly
as possible.  Hiding by default seems to be the safer interface.

Introduced X509_V_ERR_DANE_NO_MATCH code to signal failure to find
matching TLSA records.  Previously reported via X509_V_ERR_CERT_UNTRUSTED.

This also changes the "-brief" output from s_client to include
verification results and TLSA match information.

Mentioned session resumption in code example in SSL_CTX_dane_enable(3).
Also mentioned that depths returned are relative to the verified chain
which is now available via SSL_get0_verified_chain(3).

Added a few more test-cases to danetest, that exercise the new
code.

Resolved thread safety issue in use of static buffer in
X509_verify_cert_error_string().

Fixed long-stating issue in apps/s_cb.c which always sets verify_error
to either X509_V_OK or "chain to long", code elsewhere (e.g.
s_time.c), seems to expect the actual error.  [ The new chain
construction code is expected to correctly generate "chain
too long" errors, so at some point we need to drop the
work-arounds, once SSL_set_verify_depth() is also fixed to
propagate the depth to X509_STORE_CTX reliably. ]

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoFollowing the PKCS#12 update, update crypto/pkcs12/build.info as well
Richard Levitte [Mon, 8 Feb 2016 19:20:43 +0000 (20:20 +0100)]
Following the PKCS#12 update, update crypto/pkcs12/build.info as well

Reviewed-by: Stephen Henson <steve@openssl.org>
3 years agoRemove ancient compatibility defines.
Dr. Stephen Henson [Mon, 8 Feb 2016 19:10:12 +0000 (19:10 +0000)]
Remove ancient compatibility defines.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agomake update
Dr. Stephen Henson [Mon, 8 Feb 2016 17:00:00 +0000 (17:00 +0000)]
make update

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agofix various formatting issues
Dr. Stephen Henson [Fri, 5 Feb 2016 15:43:53 +0000 (15:43 +0000)]
fix various formatting issues

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoOnly use compatibility macros for < 1.1 API.
Dr. Stephen Henson [Fri, 5 Feb 2016 15:43:20 +0000 (15:43 +0000)]
Only use compatibility macros for < 1.1 API.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agorename old functions names in libeay.num
Dr. Stephen Henson [Tue, 12 Jan 2016 00:00:08 +0000 (00:00 +0000)]
rename old functions names in libeay.num

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agouse new function names
Dr. Stephen Henson [Sun, 27 Sep 2015 12:42:04 +0000 (13:42 +0100)]
use new function names

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoAdd p12_sbag.c to Makefile.in
Dr. Stephen Henson [Fri, 5 Feb 2016 15:55:02 +0000 (15:55 +0000)]
Add p12_sbag.c to Makefile.in

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoReorganise functions.
Dr. Stephen Henson [Sun, 27 Sep 2015 12:28:26 +0000 (13:28 +0100)]
Reorganise functions.

Move all PKCS12_SAFEBAG functions into new file p12_sbag.c.

Move MAC functions into p12_mutl.c

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agopkcs12.h header reorganisation.
Dr. Stephen Henson [Sun, 27 Sep 2015 11:51:25 +0000 (12:51 +0100)]
pkcs12.h header reorganisation.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoUse new names
Dr. Stephen Henson [Sun, 27 Sep 2015 11:41:53 +0000 (12:41 +0100)]
Use new names

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoRename PKCS12 function
Dr. Stephen Henson [Sun, 27 Sep 2015 00:09:27 +0000 (01:09 +0100)]
Rename PKCS12 function

Rename ancient PKCS12 functions to use more logical names. Include
defines from old to new name.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoUse accessors in pkcs12 app.
Dr. Stephen Henson [Sat, 26 Sep 2015 23:31:46 +0000 (00:31 +0100)]
Use accessors in pkcs12 app.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agopkcs12 accessors
Dr. Stephen Henson [Sat, 26 Sep 2015 23:33:59 +0000 (00:33 +0100)]
pkcs12 accessors

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agomore PKCS12 opacity
Dr. Stephen Henson [Sat, 26 Sep 2015 12:24:24 +0000 (13:24 +0100)]
more PKCS12 opacity

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoNew PKCS12 accessors, change macros to functions.
Dr. Stephen Henson [Sat, 26 Sep 2015 12:24:00 +0000 (13:24 +0100)]
New PKCS12 accessors, change macros to functions.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoMake PKCS12 structures opaque
Dr. Stephen Henson [Sat, 26 Sep 2015 11:26:51 +0000 (12:26 +0100)]
Make PKCS12 structures opaque

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoDeprecate undocumented SSL_cache_hit().
Dr. Stephen Henson [Mon, 8 Feb 2016 16:18:26 +0000 (16:18 +0000)]
Deprecate undocumented SSL_cache_hit().

Deprecate undocumented SSL_cache_hit(). Make SSL_session_reused() into a
real function.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoGH641: Don't care openssl_zmalloc
Rich Salz [Mon, 8 Feb 2016 15:11:56 +0000 (10:11 -0500)]
GH641: Don't care openssl_zmalloc

Don't cast malloc-family return values.
Also found some places where (a) blank line was missing; and (b)
the *wrong* return value was checked.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoUse File::Path::rmtree rather than File::Path::remove_tree
Richard Levitte [Mon, 8 Feb 2016 15:44:48 +0000 (16:44 +0100)]
Use File::Path::rmtree rather than File::Path::remove_tree

Just like File::Path::make_path, File::Path::remove_tree didn't show
up before File::Path 2.06 / perl v5.10.1, so we prefer the legacy
function here as well.

Reviewed-by: Andy Polyakov <appro@openssl.org>
3 years agoUse File::Path::mkpath rather than File::Path::make_path
Richard Levitte [Mon, 8 Feb 2016 15:27:15 +0000 (16:27 +0100)]
Use File::Path::mkpath rather than File::Path::make_path

File::Path::make_path didn't show up before File::Path 2.06 / perl v5.10.1.
Because we're trying to stay compatible with perl v5.10.0 and up,
it's better to use the legacy interface.

Reviewed-by: Andy Polyakov <appro@openssl.org>
3 years agoFix engine key support in utilities.
Dr. Stephen Henson [Mon, 8 Feb 2016 15:06:48 +0000 (15:06 +0000)]
Fix engine key support in utilities.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agobio/b_sock.c: cleanup obsolete stuff.
Andy Polyakov [Thu, 4 Feb 2016 21:01:23 +0000 (22:01 +0100)]
bio/b_sock.c: cleanup obsolete stuff.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agobn/Makefile.in: remove obsolete rules.
Andy Polyakov [Tue, 2 Feb 2016 11:56:21 +0000 (12:56 +0100)]
bn/Makefile.in: remove obsolete rules.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoConfigurations/00-base-templates.conf: harmonize extensions.
Andy Polyakov [Mon, 1 Feb 2016 16:48:14 +0000 (17:48 +0100)]
Configurations/00-base-templates.conf: harmonize extensions.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoavoid crash if hostserv is with host part only
Roumen Petrov [Sat, 6 Feb 2016 12:07:39 +0000 (14:07 +0200)]
avoid crash if hostserv is with host part only

(if priority is set to host)

Signed-off-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoGH322 revisited: remove unused function.
Rich Salz [Sat, 6 Feb 2016 18:57:21 +0000 (13:57 -0500)]
GH322 revisited: remove unused function.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoMake TESTS= work with "nmake -f ms/ntdll.mak tests"
Rob Percival [Mon, 18 Jan 2016 10:26:17 +0000 (10:26 +0000)]
Make TESTS= work with "nmake -f ms/ntdll.mak tests"

This works on Linux with Make already, and allows running only specified
tests.

Reviewed-by: Ben Laurie <ben@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>