openssl.git
3 years agoAdd lh_new() inlining
Dr. Stephen Henson [Thu, 24 Dec 2015 15:51:23 +0000 (15:51 +0000)]
Add lh_new() inlining

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoInline LHASH_OF
Dr. Stephen Henson [Mon, 11 Jan 2016 14:11:13 +0000 (14:11 +0000)]
Inline LHASH_OF

Make LHASH_OF use static inline functions.

Add new lh_get_down_load and lh_set_down_load functions and their
typesafe inline equivalents.

Make lh_error a function instead of a macro.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoGH540: add casts to safestack.h
Alessandro Ghedini [Sun, 10 Jan 2016 23:02:17 +0000 (23:02 +0000)]
GH540: add casts to safestack.h

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
3 years agoFix jpaketest compilation error.
Dr. Stephen Henson [Mon, 11 Jan 2016 17:11:24 +0000 (17:11 +0000)]
Fix jpaketest compilation error.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoOnly run DANE tests when EC is supported
Richard Levitte [Mon, 11 Jan 2016 16:20:39 +0000 (17:20 +0100)]
Only run DANE tests when EC is supported

Since danetest is to test DANE rather than specific algorithms, it's
acceptable to require EC when testing it.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoMake SSL{_CTX,}_{get,set,clear}_options functions
Viktor Dukhovni [Mon, 11 Jan 2016 01:15:04 +0000 (20:15 -0500)]
Make SSL{_CTX,}_{get,set,clear}_options functions

These now take and return unsigned long, and get is constified.
Updated related documentation and util/ssleay.num

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoAdjust $default_depflags to changes in Configure
Richard Levitte [Mon, 11 Jan 2016 09:59:13 +0000 (10:59 +0100)]
Adjust $default_depflags to changes in Configure

We use $default_depflags to check if a 'make depend' is needed after
configuring, so it needs to be kept up to date.

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoFix NSS format session output
Matt Caswell [Tue, 29 Dec 2015 00:17:10 +0000 (00:17 +0000)]
Fix NSS format session output

Commit 189ae368d91 (RT ticket 3352) provided the capability to output
session key data in NSS format. The big apps cleanup broke that capability.
This commit restores it.

RT#4201

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoUpdate leak test to check return values.
Dr. Stephen Henson [Sun, 10 Jan 2016 23:29:46 +0000 (23:29 +0000)]
Update leak test to check return values.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoAdd memory leak return value.
Dr. Stephen Henson [Sun, 10 Jan 2016 23:25:07 +0000 (23:25 +0000)]
Add memory leak return value.

Make CRYPTO_mem_leaks() and CRYPTO_mem_leaks_fp() return a status value.
Update documentation. Don't abort() if there are leaks.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoEnable/disable crypto-mdebug just like other features
Viktor Dukhovni [Sun, 10 Jan 2016 19:42:10 +0000 (14:42 -0500)]
Enable/disable crypto-mdebug just like other features

Also always abort() on leak failure.

Reviewed-by: Stephen Henson <steve@openssl.org>
3 years agoDisable some algorithms by default
Dr. Stephen Henson [Sun, 10 Jan 2016 13:33:31 +0000 (13:33 +0000)]
Disable some algorithms by default

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoRegenerate SSL record/statem error strings
Viktor Dukhovni [Sat, 9 Jan 2016 22:18:02 +0000 (17:18 -0500)]
Regenerate SSL record/statem error strings

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agofix shadow warning
Dr. Stephen Henson [Sun, 10 Jan 2016 23:28:09 +0000 (23:28 +0000)]
fix shadow warning

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoFile is about s_time, not s_client
Kurt Roeckx [Sat, 2 Jan 2016 19:42:27 +0000 (20:42 +0100)]
File is about s_time, not s_client

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
3 years agoAllow disabling the min and max version
Kurt Roeckx [Sat, 2 Jan 2016 19:06:07 +0000 (20:06 +0100)]
Allow disabling the min and max version

Reviewed-by: Viktor Dukhovni <openssl-users@dukhovni.org>
3 years agoFuture-proof deprecated declartion parsing
Viktor Dukhovni [Sat, 9 Jan 2016 22:11:18 +0000 (17:11 -0500)]
Future-proof deprecated declartion parsing

Support two-digest major/minor/micro numbers and die when the input
fails to parse

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
3 years agoRT41897: Add an CRYPTO_secure_actual_size
Rich Salz [Thu, 7 Jan 2016 21:05:45 +0000 (16:05 -0500)]
RT41897: Add an CRYPTO_secure_actual_size

This is already documented, I just forgot to include the code :)

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoFix c++ compilation
Mat [Sat, 9 Jan 2016 19:15:28 +0000 (20:15 +0100)]
Fix c++ compilation

Fixes https://github.com/openssl/openssl/issues/532

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoAdds missing type casts
Mat [Sat, 9 Jan 2016 19:22:17 +0000 (20:22 +0100)]
Adds missing type casts

This fixes https://github.com/openssl/openssl/issues/534

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoAdds crypto-mdebug as a valid option
Mat [Sat, 9 Jan 2016 22:55:57 +0000 (23:55 +0100)]
Adds crypto-mdebug as a valid option

Adds crypto-mdebug as a valid option. Fixes https://github.com/openssl/openssl/issues/537

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoFix build failure on Windows
Mat [Sat, 9 Jan 2016 18:45:16 +0000 (19:45 +0100)]
Fix build failure on Windows

Fixes https://github.com/openssl/openssl/issues/530

Signed-off-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoupdate ordinals
Dr. Stephen Henson [Sat, 9 Jan 2016 21:55:46 +0000 (21:55 +0000)]
update ordinals

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoAdd DEPRECATEDIN support.
Dr. Stephen Henson [Sat, 9 Jan 2016 13:40:02 +0000 (13:40 +0000)]
Add DEPRECATEDIN support.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoCorrect header defines
Dr. Stephen Henson [Fri, 8 Jan 2016 01:31:39 +0000 (01:31 +0000)]
Correct header defines

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoremove hard coded algorithms
Dr. Stephen Henson [Fri, 8 Jan 2016 01:25:36 +0000 (01:25 +0000)]
remove hard coded algorithms

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoRecognise disabled algorithms automatically.
Dr. Stephen Henson [Thu, 7 Jan 2016 03:19:09 +0000 (03:19 +0000)]
Recognise disabled algorithms automatically.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoFix no CRYPTO_MDEBUG build (windows)
Rich Salz [Fri, 8 Jan 2016 02:40:52 +0000 (21:40 -0500)]
Fix no CRYPTO_MDEBUG build (windows)

In order for mkdep to find #ifdef'd functions, they must be
wrapped (in the header file) with
        #ifndef OPENSSL_NO_...
So do that for various CRYPTO_mem_debug... things.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoFixup actually update danetest.c
Viktor Dukhovni [Fri, 8 Jan 2016 00:16:10 +0000 (19:16 -0500)]
Fixup actually update danetest.c

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoAnother portability fix.
Rich Salz [Fri, 8 Jan 2016 18:06:01 +0000 (13:06 -0500)]
Another portability fix.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoUpdate comment as bn_dup_expand is gone
Viktor Dukhovni [Fri, 8 Jan 2016 04:56:43 +0000 (23:56 -0500)]
Update comment as bn_dup_expand is gone

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoSimplify deprecated declaration exception
Viktor Dukhovni [Fri, 8 Jan 2016 04:47:30 +0000 (23:47 -0500)]
Simplify deprecated declaration exception

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoPortability fix for apps/s_client.c
Rich Salz [Fri, 8 Jan 2016 15:36:37 +0000 (10:36 -0500)]
Portability fix for apps/s_client.c

Make some local variables and a table of them be static.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoDANE CHANGES
Viktor Dukhovni [Fri, 8 Jan 2016 03:00:14 +0000 (22:00 -0500)]
DANE CHANGES

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoFix some typos in comments
Viktor Dukhovni [Wed, 6 Jan 2016 20:28:39 +0000 (15:28 -0500)]
Fix some typos in comments

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoBackwards-compatibility subject to OPENSSL_API_COMPAT
Viktor Dukhovni [Tue, 5 Jan 2016 04:00:33 +0000 (23:00 -0500)]
Backwards-compatibility subject to OPENSSL_API_COMPAT

Provide backwards-compatiblity for functions, macros and include
files if OPENSSL_API_COMPAT is either not defined or defined less
than the version number of the release in which the feature was
deprecated.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoDANE s_client support
Viktor Dukhovni [Tue, 29 Dec 2015 19:25:50 +0000 (14:25 -0500)]
DANE s_client support

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRemove all remaining traces if PEM_Seal
Richard Levitte [Thu, 7 Jan 2016 22:28:15 +0000 (23:28 +0100)]
Remove all remaining traces if PEM_Seal

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoMinor test update
Viktor Dukhovni [Thu, 7 Jan 2016 21:53:29 +0000 (16:53 -0500)]
Minor test update

* Remove extraneous test/Makefile.orig
* Use basedomain instead of argv[1] in test/danetest.c

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoFix another build break for no-mem-debug
Rich Salz [Thu, 7 Jan 2016 21:16:22 +0000 (16:16 -0500)]
Fix another build break for no-mem-debug

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoFix build-break; 'make update'
Rich Salz [Thu, 7 Jan 2016 20:40:08 +0000 (15:40 -0500)]
Fix build-break; 'make update'

Commit bbd86bf5424a611cb6b77a3a17fc522931c4dcb8 broke certain builds.
Commit 0674427f71ca050e3c61a7ec9dc71b208c3b39f5 missing 'make update'

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agomem functions cleanup
Rich Salz [Thu, 7 Jan 2016 20:06:38 +0000 (15:06 -0500)]
mem functions cleanup

Only two macros CRYPTO_MDEBUG and CRYPTO_MDEBUG_ABORT to control this.
If CRYPTO_MDEBUG is not set, #ifdef out the whole debug machinery.
        (Thanks to Jakob Bohm for the suggestion!)
Make the "change wrapper functions" be the only paradigm.
Wrote documentation!
Format the 'set func' functions so their paramlists are legible.
Format some multi-line comments.
Remove ability to get/set the "memory debug" functions at runtme.
Remove MemCheck_* and CRYPTO_malloc_debug_init macros.
Add CRYPTO_mem_debug(int flag) function.
Add test/memleaktest.
Rename CRYPTO_malloc_init to OPENSSL_malloc_init; remove needless calls.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRemove the old VMS linker option file creator for shlibs
Richard Levitte [Thu, 7 Jan 2016 19:51:28 +0000 (20:51 +0100)]
Remove the old VMS linker option file creator for shlibs

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoEnhance util/mkdef.pl to provide a VMS linker option file for shlibs
Richard Levitte [Thu, 7 Jan 2016 19:49:53 +0000 (20:49 +0100)]
Enhance util/mkdef.pl to provide a VMS linker option file for shlibs

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoRemove crypto/pem/pem_seal.c
Richard Levitte [Thu, 7 Jan 2016 19:45:37 +0000 (20:45 +0100)]
Remove crypto/pem/pem_seal.c

It's functionality appears unused.  If we're wrong, we will revert.

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoDANE support for X509_verify_cert()
Viktor Dukhovni [Tue, 29 Dec 2015 19:12:36 +0000 (14:12 -0500)]
DANE support for X509_verify_cert()

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agouse more descriptive name DEFINE_STACK_OF_CONST
Dr. Stephen Henson [Thu, 7 Jan 2016 17:02:20 +0000 (17:02 +0000)]
use more descriptive name DEFINE_STACK_OF_CONST

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoOnly declare stacks in headers
Dr. Stephen Henson [Wed, 6 Jan 2016 02:54:18 +0000 (02:54 +0000)]
Only declare stacks in headers

Don't define stacks in C source files: it causes warnings
about unused functions in some compilers.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoRename DECLARE*STACK_OF to DEFINE*STACK_OF
Dr. Stephen Henson [Mon, 28 Dec 2015 00:04:33 +0000 (00:04 +0000)]
Rename DECLARE*STACK_OF to DEFINE*STACK_OF

Applications wishing to include their own stacks now just need to include

DEFINE_STACK_OF(foo)

in a header file.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoremove unused PREDECLARE
Dr. Stephen Henson [Sun, 27 Dec 2015 23:46:39 +0000 (23:46 +0000)]
remove unused PREDECLARE

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoFix declarations and constification for inline stack.
Dr. Stephen Henson [Wed, 23 Dec 2015 00:47:28 +0000 (00:47 +0000)]
Fix declarations and constification for inline stack.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoChange STACK_OF to use inline functions.
Dr. Stephen Henson [Wed, 23 Dec 2015 00:47:13 +0000 (00:47 +0000)]
Change STACK_OF to use inline functions.

Change DECLARE_STACK_OF into inline functions. This avoids the need for
auto generated mkstack.pl macros and now handles const properly.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoDANE make update
Viktor Dukhovni [Tue, 29 Dec 2015 19:40:46 +0000 (14:40 -0500)]
DANE make update

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoDANE documentation typos
Viktor Dukhovni [Wed, 6 Jan 2016 18:48:16 +0000 (13:48 -0500)]
DANE documentation typos

Reported-by: Claus Assmann
Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoRemove more (rest?) of FIPS build stuff.
Rich Salz [Mon, 14 Dec 2015 20:24:27 +0000 (15:24 -0500)]
Remove more (rest?) of FIPS build stuff.

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
3 years agoRemove some unused perl scripts
Rich Salz [Fri, 18 Dec 2015 03:20:01 +0000 (22:20 -0500)]
Remove some unused perl scripts

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoDANE support structures, constructructors and accessors
Viktor Dukhovni [Tue, 29 Dec 2015 18:28:28 +0000 (13:28 -0500)]
DANE support structures, constructructors and accessors

Also tweak some of the code in demos/bio, to enable interactive
testing of BIO_s_accept's use of SSL_dup.  Changed the sconnect
client to authenticate the server, which now exercises the new
SSL_set1_host() function.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoFix X509_STORE_CTX_cleanup()
Viktor Dukhovni [Fri, 1 Jan 2016 05:51:12 +0000 (00:51 -0500)]
Fix X509_STORE_CTX_cleanup()

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
3 years agoDrop incorrect id == -1 case from X509_check_trust
Viktor Dukhovni [Tue, 29 Dec 2015 18:16:47 +0000 (13:16 -0500)]
Drop incorrect id == -1 case from X509_check_trust

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoX509_verify_cert() cleanup
Viktor Dukhovni [Tue, 29 Dec 2015 17:42:57 +0000 (12:42 -0500)]
X509_verify_cert() cleanup

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoCleanup of verify(1) failure output
Viktor Dukhovni [Fri, 1 Jan 2016 23:45:29 +0000 (18:45 -0500)]
Cleanup of verify(1) failure output

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoInstead of a local hack, implement SIZE_MAX in numbers.h if it's missing
Richard Levitte [Sat, 2 Jan 2016 18:19:00 +0000 (19:19 +0100)]
Instead of a local hack, implement SIZE_MAX in numbers.h if it's missing

Reviewed-by: Stephen Henson <steve@openssl.org>
3 years agoFix a possible memleak
Richard Levitte [Fri, 18 Dec 2015 12:03:45 +0000 (13:03 +0100)]
Fix a possible memleak

If there's a failure allocating md_data, the destination pctx will have
a shared pointer with the source EVP_MD_CTX, which will lead to problems
when either the source or the destination is freed.

Reviewed-by: Stephen Henson <steve@openssl.org>
3 years agoProtocol version selection and negotiation rewrite
Viktor Dukhovni [Tue, 29 Dec 2015 08:24:17 +0000 (03:24 -0500)]
Protocol version selection and negotiation rewrite

The protocol selection code is now consolidated in a few consecutive
short functions in a single file and is table driven.  Protocol-specific
constraints that influence negotiation are moved into the flags
field of the method structure.  The same protocol version constraints
are now applied in all code paths.  It is now much easier to add
new protocol versions without reworking the protocol selection
logic.

In the presence of "holes" in the list of enabled client protocols
we no longer select client protocols below the hole based on a
subset of the constraints and then fail shortly after when it is
found that these don't meet the remaining constraints (suiteb, FIPS,
security level, ...).  Ideally, with the new min/max controls users
will be less likely to create "holes" in the first place.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
3 years agoRefine and re-wrap Min/Max protocol docs
Viktor Dukhovni [Tue, 29 Dec 2015 08:19:24 +0000 (03:19 -0500)]
Refine and re-wrap Min/Max protocol docs

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoAdd support for minimum and maximum protocol version
Kurt Roeckx [Sun, 6 Dec 2015 16:56:41 +0000 (17:56 +0100)]
Add support for minimum and maximum protocol version

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoFix no-dh.
Ben Laurie [Fri, 1 Jan 2016 15:39:31 +0000 (15:39 +0000)]
Fix no-dh.

Reviewed-by: Stephen Henson <steve@openssl.org>
3 years agoremove invalid free
Dr. Stephen Henson [Fri, 1 Jan 2016 00:47:06 +0000 (00:47 +0000)]
remove invalid free

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoUse X509_get0_pubkey where appropriate
Dr. Stephen Henson [Sun, 20 Dec 2015 00:32:36 +0000 (00:32 +0000)]
Use X509_get0_pubkey where appropriate

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoUpdate to SHA256 for TSA signing digest.
Rich Salz [Wed, 30 Dec 2015 23:18:08 +0000 (18:18 -0500)]
Update to SHA256 for TSA signing digest.

Reviewed-by: Richard Levitte <levitte@openssl.org>
3 years agoFix faulty check in the VMS version of opt_progname
Richard Levitte [Wed, 30 Dec 2015 15:57:05 +0000 (16:57 +0100)]
Fix faulty check in the VMS version of opt_progname

Reviewed-by: Stephen Henson <steve@openssl.org>
3 years agoRemove the #ifndef OPENSSL_SYS_VMS around SSL_add_dir_cert_subjects_to_stack
Richard Levitte [Wed, 30 Dec 2015 15:56:05 +0000 (16:56 +0100)]
Remove the #ifndef OPENSSL_SYS_VMS around SSL_add_dir_cert_subjects_to_stack

It served a purpose, but not any more.

Reviewed-by: Stephen Henson <steve@openssl.org>
3 years agoCorrect missing prototype
Richard Levitte [Wed, 30 Dec 2015 13:57:16 +0000 (14:57 +0100)]
Correct missing prototype

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoSIZE_MAX doesn't exist everywhere, supply an alternative
Richard Levitte [Wed, 30 Dec 2015 13:56:59 +0000 (14:56 +0100)]
SIZE_MAX doesn't exist everywhere, supply an alternative

SIZE_MAX is a great macro, and does unfortunately not exist everywhere.
Since we check against half of it, using bitwise shift to calculate the
value of half SIZE_MAX should be safe enough.

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoFix some missing or faulty header file inclusions
Richard Levitte [Wed, 30 Dec 2015 13:54:29 +0000 (14:54 +0100)]
Fix some missing or faulty header file inclusions

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoCheck for missing DSA parameters.
Dr. Stephen Henson [Wed, 30 Dec 2015 13:34:53 +0000 (13:34 +0000)]
Check for missing DSA parameters.

If DSA parameters are absent return -1 (for unknown) in DSA_security_bits.

If parameters are absent when a certificate is set in an SSL/SSL_CTX
structure this will reject the certificate by default. This will cause DSA
certificates which omit parameters to be rejected but that is never (?)
done in practice.

Thanks to Brian 'geeknik' Carpenter for reporting this issue.

Reviewed-by: Emilia Käsper <emilia@openssl.org>
3 years agoConvert RSA encrypt to use EVP_PKEY
Dr. Stephen Henson [Mon, 28 Dec 2015 00:45:48 +0000 (00:45 +0000)]
Convert RSA encrypt to use EVP_PKEY

Reviewed-by: Rich Salz <rsalz@openssl.org>
3 years agoPrefer ReuseAddr over Reuse, with IO::Socket::INET
Richard Levitte [Sat, 26 Dec 2015 22:42:11 +0000 (23:42 +0100)]
Prefer ReuseAddr over Reuse, with IO::Socket::INET

Reuse is deprecated and ReuseAddr is prefered, according to documentation.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoFix no-engine.
Ben Laurie [Sun, 27 Dec 2015 14:59:04 +0000 (14:59 +0000)]
Fix no-engine.

Reviewed-by: Kurt Roeckx <kurt@openssl.org>
3 years agoRT4202: Update rt URL's.
Rich Salz [Mon, 28 Dec 2015 19:58:23 +0000 (14:58 -0500)]
RT4202: Update rt URL's.

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agomake a "missed make update" update
Rich Salz [Mon, 28 Dec 2015 19:53:28 +0000 (14:53 -0500)]
make a "missed make update" update

Reviewed-by: Tim Hudson <tjh@openssl.org>
3 years agoIncrease the max size limit for a CertificateRequest message
Matt Caswell [Wed, 23 Dec 2015 16:36:59 +0000 (16:36 +0000)]
Increase the max size limit for a CertificateRequest message

Previous versions of OpenSSL had the max size limit for a CertificateRequest
message as |s->max_cert_list|. Previously master had it to be
SSL3_RT_MAX_PLAIN_LENGTH. However these messages can get quite long if a
server is configured with a long list of acceptable CA names. Therefore
the size limit has been increased to be consistent with previous versions.

RT#4198

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoSimplify calling of the OCSP callback
Matt Caswell [Thu, 10 Dec 2015 10:44:30 +0000 (10:44 +0000)]
Simplify calling of the OCSP callback

Move all calls of the OCSP callback into one place, rather than repeating it
in two different places.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoAdd some documentation for the OCSP callback functions
Matt Caswell [Mon, 30 Nov 2015 16:04:51 +0000 (16:04 +0000)]
Add some documentation for the OCSP callback functions

Describe the usage of the OCSP callback functions on both the client and
the server side.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoEnsure we don't call the OCSP callback if resuming a session
Matt Caswell [Mon, 30 Nov 2015 13:29:41 +0000 (13:29 +0000)]
Ensure we don't call the OCSP callback if resuming a session

It makes no sense to call the OCSP status callback if we are resuming a
session because no certificates will be sent.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoFix error when server does not send CertificateStatus message
Matt Caswell [Thu, 5 Nov 2015 14:31:11 +0000 (14:31 +0000)]
Fix error when server does not send CertificateStatus message

If a server sends the status_request extension then it may choose
to send the CertificateStatus message. However this is optional.
We were treating it as mandatory and the connection was failing.

Thanks to BoringSSL for reporting this issue.

RT#4120

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agoAdd test for missing CertificateStatus message
Matt Caswell [Thu, 5 Nov 2015 14:08:54 +0000 (14:08 +0000)]
Add test for missing CertificateStatus message

If the client sends a status_request extension in the ClientHello
and the server responds with a status_request extension in the
ServerHello then normally the server will also later send a
CertificateStatus message. However this message is *optional* even
if the extensions were sent. This adds a test to ensure that if
the extensions are sent then we can still omit the message.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
3 years agofix no-ec
Dr. Stephen Henson [Thu, 24 Dec 2015 00:23:29 +0000 (00:23 +0000)]
fix no-ec

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoServer side EVP_PKEY DH support
Dr. Stephen Henson [Thu, 17 Dec 2015 00:05:26 +0000 (00:05 +0000)]
Server side EVP_PKEY DH support

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoutility function
Dr. Stephen Henson [Fri, 18 Dec 2015 15:58:28 +0000 (15:58 +0000)]
utility function

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoEVP_PKEY DH client support.
Dr. Stephen Henson [Thu, 17 Dec 2015 01:07:46 +0000 (01:07 +0000)]
EVP_PKEY DH client support.

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoAlways generate DH keys for ephemeral DH cipher suites.
Dr. Stephen Henson [Thu, 17 Dec 2015 02:57:20 +0000 (02:57 +0000)]
Always generate DH keys for ephemeral DH cipher suites.

Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoThe functions take a SSL *, not a SSL_CTX *
Daniel Kahn Gillmor [Wed, 23 Dec 2015 20:03:32 +0000 (21:03 +0100)]
The functions take a SSL *, not a SSL_CTX *

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
RT: #4192, MR: #1533

3 years agoredundant redeclaration of 'OPENSSL_strlcpy'
Roumen Petrov [Mon, 21 Dec 2015 16:45:06 +0000 (18:45 +0200)]
redundant redeclaration of 'OPENSSL_strlcpy'

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
MR: #1523

3 years ago__STDC_VERSION__ is not defined for c89 compilers
Roumen Petrov [Thu, 3 Dec 2015 21:43:24 +0000 (23:43 +0200)]
__STDC_VERSION__ is not defined for c89 compilers

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
MR: #1522

3 years agoremove duplicates in util/libeay.num
Roumen Petrov [Sat, 21 Mar 2015 13:29:25 +0000 (15:29 +0200)]
remove duplicates in util/libeay.num

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Rich Salz <rsalz@openssl.org>
RT: #4195, MR: #1521

3 years agoRemove SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER and SSL_OP_TLS_D5_BUG support.
Kurt Roeckx [Tue, 22 Dec 2015 12:48:01 +0000 (13:48 +0100)]
Remove SSL_OP_MICROSOFT_BIG_SSLV3_BUFFER and SSL_OP_TLS_D5_BUG support.

Suggested by David Benjamin

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Viktor Dukhovni <openssl-users@dukhovni.org>
MR: #1520

3 years agoAvoid using a dangling pointer when removing the last item
Kurt Roeckx [Tue, 22 Dec 2015 12:11:59 +0000 (13:11 +0100)]
Avoid using a dangling pointer when removing the last item

When it's the last item that is removed int_thread_hash == hash and we would
still call int_thread_release(&hash) while hash is already freed.  So
int_thread_release would compare that dangling pointer to NULL which is
undefined behaviour.  Instead do already what int_thread_release() would do,
and make the call do nothing instead.

Reviewed-by: Rich Salz <rsalz@openssl.org>
RT: #4155, MR: #1519

3 years agoMemory leak in state machine in error path
Todd Short [Tue, 22 Dec 2015 16:49:36 +0000 (11:49 -0500)]
Memory leak in state machine in error path

When EC is disabled, and an error occurs in ssl_generate_master_secret()
or RAND_bytes(), the error path does not free rsa_decrypt.

RT#4197

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
3 years agoRefactor DTLS cookie generation and verification
Richard Levitte [Wed, 23 Dec 2015 10:40:43 +0000 (11:40 +0100)]
Refactor DTLS cookie generation and verification

DTLS cookie generation and verification were exact copies of each
other save the last few lines.  This refactors them to avoid code
copying.

Reviewed-by: Matt Caswell <matt@openssl.org>