openssl.git
5 years agoConfigure: mark unixware target as elf-1.
Andy Polyakov [Thu, 27 Feb 2014 13:27:15 +0000 (14:27 +0100)]
Configure: mark unixware target as elf-1.
(cherry picked from commit 4ca026560a211ef2143199e4531aae377878e17a)

5 years agoperlasm/x86asm.pl: recognize elf-1 denoting old ELF platforms.
Andy Polyakov [Thu, 27 Feb 2014 13:26:12 +0000 (14:26 +0100)]
perlasm/x86asm.pl: recognize elf-1 denoting old ELF platforms.
(cherry picked from commit b62a4a1c0e77233e201517e5e32d575a0f20cc05)

5 years agoperlasm/x86gas.pl: limit special OPENSSL_ia32cap_P treatment to ELF.
Andy Polyakov [Thu, 27 Feb 2014 13:22:13 +0000 (14:22 +0100)]
perlasm/x86gas.pl: limit special OPENSSL_ia32cap_P treatment to ELF.
(cherry picked from commit ce876d8316409542283b356d331f90e1a1dfb853)

5 years agorc4/asm/rc4-586.pl: allow for 386-only build.
Andy Polyakov [Thu, 27 Feb 2014 13:19:19 +0000 (14:19 +0100)]
rc4/asm/rc4-586.pl: allow for 386-only build.
(cherry picked from commit f861b1d4335d4017953938160c7e4e0df9af5a7b)

5 years agodes/asm/des-586.pl: shortcut reference to DES_SPtrans.
Andy Polyakov [Thu, 27 Feb 2014 13:17:43 +0000 (14:17 +0100)]
des/asm/des-586.pl: shortcut reference to DES_SPtrans.
(cherry picked from commit fd361a67ef5e0ed953abc881aa7061a273bad9fe)

5 years agoMakefile.org: mask touch's exit code
Andy Polyakov [Thu, 27 Feb 2014 11:35:02 +0000 (12:35 +0100)]
Makefile.org: mask touch's exit code
[but don't let it mask make's].

PR: 3269

5 years agocrypto/Makefile: make it OSF-make-friendly
Andy Polyakov [Wed, 26 Feb 2014 15:42:57 +0000 (16:42 +0100)]
crypto/Makefile: make it OSF-make-friendly

PR: 3165

5 years agoCABForum EV OIDs for Subject Jurisdiction of Incorporation or Registration.
Rob Stradling [Tue, 25 Feb 2014 15:49:20 +0000 (15:49 +0000)]
CABForum EV OIDs for Subject Jurisdiction of Incorporation or Registration.
(cherry picked from commit ffcc832ba6e17859d45779eea87e38467561dd5d)

5 years agoFix for WIN32 builds with KRB5
Dr. Stephen Henson [Wed, 26 Feb 2014 15:28:20 +0000 (15:28 +0000)]
Fix for WIN32 builds with KRB5

5 years agosha/asm/sha256-586.pl: don't try to compile SIMD with no-sse2.
Andy Polyakov [Wed, 26 Feb 2014 09:22:13 +0000 (10:22 +0100)]
sha/asm/sha256-586.pl: don't try to compile SIMD with no-sse2.
(cherry picked from commit d49135e7ead795412a8357ff425dc99e328c53f6)

5 years agosha/asm/sha512-x86_64.pl: fix compilation error on Solaris.
Andy Polyakov [Wed, 26 Feb 2014 08:30:03 +0000 (09:30 +0100)]
sha/asm/sha512-x86_64.pl: fix compilation error on Solaris.
(cherry picked from commit 147cca8f530b8ddf22087e5709927082e095a062)

5 years agoConfigure: blended processor target in solaris-x86-cc.
Andy Polyakov [Wed, 26 Feb 2014 08:28:22 +0000 (09:28 +0100)]
Configure: blended processor target in solaris-x86-cc.
(cherry picked from commit 7bb9d84e35dce137c4479915ab0cbdb10ad0cf1d)

5 years agossl/t1_enc.c: check EVP_MD_CTX_copy return value.
Andy Polyakov [Tue, 25 Feb 2014 21:21:54 +0000 (22:21 +0100)]
ssl/t1_enc.c: check EVP_MD_CTX_copy return value.

PR: 3201
(cherry picked from commit 03da57fe14f2de5bde9d4496a2ae9a4ae8879f88)

5 years agoaes/asm/vpaes-ppc.pl: fix traceback info.
Andy Polyakov [Tue, 25 Feb 2014 19:11:34 +0000 (20:11 +0100)]
aes/asm/vpaes-ppc.pl: fix traceback info.
(cherry picked from commit e704741bf3ce02c7dbcd9b81c4df257b3d919f7e)

5 years agoOpenVMS fixes.
Zoltan Arpadffy [Tue, 25 Feb 2014 15:16:03 +0000 (15:16 +0000)]
OpenVMS fixes.

5 years agoupdate NEWS with v3_scts.c issue
Dr. Stephen Henson [Tue, 25 Feb 2014 15:08:45 +0000 (15:08 +0000)]
update NEWS with v3_scts.c issue

5 years agoDon't use BN_ULLONG in n2l8 use SCTS_TIMESTAMP.
Dr. Stephen Henson [Tue, 25 Feb 2014 15:05:08 +0000 (15:05 +0000)]
Don't use BN_ULLONG in n2l8 use SCTS_TIMESTAMP.

5 years agoFix for v3_scts.c
Dr. Stephen Henson [Tue, 25 Feb 2014 14:54:09 +0000 (14:54 +0000)]
Fix for v3_scts.c

Not all platforms define BN_ULLONG. Define SCTS_TIMESTAMP as a type
which should work on all platforms.

5 years agoupdate NEWS
Dr. Stephen Henson [Tue, 25 Feb 2014 13:56:40 +0000 (13:56 +0000)]
update NEWS

5 years agoAvoid Windows 8 Getversion deprecated errors.
Dr. Stephen Henson [Tue, 25 Feb 2014 12:11:22 +0000 (12:11 +0000)]
Avoid Windows 8 Getversion deprecated errors.

Windows 8 SDKs complain that GetVersion() is deprecated.

We only use GetVersion like this:

(GetVersion() < 0x80000000)

which checks if the Windows version is NT based. Use a macro check_winnt()
which uses GetVersion() on older SDK versions and true otherwise.
(cherry picked from commit a4cc3c8041104896d51ae12ef7b678c31808ce52)

5 years agoParse non-v1 SCTs less awkwardly.
Rob Stradling [Tue, 25 Feb 2014 10:14:51 +0000 (10:14 +0000)]
Parse non-v1 SCTs less awkwardly.
(cherry picked from commit 19f65ddbab30543415584ae7916e12a3c5249dba)

5 years agoutil/pl/VC-32.pl: harmonize with 1.0.1 and fix typo.
Andy Polyakov [Tue, 25 Feb 2014 12:41:40 +0000 (13:41 +0100)]
util/pl/VC-32.pl: harmonize with 1.0.1 and fix typo.

5 years agoms/do_win64a.bat: forward to NUL, not NUL:.
Andy Polyakov [Mon, 24 Feb 2014 18:29:49 +0000 (19:29 +0100)]
ms/do_win64a.bat: forward to NUL, not NUL:.

Allegedly formwarding to NUL: sometimes creates NUL file in file
system.

PR: 3250
(cherry picked from commit 63aff3001ef6ba2ac376cd3f237fb0d0b3e77f30)

5 years agowe need /MD for fips builds
Dr. Stephen Henson [Mon, 24 Feb 2014 18:21:16 +0000 (18:21 +0000)]
we need /MD for fips builds

5 years agoUpdate NEWS with known issue.
Dr. Stephen Henson [Mon, 24 Feb 2014 16:30:54 +0000 (16:30 +0000)]
Update NEWS with known issue.

5 years agoBC-32.pl: refresh Borland C support.
Andy Polyakov [Mon, 24 Feb 2014 15:42:40 +0000 (16:42 +0100)]
BC-32.pl: refresh Borland C support.

PR: 3251
Suggested by: Thorsten Schöning
(cherry picked from commit 779c51c6446f384c2f2a7bd5cc4c3e0366baf628)

5 years agox509/by_dir.c: fix run-away pointer (and potential SEGV)
Andy Polyakov [Mon, 24 Feb 2014 14:16:56 +0000 (15:16 +0100)]
x509/by_dir.c: fix run-away pointer (and potential SEGV)
when adding duplicates in add_cert_dir.

PR: 3261
Reported by: Marian Done
(cherry picked from commit 758954e0d8232d370ed72b7f86640e40443e1778)

5 years agoPrepare for 1.0.2-beta2-dev
Dr. Stephen Henson [Mon, 24 Feb 2014 13:52:51 +0000 (13:52 +0000)]
Prepare for 1.0.2-beta2-dev

5 years agoPrepare for 1.0.2-beta1 release OpenSSL_1_0_2-beta1
Dr. Stephen Henson [Mon, 24 Feb 2014 13:51:34 +0000 (13:51 +0000)]
Prepare for 1.0.2-beta1 release

5 years agoOpenSSL 1.0.2 is now in beta
Dr. Stephen Henson [Mon, 24 Feb 2014 13:50:38 +0000 (13:50 +0000)]
OpenSSL 1.0.2 is now in beta

5 years agomake update
Dr. Stephen Henson [Mon, 24 Feb 2014 13:50:38 +0000 (13:50 +0000)]
make update

5 years agoconfig: recognize ARMv8/AArch64 target.
Andy Polyakov [Mon, 24 Feb 2014 12:18:40 +0000 (13:18 +0100)]
config: recognize ARMv8/AArch64 target.
(cherry picked from commit d099f0ed6ca518052bb167b31e999e1e7734eebf)

5 years agoOnly set current certificate to valid values.
Dr. Stephen Henson [Sun, 23 Feb 2014 13:46:52 +0000 (13:46 +0000)]
Only set current certificate to valid values.

When setting the current certificate check that it has a corresponding
private key.
(cherry picked from commit 358d352aa244b4f2ef655bccff6658d92d5ce03c)

5 years agoNew chain building flags.
Dr. Stephen Henson [Sun, 23 Feb 2014 12:00:18 +0000 (12:00 +0000)]
New chain building flags.

New flags to build certificate chains. The can be used to rearrange
the chain so all an application needs to do is add all certificates
in arbitrary order and then build the chain to check and correct them.

Add verify error code when building chain.

Update docs.
(cherry picked from commit 13dc3ce9ab483cade378bcf3844c92bacd817316)

5 years agoOption to set current cert to server certificate.
Dr. Stephen Henson [Fri, 21 Feb 2014 19:42:03 +0000 (19:42 +0000)]
Option to set current cert to server certificate.
(cherry picked from commit daddd9a950e491c31f9500d5e570bc7eb96b2823)

5 years agoFix typo.
Ben Laurie [Sun, 23 Feb 2014 11:21:39 +0000 (11:21 +0000)]
Fix typo.

5 years agoAdd debug flag.
Ben Laurie [Sun, 23 Feb 2014 11:21:28 +0000 (11:21 +0000)]
Add debug flag.

5 years agoaes/asm/aesni-x86[_64].pl: minor Atom-specific performance tweak.
Andy Polyakov [Fri, 21 Feb 2014 11:14:04 +0000 (12:14 +0100)]
aes/asm/aesni-x86[_64].pl: minor Atom-specific performance tweak.
(cherry picked from commit 214368ffee5736836e2dbb80a16a4fbd85f0eaf9)

5 years agossl/ssl_cert.c: DANE update.
Andy Polyakov [Fri, 21 Feb 2014 11:12:25 +0000 (12:12 +0100)]
ssl/ssl_cert.c: DANE update.

5 years agomake update
Dr. Stephen Henson [Thu, 20 Feb 2014 22:57:24 +0000 (22:57 +0000)]
make update

5 years agofix WIN32 warnings
Dr. Stephen Henson [Thu, 20 Feb 2014 22:37:33 +0000 (22:37 +0000)]
fix WIN32 warnings

5 years agoShow the contents of the RFC6962 Signed Certificate Timestamp List Certificate/OCSP...
Rob Stradling [Thu, 20 Feb 2014 21:41:12 +0000 (21:41 +0000)]
Show the contents of the RFC6962 Signed Certificate Timestamp List Certificate/OCSP Extensions.
Add the RFC6962 OIDs to the objects table.
(backport from master branch)

5 years agoDon't use CRYPTO_AES_CTR if it isn't defined.
Dr. Stephen Henson [Tue, 18 Feb 2014 22:20:30 +0000 (22:20 +0000)]
Don't use CRYPTO_AES_CTR if it isn't defined.
(cherry picked from commit 6ecbc2bb62835a401ad6efe240d469a23b21755b)

5 years agoDon't use getcwd in non-copy builds.
Dr. Stephen Henson [Sat, 15 Feb 2014 19:48:05 +0000 (19:48 +0000)]
Don't use getcwd in non-copy builds.
(cherry picked from commit f3a39032601fab2c704f03338e378592d3b4e262)

5 years agoDon't override $srcd for non copy builds.
Dr. Stephen Henson [Sat, 15 Feb 2014 20:16:13 +0000 (20:16 +0000)]
Don't override $srcd for non copy builds.

5 years agorecognise multiblock
Dr. Stephen Henson [Sat, 15 Feb 2014 18:19:35 +0000 (18:19 +0000)]
recognise multiblock

5 years agoAdd /fixed flag for FIPS links where appropriate.
Dr. Stephen Henson [Sat, 15 Feb 2014 17:16:19 +0000 (17:16 +0000)]
Add /fixed flag for FIPS links where appropriate.

5 years agoRemove duplicate statement.
Dr. Stephen Henson [Sat, 15 Feb 2014 01:27:56 +0000 (01:27 +0000)]
Remove duplicate statement.
(cherry picked from commit 5a7652c3e585e970e5b778074c92e617e48fde38)

5 years agoAdd support for aes-128/192/256-ctr to the cryptodev engine.
Klaus-Peter Junghanns [Tue, 28 Jan 2014 21:16:22 +0000 (22:16 +0100)]
Add support for aes-128/192/256-ctr to the cryptodev engine.
This can be used to speed up SRTP with libsrtp, e.g. on TI omap/sitara based devices.
(cherry picked from commit be2c4d9bd9e81030c547a34216ae2d8e5c888190)

5 years agoUse defaults bits in req when not given
Kurt Roeckx [Mon, 23 Dec 2013 18:45:26 +0000 (19:45 +0100)]
Use defaults bits in req when not given

If you use "-newkey rsa" it's supposed to read the default number of bits from the
config file.  However the value isn't used to generate the key, but it does
print it's generating such a key.  The set_keygen_ctx() doesn't call
EVP_PKEY_CTX_set_rsa_keygen_bits() and you end up with the default set in
pkey_rsa_init() (1024).  Afterwards the number of bits gets read from the config
file, but nothing is done with that anymore.

We now read the config first and use the value from the config file when no size
is given.

PR: 2592
(cherry picked from commit 3343220327664680420d4068e1fbe46d2236f1b0)

5 years agoFix additional pod errors with numbered items.
Kurt Roeckx [Mon, 23 Dec 2013 18:41:28 +0000 (19:41 +0100)]
Fix additional pod errors with numbered items.
(cherry picked from commit e547c45f1c74e976656c042ec9d873f6eea0e756)

5 years agoFix various spelling errors
Scott Schaefer [Mon, 23 Dec 2013 18:28:30 +0000 (19:28 +0100)]
Fix various spelling errors
(cherry picked from commit 2b4ffc659eabec29f76821f0ac624a2b8c19e4c7)

5 years agoDocument pkcs12 -password behavior
Scott Schaefer [Mon, 23 Dec 2013 18:01:38 +0000 (19:01 +0100)]
Document pkcs12 -password behavior

apps/pkcs12.c accepts -password as an argument.  The document author
almost certainly meant to write "-password, -passin".

However, that is not correct, either.  Actually the code treats
-password as equivalent to -passin, EXCEPT when -export is also
specified, in which case -password as equivalent to -passout.
(cherry picked from commit 856c6dfb09d69fc82ada2611c6cd792dfc60e355)

5 years agoFix error discrepancy with 1.0.1
Dr. Stephen Henson [Fri, 14 Feb 2014 17:49:08 +0000 (17:49 +0000)]
Fix error discrepancy with 1.0.1

5 years agossl/s3_pkt.c: detect RAND_bytes error in multi-block.
Andy Polyakov [Fri, 14 Feb 2014 16:43:31 +0000 (17:43 +0100)]
ssl/s3_pkt.c: detect RAND_bytes error in multi-block.
(cherry picked from commit 701134320a94908d8c0ac513741cab41e215a7b5)

5 years agox86[_64]cpuid.pl: add low-level RDSEED.
Andy Polyakov [Fri, 14 Feb 2014 16:24:12 +0000 (17:24 +0100)]
x86[_64]cpuid.pl: add low-level RDSEED.
(cherry picked from commit f4d456408d9d7bca31f34765d1a05fbd9fa55826)

5 years agoaes/asm/aesni-x86_64.pl: further optimization for Atom Silvermont.
Andy Polyakov [Fri, 14 Feb 2014 16:06:15 +0000 (17:06 +0100)]
aes/asm/aesni-x86_64.pl: further optimization for Atom Silvermont.

Improve CBC decrypt and CTR by ~13/16%, which adds up to ~25/33%
improvement over "pre-Silvermont" version. [Add performance table to
aesni-x86.pl].
(cherry picked from commit 5599c7331b90d9d29c9914c2a95c16d91485415a)

5 years agoInclude self-signed flag in certificates by checking SKID/AKID as well
Dr. Stephen Henson [Thu, 25 Feb 2010 00:01:38 +0000 (00:01 +0000)]
Include self-signed flag in certificates by checking SKID/AKID as well
as issuer and subject names. Although this is an incompatible change
it should have little impact in pratice because self-issued certificates
that are not self-signed are rarely encountered.
(cherry picked from commit b1efb7161f409c81178b9aa95583db3390f90b1b)

5 years agoInclude TA in checks/callback with partial chains.
Dr. Stephen Henson [Fri, 14 Feb 2014 15:07:01 +0000 (15:07 +0000)]
Include TA in checks/callback with partial chains.

When a chain is complete and ends in a trusted root checks are also
performed on the TA and the callback notified with ok==1. For
consistency do the same for chains where the TA is not self signed.
(cherry picked from commit 385b3486661628f3f806205752bf968b8114b347)

5 years agoAdd cert_self_signed function to simplify verify
Dr. Stephen Henson [Fri, 14 Feb 2014 13:38:26 +0000 (13:38 +0000)]
Add cert_self_signed function to simplify verify

(from master)

5 years agoSimplify X509_STORE_CTX_get1_chain (from master).
Dr. Stephen Henson [Fri, 14 Feb 2014 13:33:43 +0000 (13:33 +0000)]
Simplify X509_STORE_CTX_get1_chain (from master).

5 years agossl/ssl[3].h: retain binary compatibility.
Andy Polyakov [Thu, 13 Feb 2014 16:03:14 +0000 (17:03 +0100)]
ssl/ssl[3].h: retain binary compatibility.

5 years agoConfigure: restore binary compatibility in darwin64-x86_64-cc.
Andy Polyakov [Thu, 13 Feb 2014 14:23:36 +0000 (15:23 +0100)]
Configure: restore binary compatibility in darwin64-x86_64-cc.
(and remove duplicates).

5 years agoevp/e_aes_cbc_hmac_sha*.c: improve cache locality.
Andy Polyakov [Thu, 13 Feb 2014 13:39:55 +0000 (14:39 +0100)]
evp/e_aes_cbc_hmac_sha*.c: improve cache locality.
(cherry picked from commit 9587429fa07a34066107e926fbc8708220f058fa)

5 years agoghash-x86[_64].pl: ~15% improvement on Atom Silvermont
Andy Polyakov [Thu, 13 Feb 2014 13:36:02 +0000 (14:36 +0100)]
ghash-x86[_64].pl: ~15% improvement on Atom Silvermont
(other processors unaffected).
(cherry picked from commit 98e143f118aedc2fa79fa0ae90f1b039da106309)

5 years agofix error discrepancy
Dr. Stephen Henson [Sun, 9 Feb 2014 21:12:12 +0000 (21:12 +0000)]
fix error discrepancy

5 years agoMake upate.
Dr. Stephen Henson [Sun, 9 Feb 2014 19:59:54 +0000 (19:59 +0000)]
Make upate.

Revert libssl ordinals to OpenSSL 1.0.1 values first to tidy up and
avoid entries for deleted functions.

5 years agofix error number clash
Dr. Stephen Henson [Sun, 9 Feb 2014 19:57:27 +0000 (19:57 +0000)]
fix error number clash

5 years agoWhitespace fixes.
Ben Laurie [Sun, 9 Feb 2014 19:31:07 +0000 (19:31 +0000)]
Whitespace fixes.

5 years agoMerge branch '102_stable_tlsext_suppdata_changes' of git://github.com/scottdeboy...
Ben Laurie [Sun, 9 Feb 2014 19:17:42 +0000 (19:17 +0000)]
Merge branch '102_stable_tlsext_suppdata_changes' of git://github.com/scottdeboy/openssl into scottdeboy-102_stable_tlsext_suppdata_changes

5 years agoRestore copyright symbol - ISO-8859-1 encoding for Configure file
Scott Deboy [Sun, 9 Feb 2014 16:26:04 +0000 (08:26 -0800)]
Restore copyright symbol - ISO-8859-1 encoding for Configure file

5 years agoConst fix.
Ben Laurie [Fri, 6 Sep 2013 13:03:28 +0000 (14:03 +0100)]
Const fix.

5 years agoMore cleanup.
Ben Laurie [Thu, 1 Aug 2013 11:33:15 +0000 (12:33 +0100)]
More cleanup.

(cherry picked from commit 5eda213ebe382009c2f37a8eade5cbcdae6017ed)
Conflicts:
apps/s_client.c
apps/s_server.c

5 years agoMake it build.
Ben Laurie [Thu, 1 Aug 2013 10:14:23 +0000 (11:14 +0100)]
Make it build.

(cherry picked from commit a6a48e87bc469f37ed1c53d0e4d22faaa0a5adf3)
Conflicts:
ssl/s3_clnt.c
ssl/t1_lib.c

5 years agoReverting 1.0.2-only changes supporting the prior authz RFC5878-based tests from...
Scott Deboy [Sun, 9 Feb 2014 15:49:44 +0000 (07:49 -0800)]
Reverting 1.0.2-only changes supporting the prior authz RFC5878-based tests from commit 835d104f46c4448a27844a9309de456c7972a943

5 years agoAdd new asm modules.
Ben Laurie [Sun, 9 Feb 2014 12:18:16 +0000 (12:18 +0000)]
Add new asm modules.

5 years agoDon't break out of the custom extension callback loop - continue instead
Scott Deboy [Wed, 5 Feb 2014 02:48:59 +0000 (18:48 -0800)]
Don't break out of the custom extension callback loop - continue instead
The contract for custom extension callbacks has changed - all custom extension callbacks are triggered

5 years agoFix whitespace, new-style comments.
Ben Laurie [Tue, 4 Feb 2014 23:16:46 +0000 (23:16 +0000)]
Fix whitespace, new-style comments.

5 years agoRe-add alert variables removed during rebase
Scott Deboy [Tue, 4 Feb 2014 21:08:43 +0000 (13:08 -0800)]
Re-add alert variables removed during rebase
Whitespace fixes

(cherry picked from commit e9add063b50e8a460d5636055156d2760c2fe29f)
Conflicts:
ssl/s3_clnt.c

5 years agoUpdating DTCP authorization type to expected value
Scott Deboy [Thu, 7 Nov 2013 09:08:29 +0000 (01:08 -0800)]
Updating DTCP authorization type to expected value

5 years agoUpdate custom TLS extension and supplemental data 'generate' callbacks to support...
Scott Deboy [Thu, 12 Sep 2013 19:03:40 +0000 (12:03 -0700)]
Update custom TLS extension and supplemental data 'generate' callbacks to support sending an alert.

If multiple TLS extensions are expected but not received, the TLS extension and supplemental data 'generate' callbacks are the only chance for the receive-side to trigger a specific TLS alert during the handshake.

Removed logic which no-op'd TLS extension generate callbacks (as the generate callbacks need to always be called in order to trigger alerts), and updated the serverinfo-specific custom TLS extension callbacks to track which custom TLS extensions were received by the client, where no-ops for 'generate' callbacks are appropriate.

(cherry picked from commit ac20719d994729970eb3b775c7bffa81f0e9f960)
Conflicts:
ssl/t1_lib.c

5 years agoRedo deletion of some serverinfo code that supplemental data code mistakenly reinstated.
Trevor Perrin [Sat, 14 Sep 2013 01:31:48 +0000 (18:31 -0700)]
Redo deletion of some serverinfo code that supplemental data code mistakenly reinstated.

5 years agoFree generated supp data after handshake completion, add comment regarding use of...
Scott Deboy [Thu, 1 Aug 2013 18:54:09 +0000 (11:54 -0700)]
Free generated supp data after handshake completion, add comment regarding use of num_renegotiations in TLS and supp data generation callbacks

(cherry picked from commit 67c408cee9b01a7c8c7ca002d36b4f8c0612b08c)
Conflicts:
apps/s_client.c
apps/s_server.c

5 years agoAdd callbacks supporting generation and retrieval of supplemental data entries, facil...
Scott Deboy [Tue, 18 Jun 2013 21:34:38 +0000 (14:34 -0700)]
Add callbacks supporting generation and retrieval of supplemental data entries, facilitating RFC 5878 (TLS auth extensions)
Removed prior audit proof logic - audit proof support was implemented using the generic TLS extension API
Tests exercising the new supplemental data registration and callback api can be found in ssltest.c.
Implemented changes to s_server and s_client to exercise supplemental data callbacks via the -auth argument, as well as additional flags to exercise supplemental data being sent only during renegotiation.

(cherry picked from commit 36086186a9b90cdad0d2cd0a598a10f03f8f4bcc)
Conflicts:
Configure
apps/s_client.c
apps/s_server.c
ssl/ssl.h
ssl/ssl3.h
ssl/ssltest.c

5 years agomake update
Dr. Stephen Henson [Thu, 6 Feb 2014 14:31:09 +0000 (14:31 +0000)]
make update

5 years agoupdate default depflags
Dr. Stephen Henson [Thu, 6 Feb 2014 14:28:49 +0000 (14:28 +0000)]
update default depflags

5 years agoConfigure: recognize experimental-multiblock.
Andy Polyakov [Tue, 8 Oct 2013 21:41:31 +0000 (23:41 +0200)]
Configure: recognize experimental-multiblock.
(cherry picked from commit 2d752737c53d0cf4953c11551d6d2a9df3655329)

5 years agoReturn previous compression methods when setting them.
Dr. Stephen Henson [Thu, 6 Feb 2014 13:57:26 +0000 (13:57 +0000)]
Return previous compression methods when setting them.
(cherry picked from commit b45e874d7c4a8fdac7ec10cff43f21d02e75d511)

5 years agossl/s3_pkt.c: add multi-block processing [from master].
Andy Polyakov [Wed, 5 Feb 2014 20:43:17 +0000 (21:43 +0100)]
ssl/s3_pkt.c: add multi-block processing [from master].

5 years agoconfig: recognize little-endian Linux PPC64.
Andy Polyakov [Wed, 5 Feb 2014 19:36:11 +0000 (20:36 +0100)]
config: recognize little-endian Linux PPC64.

5 years agoOops, get selection logic right.
Dr. Stephen Henson [Wed, 5 Feb 2014 18:55:37 +0000 (18:55 +0000)]
Oops, get selection logic right.
(cherry picked from commit 3880579240d476d21f68fd01a391dd325920f479)

5 years agoevp/e_aes_cbc_hmac_sha[1|256].c: add multi-block implementations [from master].
Andy Polyakov [Wed, 5 Feb 2014 18:52:38 +0000 (19:52 +0100)]
evp/e_aes_cbc_hmac_sha[1|256].c: add multi-block implementations [from master].

5 years agoReturn per-certificate chain if extra chain is NULL.
Dr. Stephen Henson [Wed, 5 Feb 2014 16:56:58 +0000 (16:56 +0000)]
Return per-certificate chain if extra chain is NULL.

If an application calls the macro SSL_CTX_get_extra_chain_certs
return either the old "shared" extra certificates or those associated
with the current certificate.

This means applications which call SSL_CTX_use_certificate_chain_file
and retrieve the additional chain using SSL_CTX_get_extra_chain_certs
will still work. An application which only wants to check the shared
extra certificates can call the new macro
SSL_CTX_get_extra_chain_certs_only
(cherry picked from commit a51f767645c117667d337f77fe1dd9c0a66d8410)

5 years ago[aesni|sha*]-mb-x86_64.pl: add multi-block assembly modules [from master].
Andy Polyakov [Wed, 5 Feb 2014 13:33:44 +0000 (14:33 +0100)]
[aesni|sha*]-mb-x86_64.pl: add multi-block assembly modules [from master].

5 years agoAdd quotes as CC can contain spaces.
Dr. Stephen Henson [Mon, 3 Feb 2014 14:13:04 +0000 (14:13 +0000)]
Add quotes as CC can contain spaces.

PR#3253

5 years agoNew ctrl to set current certificate.
Dr. Stephen Henson [Sun, 2 Feb 2014 02:51:30 +0000 (02:51 +0000)]
New ctrl to set current certificate.

New ctrl sets current certificate based on certain criteria. Currently
two options: set the first valid certificate as current and set the
next valid certificate as current. Using these an application can
iterate over all certificates in an SSL_CTX or SSL structure.
(cherry picked from commit 0f78819c8ccb7c526edbe90d5b619281366ce75c)

5 years agoFix various typos.
Dr. Stephen Henson [Sun, 20 Oct 2013 21:31:00 +0000 (22:31 +0100)]
Fix various typos.
(cherry picked from commit f3efeaad540b000779277b4fc49a239529ee616e)

5 years agoUpdate demo.
Dr. Stephen Henson [Wed, 18 Dec 2013 13:28:44 +0000 (13:28 +0000)]
Update demo.
(cherry picked from commit 88c21c47a3d187d4f8c4e87e3c6088198cb08a99)

5 years agoUpdate demos/bio/README
Dr. Stephen Henson [Sun, 20 Oct 2013 21:34:14 +0000 (22:34 +0100)]
Update demos/bio/README
(cherry picked from commit ea131a0644bcebeaa5e911217aadbc9dac241fec)

5 years agoModify sample accept.cnf
Dr. Stephen Henson [Sun, 20 Oct 2013 21:21:09 +0000 (22:21 +0100)]
Modify sample accept.cnf
(cherry picked from commit d80b0eeee59fa48f2506fe103de1b52ef6de3f4f)