Emilia Kasper [Tue, 2 Feb 2016 16:12:45 +0000 (17:12 +0100)]
RT 3854: Update apps/req
Change the default keysize to 2048 bits, and the minimum to 512 bits.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Richard Levitte [Fri, 12 Feb 2016 11:10:27 +0000 (12:10 +0100)]
Remove last chomps
In the previous commit to change all chomp to a more flexible regexp,
Configure was forgotten. This completes the change.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Matt Caswell [Fri, 12 Feb 2016 10:06:45 +0000 (10:06 +0000)]
Fix the enable-ssl-trace config option
The recent removal of static ECDH broke the enable-ssl-trace compilation.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Richard Levitte [Thu, 11 Feb 2016 23:38:53 +0000 (00:38 +0100)]
make generate
Reviewed-by: Rich Salz <rsalz@openssl.org>
Richard Levitte [Thu, 11 Feb 2016 23:34:40 +0000 (00:34 +0100)]
Generate progs.h from a bunch of files instead of internal knowledge
apps/progs.pl counted on the caller to provide the exact command
files. The unified build doesn't have that knowledge, and the easier
and more flexible thing to do is to feed it all the apps/*.c files and
let it figure out the command names by looking inside (looking for
/int ([a-z0-9][a-z0-9_]*)_main\(int argc,/).
Also, add it to the generate command, since it's a versioned file.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Dr. Stephen Henson [Thu, 11 Feb 2016 22:46:01 +0000 (22:46 +0000)]
Typo: only return error if unrecognise bag type.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Richard Levitte [Thu, 11 Feb 2016 21:06:17 +0000 (22:06 +0100)]
State the minimum Perl version that our scripts will work with
Reviewed-by: Rich Salz <rsalz@openssl.org>
Richard Levitte [Thu, 11 Feb 2016 20:47:30 +0000 (21:47 +0100)]
Perl's chop / chomp considered bad, use a regexp instead
Once upon a time, there was chop, which somply chopped off the last
character of $_ or a given variable, and it was used to take off the
EOL character (\n) of strings.
... but then, you had to check for the presence of such character.
So came chomp, the better chop which checks for \n before chopping it
off. And this worked well, as long as Perl made internally sure that
all EOLs were converted to \n.
These days, though, there seems to be a mixture of perls, so lines
from files in the "wrong" environment might have \r\n as EOL, or just
\r (Mac OS, unless I'm misinformed).
So it's time we went for the more generic variant and use s|\R$||, the
better chomp which recognises all kinds of known EOLs and chops them
off.
A few chops were left alone, as they are use as surgical tools to
remove one last slash or one last comma.
NOTE: \R came with perl 5.10.0. It means that from now on, our
scripts will fail with any older version.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Dr. Stephen Henson [Thu, 11 Feb 2016 18:41:11 +0000 (18:41 +0000)]
update ciphers manual page
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Dr. Stephen Henson [Thu, 11 Feb 2016 18:19:27 +0000 (18:19 +0000)]
Remove static ECDH support.
Remove support for static ECDH ciphersuites. They require ECDH keys
in certificates and don't support forward secrecy.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Andy Polyakov [Wed, 10 Feb 2016 14:11:40 +0000 (15:11 +0100)]
perlasm/x86_64-xlate.pl: pass pure constants verbatim.
RT#3885
Reviewed-by: Rich Salz <rsalz@openssl.org>
Andy Polyakov [Wed, 3 Feb 2016 17:21:00 +0000 (18:21 +0100)]
util/mk1mf.pl: use LINK_CMD instead of LINK variable.
Trouble is that LINK variable assignment in make-file interferes with
LINK environment variable, which can be used to modify Microsoft's
LINK.EXE behaviour.
RT#4289
Reviewed-by: Richard Levitte <levitte@openssl.org>
Andy Polyakov [Thu, 11 Feb 2016 08:39:37 +0000 (09:39 +0100)]
poly1305/asm/poly1305-x86_64.pl: MacOS X portability fix.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Andy Polyakov [Wed, 10 Feb 2016 23:36:48 +0000 (00:36 +0100)]
poly1305/asm/poly1305-x86_64.pl: fix mingw64 build.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Richard Levitte [Thu, 11 Feb 2016 19:00:57 +0000 (20:00 +0100)]
Add the generate mechanism from unixmake to unix-Makefile.tmpl
Reviewed-by: Rich Salz <rsalz@openssl.org>
Dr. Stephen Henson [Thu, 11 Feb 2016 15:25:11 +0000 (15:25 +0000)]
Don't check self signed certificate signature security.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Viktor Dukhovni [Thu, 11 Feb 2016 18:44:53 +0000 (13:44 -0500)]
Fix MacOS/X build warnings
Commit
7823d792d0cad3b44ad5389a8d3381becefe7f44 added DEFINE_LHASH_OF
to a C source file. DEFINE_LHASH_OF() and DEFINE_STACK_OF() must
be used only in header files to avoid clang warnings for unused
static-inline functions.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Rich Salz [Thu, 11 Feb 2016 18:16:14 +0000 (13:16 -0500)]
Don't add filename comment.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Rich Salz [Mon, 25 Jan 2016 18:30:37 +0000 (13:30 -0500)]
Remove TLS heartbeat, disable DTLS heartbeat
To enable heartbeats for DTLS, configure with enable-heartbeats.
Heartbeats for TLS have been completely removed.
This addresses RT 3647
Reviewed-by: Richard Levitte <levitte@openssl.org>
Rich Salz [Sat, 30 Jan 2016 17:04:25 +0000 (12:04 -0500)]
Move to REF_DEBUG, for consistency.
Add utility macros REF_ASSERT_NOT and REF_PRINT_COUNT
This is also RT 4181
Reviewed-by: Richard Levitte <levitte@openssl.org>
Toshikuni Fukaya [Wed, 3 Feb 2016 18:08:45 +0000 (13:08 -0500)]
RT3495: Add a hash for faster dup detection.
Updated for 1.1 by Rich Salz
Reviewed-by: Richard Levitte <levitte@openssl.org>
Rich Salz [Thu, 21 Jan 2016 19:53:18 +0000 (14:53 -0500)]
Fix GH 327.
Valgrind complains about using unitialized memory. So call
OPENSSL_zalloc, not malloc.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Richard Levitte [Thu, 11 Feb 2016 11:59:33 +0000 (12:59 +0100)]
Make util/mkrc.pl location agnostic and adapt Makefile.shared
With this, Cygwin and Mingw builds stand a much better chance to be
able to build outside of the source tree with the unified build.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Richard Levitte [Thu, 11 Feb 2016 12:10:11 +0000 (13:10 +0100)]
Make shared library targets more consistent
On Windows POSIX layers, two files are produced for a shared library,
there's {shlibname}.dll and there's the import library {libname}.dll.a
On some/most Unix platforms, a {shlibname}.{sover}.so and a symlink
{shlibname}.so are produced.
For each of them, unix-Makefile.tmpl was entirely consistent on which
to have as a target when building a shared library or which to use as
dependency.
This change clears this up and makes it consistent, we use the
simplest form possible, {lib}.dll.a on Windows POSIX layers and
{shlibname}.so on Unix platforms. No exception.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Dr. Stephen Henson [Thu, 11 Feb 2016 15:51:31 +0000 (15:51 +0000)]
Fix engine key support in cms and req utilities.
PR#4246 and PR#4266
Reviewed-by: Rich Salz <rsalz@openssl.org>
Dr Stephen Henson [Tue, 9 Feb 2016 14:33:51 +0000 (14:33 +0000)]
Test for and use AES CSP for RSA if present.
Some keys are attached to the full RSA CSP which doesn't support SHA2
algorithms: uses the AES CSP if present.
Reviewed-by: Tim Hudson <tjh@openssl.org>
Richard Levitte [Fri, 5 Feb 2016 14:17:33 +0000 (15:17 +0100)]
Add support for shared_rcflag, useful for windres (Cygwin and Mingw)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Richard Levitte [Fri, 5 Feb 2016 14:14:45 +0000 (15:14 +0100)]
Modernise the mingw cflags and ldflags
Reviewed-by: Rich Salz <rsalz@openssl.org>
Richard Levitte [Thu, 11 Feb 2016 14:22:27 +0000 (15:22 +0100)]
Unified build: Keep track of generated header files
If someone runs a mixed unixmake / unified environment (the unified
build tree would obviously be out of the source tree), the unified
build will pick up on the unixmake crypto/buildinf.h because of
assumptions made around this sort of declaration (found in
crypto/build.info):
DEPENDS[cversion.o]=buildinf.h
The assumption was that if such a header could be found in the source
tree, that was the one to depend on, otherwise it would assume it
should be in the build tree.
This change makes sure that sort of mix-up won't happen again.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Richard Levitte [Thu, 11 Feb 2016 15:12:24 +0000 (16:12 +0100)]
Remove the "make depend" message
It's not necessary for a pristine source, and a developer that makes
changes usually knows what to do.
Also, there was this mechanism that would do a "make depend"
automatically which hasn't been used for so many years. Removed as
well.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Viktor Dukhovni [Thu, 11 Feb 2016 04:53:54 +0000 (23:53 -0500)]
Simplify ssl_cert_type() by taking advantage of X509_get0_pubkey
Reviewed-by: Rich Salz <rsalz@openssl.org>
Rich Salz [Thu, 11 Feb 2016 14:33:51 +0000 (09:33 -0500)]
GH620: second diff from rt-2275, adds error code
clean up and apply patches from RT-2275
Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Rich Salz [Thu, 11 Feb 2016 14:12:33 +0000 (09:12 -0500)]
Check malloc
Noticed by Claus Assmann <ca+ssl-dev@esmtp.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Rich Salz [Thu, 11 Feb 2016 13:27:53 +0000 (08:27 -0500)]
Missing header include.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Rich Salz [Wed, 10 Feb 2016 14:55:48 +0000 (09:55 -0500)]
Hide OPENSSL_INIT_SETTINGS.
Make OPENSSL_INIT_SETTINGS an opaque structure.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Richard Levitte [Thu, 11 Feb 2016 11:28:26 +0000 (12:28 +0100)]
Add inclusion directory crypto/include for BN compilations
Some files in crypto/bn depend on internal/bn_conf.h, and so does
test/bntest. Therefore, we add another inclusion directory.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Richard Levitte [Wed, 10 Feb 2016 21:36:02 +0000 (22:36 +0100)]
The protocol variable has lost its use, remove it
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Richard Levitte [Wed, 10 Feb 2016 21:33:44 +0000 (22:33 +0100)]
Rework BIO_ADDRINFO_protocol() to return correct values
As noted already, some platforms don't fill in ai_protocol as
expected. To circumvent that, we have BIO_ADDRINFO_protocol() to
compute a sensible answer in that case.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Matt Caswell [Wed, 10 Feb 2016 19:41:27 +0000 (19:41 +0000)]
Fix errstr error code parsing
Error codes are printed in hex, and previous OpenSSL versions expected
the error codes to be provided to errstr in hex. In 1.1.0, for some
reason, it was expecting them to be decimal.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Richard Levitte [Wed, 10 Feb 2016 22:31:43 +0000 (23:31 +0100)]
Make comment match reality
Reviewed-by: Rich Salz <rsalz@openssl.org>
Dr. Stephen Henson [Thu, 11 Feb 2016 00:23:17 +0000 (00:23 +0000)]
use consistent error messages
Reviewed-by: Richard Levitte <levitte@openssl.org>
Dr. Stephen Henson [Wed, 10 Feb 2016 23:54:52 +0000 (23:54 +0000)]
Print out bad content octets.
If asn1parse doesn't like a structure print out the content octets
for diagnostic purposes.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Richard Levitte [Wed, 10 Feb 2016 22:27:28 +0000 (23:27 +0100)]
After auto init, check that the deprecated functions exist before using
The functions that have been deprecated by the auto init changes are
now guarded with deprecation checks, so it's fairly easy to see if
they can be used.
In test/dtlsv1listentest, we simply remove all init and cleanup code,
as they are call automatically when needed.
Reviewed-by: Matt Caswell <matt@openssl.org>
Richard Levitte [Wed, 10 Feb 2016 21:25:48 +0000 (22:25 +0100)]
Change the VMS perl pointer from SF file store to the project page
Reviewed-by: Rich Salz <rsalz@openssl.org>
Rich Salz [Wed, 10 Feb 2016 20:20:48 +0000 (15:20 -0500)]
After renaming init, update errors.
Reviewed-by: Matt Caswell <matt@openssl.org>
Rich Salz [Wed, 10 Feb 2016 05:51:29 +0000 (00:51 -0500)]
BIO_PAIR_DEBUG did nothing; remove it.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Richard Levitte [Wed, 10 Feb 2016 19:54:48 +0000 (20:54 +0100)]
Use the protocol we know rather than BIO_ADDRINFO_protocol(res)
Because some platforms won't will in any value in ai_protocol, there's
no point using it if we already know what it should be.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Richard Levitte [Wed, 10 Feb 2016 19:23:40 +0000 (20:23 +0100)]
Don't assert protocol equality
It seems that some platforms' getaddrinfo don't fill in the
ai_protocol field properly. On those, the assertion
'protocol == BIO_ADDRINFO_protocol(res)' will fail. Best to remove
it.
Reviewed-by: Kurt Roeckx <kurt@openssl.org>
Todd Short [Mon, 28 Dec 2015 14:41:52 +0000 (09:41 -0500)]
Add CHACHA20 alias for ciphers.
Update ciphers documentation as well (based on -04 rev of ID).
Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
RT: #4206, GH: #642
Dmitry-Me [Wed, 10 Feb 2016 19:08:09 +0000 (20:08 +0100)]
Ensure allocation size fits into size_t
Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
GH: #630
Dr. Stephen Henson [Wed, 10 Feb 2016 19:04:08 +0000 (19:04 +0000)]
typo
Reviewed-by: Rich Salz <rsalz@openssl.org>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
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>
Rich Salz [Tue, 9 Feb 2016 21:01:25 +0000 (16:01 -0500)]
Portability fix
Reviewed-by: Matt Caswell <matt@openssl.org>
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>
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>
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>
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>