openssl.git
4 years agobuild.info files: add quotes around any spec that may contain spaces
Richard Levitte [Tue, 24 May 2016 15:41:56 +0000 (17:41 +0200)]
build.info files: add quotes around any spec that may contain spaces

RT#4492

Reviewed-by: Tim Hudson <tjh@openssl.org>
4 years agoConfigure: To allow file names with spaces, tokenize with respect for quotes
Richard Levitte [Tue, 24 May 2016 15:39:52 +0000 (17:39 +0200)]
Configure: To allow file names with spaces, tokenize with respect for quotes

For parsing build.info files.

RT#4492

Reviewed-by: Tim Hudson <tjh@openssl.org>
4 years agoComplete the list of files to clean up on Windows
Richard Levitte [Mon, 16 May 2016 12:58:33 +0000 (14:58 +0200)]
Complete the list of files to clean up on Windows

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoCommunicate Configure generated header files to build files
Richard Levitte [Mon, 16 May 2016 12:54:39 +0000 (14:54 +0200)]
Communicate Configure generated header files to build files

Add Configure generated header files to $unified_info{generate}.  This
makes sure the build files will pick them up with the rest for the
GENERATED macro, and thereby make sure they get cleaned away by 'make
clean'

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoAvoid creating an illegal pointer
Kurt Roeckx [Mon, 23 May 2016 21:09:33 +0000 (23:09 +0200)]
Avoid creating an illegal pointer

Found by tis-interpreter

Reviewed-by: Richard Levitte <levitte@openssl.org>
GH: #1115

4 years agoGH919: Fix wrappers for two headers
Rich Salz [Tue, 24 May 2016 13:19:43 +0000 (09:19 -0400)]
GH919: Fix wrappers for two headers

Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoFix braces in e_aes.c: aes_init_key
Todd Short [Tue, 24 May 2016 13:03:25 +0000 (09:03 -0400)]
Fix braces in e_aes.c: aes_init_key

This compiles correctly, but depending on what may be defined, it's
possible that this could fail compilation. The braces are mismatched,
and it's possible to end up with an else followed by another else.

This presumes the indentation is mostly correct and indicative of
intent. Found via static analysis.

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

4 years agoClean up RAND_bytes() calls
Todd Short [Tue, 24 May 2016 12:55:12 +0000 (08:55 -0400)]
Clean up RAND_bytes() calls

When RAND_pseudo_bytes() was replaced with RAND_bytes(), this case
was not reduced to a simple RAND_bytes() call.

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

4 years agoFix a mem leak on an error path in OBJ_NAME_add()
Matt Caswell [Mon, 9 May 2016 16:44:26 +0000 (17:44 +0100)]
Fix a mem leak on an error path in OBJ_NAME_add()

If lh_OBJ_NAME_insert() fails then the allocated |onp| value is leaked.

RT#2238

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoFix error return value in SRP functions
Matt Caswell [Mon, 25 Apr 2016 15:22:31 +0000 (16:22 +0100)]
Fix error return value in SRP functions

The functions SRP_Calc_client_key() and SRP_Calc_server_key() were
incorrectly returning a valid pointer in the event of error.

Issue reported by Yuan Jochen Kang

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoAdd error return for OPENSSL_INIT_set_config_filename()
Matt Caswell [Mon, 23 May 2016 09:55:54 +0000 (10:55 +0100)]
Add error return for OPENSSL_INIT_set_config_filename()

The OPENSSL_INIT_set_config_filename() function can fail so ensure that it
provides a suitable error code.

GitHub Issue #920

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoUse strerror_r()/strerror_s() instead of strerror() where possible
Matt Caswell [Mon, 23 May 2016 12:52:29 +0000 (13:52 +0100)]
Use strerror_r()/strerror_s() instead of strerror() where possible

The function strerror() is not thread safe. We should use strerror_r()
where possible, or strerror_s() on Windows.

RT#2267

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years ago#4342: few missing malloc return checks and free in error paths
J Mohan Rao Arisankala [Mon, 23 May 2016 18:07:47 +0000 (23:37 +0530)]
#4342: few missing malloc return checks and free in error paths

ossl_hmac_cleanup, pkey_hmac_cleanup:
 - allow to invoke with NULL data
 - using EVP_PKEY_CTX_[get|set]_data

EVP_DigestInit_ex:
 - remove additional check for ‘type’ and doing clear free instead of
free

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoWindows notes: add a few lines on gaining admin privs for installing
Richard Levitte [Mon, 23 May 2016 20:24:13 +0000 (22:24 +0200)]
Windows notes: add a few lines on gaining admin privs for installing

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoVMS: show the ossl_dataroot logical as well when doing "mms debug_logicals"
Richard Levitte [Mon, 23 May 2016 16:35:23 +0000 (18:35 +0200)]
VMS: show the ossl_dataroot logical as well when doing "mms debug_logicals"

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoInstall the scripts the same way on Windows and VMS as on Unix
Richard Levitte [Mon, 23 May 2016 14:46:45 +0000 (16:46 +0200)]
Install the scripts the same way on Windows and VMS as on Unix

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoMake sure tsget.pl and c_rehash.pl get installed on VMS and Windows.
Richard Levitte [Mon, 23 May 2016 13:51:19 +0000 (15:51 +0200)]
Make sure tsget.pl and c_rehash.pl get installed on VMS and Windows.

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoMake sure tsget and c_rehash are named with .pl suffix on Windows and VMS
Richard Levitte [Mon, 23 May 2016 13:49:25 +0000 (15:49 +0200)]
Make sure tsget and c_rehash are named with .pl suffix on Windows and VMS

Especially on Windows, the .pl suffix is associated with the perl
interpreter, and therefore make those scripts usable as commands of
their own.  On VMS, it simply looks better.

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoMake sure to initialize all CA.pl variables properly
Richard Levitte [Mon, 23 May 2016 13:47:43 +0000 (15:47 +0200)]
Make sure to initialize all CA.pl variables properly

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoAdd buf-freelists to deprecated options
Todd Short [Mon, 23 May 2016 12:50:32 +0000 (08:50 -0400)]
Add buf-freelists to deprecated options

The buf-freelists option was removed in master. There may be some
things that try to disable it, so don't error out.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoRemove unused error/function codes.
Rich Salz [Mon, 23 May 2016 19:02:34 +0000 (15:02 -0400)]
Remove unused error/function codes.

Add script to find unused err/reason codes
Remove unused reason codes.
Remove entries for unused functions

Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoSupport -no-CAfile -no-CApath in ctx2
Dr. Stephen Henson [Mon, 23 May 2016 17:13:16 +0000 (18:13 +0100)]
Support -no-CAfile -no-CApath in ctx2

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
4 years agoremove encrypt then mac ifdefs
Dr. Stephen Henson [Mon, 23 May 2016 17:23:33 +0000 (18:23 +0100)]
remove encrypt then mac ifdefs

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoVMS: remove last VAX vestiges
Richard Levitte [Mon, 23 May 2016 17:11:39 +0000 (19:11 +0200)]
VMS: remove last VAX vestiges

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agomake update
Dr. Stephen Henson [Thu, 19 May 2016 16:59:17 +0000 (17:59 +0100)]
make update

Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoSupport for traditional format private keys.
Dr. Stephen Henson [Tue, 17 May 2016 13:15:20 +0000 (14:15 +0100)]
Support for traditional format private keys.

Add new function PEM_write_bio_PrivateKey_traditional() to enforce the
use of legacy "traditional" private key format. Add -traditional option
to pkcs8 and pkey utilities.

Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoSlight cleanup of the collection of READMEs, INSTALLs and NOTES
Richard Levitte [Mon, 23 May 2016 13:11:04 +0000 (15:11 +0200)]
Slight cleanup of the collection of READMEs, INSTALLs and NOTES

README is a fairly independent document, and so is INSTALL.  NOTES are
merely addendums to INSTALL.  Therefore , INSTALL.DJGPP and
README.PERL get renamed to NOTES.DJGPP and NOTES.PERL.

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoRemove INSTALL.WCE and refs to it.
Rich Salz [Mon, 23 May 2016 12:55:57 +0000 (08:55 -0400)]
Remove INSTALL.WCE and refs to it.

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoAdd text/x509aux to gitignore
Todd Short [Mon, 23 May 2016 12:48:22 +0000 (08:48 -0400)]
Add text/x509aux to gitignore

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoAdd checks on CRYPTO_set_ex_data return value
FdaSilvaYY [Sun, 14 Feb 2016 09:42:29 +0000 (10:42 +0100)]
Add checks on CRYPTO_set_ex_data return value
Fix possible leak in danetest.c

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoFix some malloc failure crashes on X509_STORE_CTX_set_ex_data
FdaSilvaYY [Sat, 13 Feb 2016 18:01:14 +0000 (19:01 +0100)]
Fix some malloc failure crashes on X509_STORE_CTX_set_ex_data

from BoringSSL 306ece31bcaaed49e0240a2e5555f8901ebb2d45

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoFix and simplify error handling in (RSA/EC_kmeth)_new_method()
FdaSilvaYY [Tue, 17 May 2016 19:21:46 +0000 (21:21 +0200)]
Fix and simplify error handling in (RSA/EC_kmeth)_new_method()

Inspired from PR #873.
Nearly same as 2bbf0ba.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoRemove useless NULL checks
FdaSilvaYY [Sat, 7 May 2016 16:54:01 +0000 (18:54 +0200)]
Remove useless NULL checks

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoWindows: shut DEL up
Richard Levitte [Mon, 23 May 2016 07:36:02 +0000 (09:36 +0200)]
Windows: shut DEL up

Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoComplete the rename of LHASH functions and types
Richard Levitte [Sun, 22 May 2016 08:57:18 +0000 (10:57 +0200)]
Complete the rename of LHASH functions and types

LHASH_NODE was used internally, which doesn't work when configured
'no-deprecated'

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoutil/process_docs.pl: Add more debugging output
Richard Levitte [Sun, 22 May 2016 22:38:48 +0000 (00:38 +0200)]
util/process_docs.pl: Add more debugging output

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoImprove the checking of pod sections
Richard Levitte [Sun, 22 May 2016 22:36:37 +0000 (00:36 +0200)]
Improve the checking of pod sections

(i.e. remove some bugs)

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoHTML docs on Unix: Add a HTML title
Richard Levitte [Sat, 21 May 2016 18:51:18 +0000 (20:51 +0200)]
HTML docs on Unix: Add a HTML title

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoprocess_docs.pl: When starting to read a new head1 section, remove previous text
Richard Levitte [Sat, 21 May 2016 18:50:48 +0000 (20:50 +0200)]
process_docs.pl: When starting to read a new head1 section, remove previous text

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoAdd a missing comma in OPENSSL_malloc.pod
Richard Levitte [Sat, 21 May 2016 18:49:58 +0000 (20:49 +0200)]
Add a missing comma in OPENSSL_malloc.pod

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoAdd the missing NAME header in the OCSP docs
Richard Levitte [Sat, 21 May 2016 18:49:33 +0000 (20:49 +0200)]
Add the missing NAME header in the OCSP docs

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoAvoid creating an illegal pointer
Kurt Roeckx [Sat, 21 May 2016 14:53:14 +0000 (16:53 +0200)]
Avoid creating an illegal pointer

Found by tis-interpreter

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

4 years agoAvoid creating an illegal pointer
Kurt Roeckx [Sat, 21 May 2016 14:32:15 +0000 (16:32 +0200)]
Avoid creating an illegal pointer

Found by tis-interpreter

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

4 years agoHave doc-nit-check look for mandatory manual sections
Richard Levitte [Sat, 21 May 2016 23:26:45 +0000 (01:26 +0200)]
Have doc-nit-check look for mandatory manual sections

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoConstify stack and lhash macros.
Dr. Stephen Henson [Sat, 21 May 2016 15:31:09 +0000 (16:31 +0100)]
Constify stack and lhash macros.

RT#4471

Reviewed-by: Tim Hudson <tjh@openssl.org>
4 years agoIndent and dead code cleanup
FdaSilvaYY [Fri, 20 May 2016 21:36:18 +0000 (23:36 +0200)]
Indent and dead code cleanup

tofree pointer  is no more used...

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

4 years agoAdd OpenSSL copyright to .pl files
Rich Salz [Sat, 21 May 2016 12:23:39 +0000 (08:23 -0400)]
Add OpenSSL copyright to .pl files

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoDoc nits cleanup, round 2
Rich Salz [Sat, 21 May 2016 00:52:46 +0000 (20:52 -0400)]
Doc nits cleanup, round 2

Fix some code examples, trailing whitespace
Fix TBA sections in verify, remove others.
Remove empty sections
Use Mixed Case not ALL CAPS in head2
Enhance doc-nits script.
Remove extra =cut line

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoFix Windows 64 bit crashes
Matt Caswell [Thu, 19 May 2016 19:11:09 +0000 (20:11 +0100)]
Fix Windows 64 bit crashes

The function InitOnceExceuteOnce is the best way to support the
implementation of CRYPTO_THREAD_run_once() on Windows. Unfortunately
WinXP doesn't have it. To get around that we had two different
implementations: one for WinXP and one for later versions. Which one was
used was based on the value of _WIN32_WINNT.

This approach was starting to cause problems though because other parts of
OpenSSL assume _WIN32_WINNT is going to be 0x0501 and crashes were
occurring dependant on include file ordering. In addition a conditional
based on _WIN32_WINNT had made its way into a public header file through
commit 5c4328f. This is problematic because the value of this macro can
vary between OpenSSL build time and application build time.

The simplest solution to this mess is just to always use the WinXP version
of CRYPTO_THREAD_run_once(). Its perhaps slightly sub-optimal but probably
not noticably.

GitHub Issue #1086

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoRename lh_xxx,sk_xxx tp OPENSSL_{LH,SK}_xxx
Rich Salz [Fri, 20 May 2016 14:46:29 +0000 (10:46 -0400)]
Rename lh_xxx,sk_xxx tp OPENSSL_{LH,SK}_xxx

Rename sk_xxx to OPENSSL_sk_xxx and _STACK to OPENSSL_STACK
Rename lh_xxx API to OPENSSL_LH_xxx and LHASH_NODE to OPENSSL_LH_NODE
Make lhash stuff opaque.
Use typedefs for function pointers; makes the code simpler.
Remove CHECKED_xxx macros.
Add documentation; remove old X509-oriented doc.
Add API-compat names for entire old API

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
4 years agoClean up the VMS hacks in crypto/rand/randfile.c
Richard Levitte [Fri, 20 May 2016 13:18:22 +0000 (15:18 +0200)]
Clean up the VMS hacks in crypto/rand/randfile.c

Reviewed-by: Andy Polyakov <appro@openssl.org>
4 years agoVMS: setbuf() only takes 32-bit pointers
Richard Levitte [Fri, 20 May 2016 09:12:15 +0000 (11:12 +0200)]
VMS: setbuf() only takes 32-bit pointers

Giving setbuf() a 64-bit pointer isn't faulty, as the argument is
passed by a 64-bit register anyway, so you only get a warning
(MAYLOSEDATA2) pointing out that only the least significant 32 bits
will be used.

However, we know that a FILE* returned by fopen() and such really is a
32-bit pointer (a study of the system header files make that clear),
so we temporarly turn off that warning when calling setbuf().

Reviewed-by: Andy Polyakov <appro@openssl.org>
4 years agoAdd an async io test
Matt Caswell [Thu, 12 May 2016 15:04:10 +0000 (16:04 +0100)]
Add an async io test

This adds an async IO test. There are two test runs. The first one does
a normal handshake with lots of async IO events. The second one does the
same but this time breaks up all the written records into multiple records
of one byte in length. We do this all the way up until the CCS.

Reviewed-by: Andy Polyakov <appro@openssl.org>
4 years agoEnsure async IO works with new state machine
Matt Caswell [Thu, 12 May 2016 16:18:32 +0000 (17:18 +0100)]
Ensure async IO works with new state machine

In the new state machine if using nbio and we get the header of a
handshake message is one record with the body in the next, with an nbio
event in the middle, then the connection was failing. This is because
s->init_num was getting reset. We should only reset it after we have
read the whole message.

RT#4394

Reviewed-by: Andy Polyakov <appro@openssl.org>
4 years agoTighten up logic around ChangeCipherSpec.
David Benjamin [Sun, 6 Mar 2016 03:50:44 +0000 (22:50 -0500)]
Tighten up logic around ChangeCipherSpec.

ChangeCipherSpec messages have a defined value. They also may not occur
in the middle of a handshake message. The current logic will accept a
ChangeCipherSpec with value 2. It also would accept up to three bytes of
handshake data before the ChangeCipherSpec which it would discard
(because s->init_num gets reset).

Instead, require that s->init_num is 0 when a ChangeCipherSpec comes in.

RT#4391

Reviewed-by: Andy Polyakov <appro@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoSimplify SSL BIO buffering logic
Matt Caswell [Tue, 17 May 2016 11:28:14 +0000 (12:28 +0100)]
Simplify SSL BIO buffering logic

The write BIO for handshake messages is bufferred so that we only write
out to the network when we have a complete flight. There was some
complexity in the buffering logic so that we switched buffering on and
off at various points through out the handshake. The only real reason to
do this was historically it complicated the state machine when you wanted
to flush because you had to traverse through the "flush" state (in order
to cope with NBIO). Where we knew up front that there was only going to
be one message in the flight we switched off buffering to avoid that.

In the new state machine there is no longer a need for a flush state so
it is simpler just to have buffering on for the whole handshake. This
also gives us the added benefit that we can simply call flush after every
flight even if it only has one message in it. This means that BIO authors
can implement their own buffering strategies and not have to be aware of
the state of the SSL object (previously they would have to switch off
their own buffering during the handshake because they could not rely on
a flush being received when they really needed to write data out). This
last point addresses GitHub Issue #322.

Reviewed-by: Andy Polyakov <appro@openssl.org>
4 years agoFixup READLINE case
Richard Levitte [Fri, 20 May 2016 08:13:14 +0000 (10:13 +0200)]
Fixup READLINE case

RT#4543

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
4 years agoFix nits in pod files.
Rich Salz [Fri, 20 May 2016 12:11:46 +0000 (08:11 -0400)]
Fix nits in pod files.

Add doc-nit-check to help find future issues.
Make podchecker be almost clean.
Remove trailing whitespace.
Tab expansion

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoUse the process_docs script to install docs on Windows and VMS
Richard Levitte [Thu, 19 May 2016 14:33:58 +0000 (16:33 +0200)]
Use the process_docs script to install docs on Windows and VMS

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoDocumentation processor in perl, for platforms that don't have sh
Richard Levitte [Thu, 19 May 2016 13:41:04 +0000 (15:41 +0200)]
Documentation processor in perl, for platforms that don't have sh

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoUse correct EOL in headers.
Dr. Stephen Henson [Thu, 19 May 2016 16:22:57 +0000 (17:22 +0100)]
Use correct EOL in headers.

RT#1817

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoMove Haiku configuration to separate config file to denote
Andy Polyakov [Sun, 1 May 2016 12:33:19 +0000 (14:33 +0200)]
Move Haiku configuration to separate config file to denote
the fact that it's community-supported target.

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoAdd assembly CRYPTO_memcmp.
Andy Polyakov [Sun, 15 May 2016 15:01:15 +0000 (17:01 +0200)]
Add assembly CRYPTO_memcmp.

GH: #102

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agorand/randfile.c: remove _XOPEN_SOURCE definition.
Andy Polyakov [Mon, 16 May 2016 14:44:33 +0000 (16:44 +0200)]
rand/randfile.c: remove _XOPEN_SOURCE definition.

Defintions of macros similar to _XOPEN_SOURCE belong in command line
or in worst case prior first #include directive in source. As for
macros is was allegedly controlling. One can argue that we are
probably better off demanding S_IS* macros but there are systems
that just don't comply, hence this compromise solution...

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoCheck that the obtained public key is valid
Matt Caswell [Mon, 25 Apr 2016 15:44:19 +0000 (16:44 +0100)]
Check that the obtained public key is valid

In the X509 app check that the obtained public key is valid before we
attempt to use it.

Issue reported by Yuan Jochen Kang.

Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
4 years agoAdd copyright
Rich Salz [Thu, 19 May 2016 15:31:29 +0000 (11:31 -0400)]
Add copyright

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoAdd copyright to manpages
Rich Salz [Wed, 18 May 2016 15:44:05 +0000 (11:44 -0400)]
Add copyright to manpages

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoRemove needless license terms (for docs)
Rich Salz [Wed, 18 May 2016 14:18:54 +0000 (10:18 -0400)]
Remove needless license terms (for docs)

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoEnsure =cut is last line in every file.
Rich Salz [Wed, 18 May 2016 14:16:40 +0000 (10:16 -0400)]
Ensure =cut is last line in every file.

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agook was uninitialised on failure.
Ben Laurie [Wed, 18 May 2016 16:20:07 +0000 (17:20 +0100)]
ok was uninitialised on failure.

Reviewed-by: Rich Salz <rsalz@openssl.org>
Reviewed-by: Andy Polyakov <appro@openssl.org>
4 years agoWhen strict SCT fails record verification failure
Viktor Dukhovni [Fri, 13 May 2016 04:36:56 +0000 (00:36 -0400)]
When strict SCT fails record verification failure

Since with SSL_VERIFY_NONE, the connection may continue and the
session may even be cached, we should save some evidence that the
chain was not sufficiently verified and would have been rejected
with SSL_VERIFY_PEER.  To that end when a CT callback returs failure
we set the verify result to X509_V_ERR_NO_VALID_SCTS.

Note: We only run the CT callback in the first place if the verify
result is still X509_V_OK prior to start of the callback.

RT #4502

Reviewed-by: Tim Hudson <tjh@openssl.org>
4 years agomake update
Viktor Dukhovni [Sun, 24 Apr 2016 23:50:45 +0000 (19:50 -0400)]
make update

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
4 years agoImprove and document low-level PEM read routines
Viktor Dukhovni [Sun, 24 Apr 2016 23:48:50 +0000 (19:48 -0400)]
Improve and document low-level PEM read routines

PEM_read(), PEM_read_bio(), PEM_get_EVP_CIPHER_INFO() and
PEM_do_header().

Reviewed-by: Dr. Stephen Henson <steve@openssl.org>
4 years agoFixes non __GNUC__ compilation
Mat [Wed, 18 May 2016 21:30:52 +0000 (23:30 +0200)]
Fixes non __GNUC__ compilation

adds missing check for defined(__GNUC__)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1094)

4 years agoFix SRP client key computation
Cynh [Sun, 1 May 2016 13:59:43 +0000 (15:59 +0200)]
Fix SRP client key computation

Signed-off-by: Kurt Roeckx <kurt@roeckx.be>
Reviewed-by: Matt Caswell <matt@openssl.org>
GH: #1017

4 years agoSmall typo, a tab where there should have been a space
Richard Levitte [Wed, 18 May 2016 20:15:30 +0000 (22:15 +0200)]
Small typo, a tab where there should have been a space

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoCleanup openssl.ec
Richard Levitte [Wed, 18 May 2016 19:11:42 +0000 (21:11 +0200)]
Cleanup openssl.ec

STORE doesn't exist for now

HMAC doesn't have any error codes

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoFix util/mkerr.pl
Richard Levitte [Wed, 18 May 2016 17:52:34 +0000 (19:52 +0200)]
Fix util/mkerr.pl

- Adjust mkerr.pl to produce the line length we used for source
  reformating.

- Have mkerr.pl keep track of preprocessor directive indentation

  Among others, do not spuriously throw away a #endif at the end of
  header files.

- Make sure mkerr.pl specifies any header inclusion correctly

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoEnsure verify error is set when X509_verify_cert() fails
Viktor Dukhovni [Tue, 17 May 2016 17:40:57 +0000 (13:40 -0400)]
Ensure verify error is set when X509_verify_cert() fails

Set ctx->error = X509_V_ERR_OUT_OF_MEM when verificaiton cannot
continue due to malloc failure.  Also, when X509_verify_cert()
returns <= 0 make sure that the verification status does not remain
X509_V_OK, as a last resort set it it to X509_V_ERR_UNSPECIFIED,
just in case some code path returns an error without setting an
appropriate value of ctx->error.

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoClarify negative return from X509_verify_cert()
Viktor Dukhovni [Tue, 17 May 2016 01:38:03 +0000 (21:38 -0400)]
Clarify negative return from X509_verify_cert()

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoMake OPENSSL_die as noreturn
hesiod [Wed, 18 May 2016 17:34:27 +0000 (13:34 -0400)]
Make OPENSSL_die as noreturn

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

4 years agoDocument the esc_2254 command line name option
Richard Levitte [Wed, 18 May 2016 15:39:33 +0000 (17:39 +0200)]
Document the esc_2254 command line name option

RT#1466

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agomake update
Richard Levitte [Wed, 18 May 2016 15:33:53 +0000 (17:33 +0200)]
make update

RT#1466

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoMake it possible to have RFC2254 escapes with ASN1_STRING_print_ex()
Richard Levitte [Wed, 18 May 2016 15:14:19 +0000 (17:14 +0200)]
Make it possible to have RFC2254 escapes with ASN1_STRING_print_ex()

Also adds 'esc_2254' to the possible command line name options

RT#1466

Reviewed-by: Rich Salz <rsalz@openssl.org>
4 years agoOID code tidy up.
Dr. Stephen Henson [Wed, 18 May 2016 13:32:16 +0000 (14:32 +0100)]
OID code tidy up.

Tidy up and simplify OBJ_dup() and OBJ_create().

Sanity check added OIDs: don't allow duplicates.

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoConsolidate copyright for demos
Rich Salz [Wed, 18 May 2016 13:16:36 +0000 (09:16 -0400)]
Consolidate copyright for demos

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoAdd some error messages for malloc fails
Matt Caswell [Tue, 17 May 2016 14:08:43 +0000 (15:08 +0100)]
Add some error messages for malloc fails

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoBetter checks for malloc failure in various METHOD functions
Matt Caswell [Wed, 4 May 2016 10:28:38 +0000 (11:28 +0100)]
Better checks for malloc failure in various METHOD functions

A number of the METHOD functions weren't properly handling malloc failures.

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoFix some malloc failures in b_addr.c
Matt Caswell [Wed, 4 May 2016 10:14:48 +0000 (11:14 +0100)]
Fix some malloc failures in b_addr.c

There were some unchecked calls to OPENSSL_strdup().

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoAdd some check for malloc failure in the CAPI engine
Matt Caswell [Wed, 4 May 2016 09:49:06 +0000 (10:49 +0100)]
Add some check for malloc failure in the CAPI engine

In the CAPI engine there were some unchecked calls to OPENSSL_strdup().

GH Issue #830

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoFix ts app help message
FdaSilvaYY [Tue, 10 May 2016 21:39:25 +0000 (23:39 +0200)]
Fix ts app help message

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoLocally declare some variables
FdaSilvaYY [Tue, 10 May 2016 21:39:05 +0000 (23:39 +0200)]
Locally declare some variables

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoFew cleanups in s_client, s_server apps.
FdaSilvaYY [Fri, 18 Mar 2016 18:02:17 +0000 (19:02 +0100)]
Few cleanups in s_client, s_server apps.

Discard useless static engine_id
Add a const qualifier
Fix some spelling

Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Matt Caswell <matt@openssl.org>
4 years agoFix a NULL dereference in chacha20_poly1305_init_key()
Kazuki Yamaguchi [Tue, 10 May 2016 10:46:08 +0000 (19:46 +0900)]
Fix a NULL dereference in chacha20_poly1305_init_key()

chacha20_poly1305_init_key() dereferences NULL when called with inkey !=
NULL && iv == NULL. This function is called by EVP_EncryptInit_ex()
family, whose documentation allows setting key and iv in separate calls.

Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoManual fixes after copyright consolidation
Rich Salz [Tue, 17 May 2016 21:38:18 +0000 (17:38 -0400)]
Manual fixes after copyright consolidation

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoX509_STORE_CTX accessors.
Rich Salz [Tue, 17 May 2016 20:06:09 +0000 (16:06 -0400)]
X509_STORE_CTX accessors.

Add some functions that were missing when a number of X509
objects became opaque (thanks, Roumen!)

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoCopyright consolidation 05/10
Rich Salz [Tue, 17 May 2016 19:38:09 +0000 (15:38 -0400)]
Copyright consolidation 05/10

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoCopyright consolidation 09/10
Rich Salz [Tue, 17 May 2016 18:52:22 +0000 (14:52 -0400)]
Copyright consolidation 09/10

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoCopyright consolidation 08/10
Rich Salz [Tue, 17 May 2016 18:51:34 +0000 (14:51 -0400)]
Copyright consolidation 08/10

Reviewed-by: Richard Levitte <levitte@openssl.org>
4 years agoCopyright consolidation 07/10
Rich Salz [Tue, 17 May 2016 18:51:26 +0000 (14:51 -0400)]
Copyright consolidation 07/10

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