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)
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)
Dr. Stephen Henson [Mon, 24 Feb 2014 13:52:51 +0000 (13:52 +0000)]
Prepare for 1.0.2-beta2-dev
Dr. Stephen Henson [Mon, 24 Feb 2014 13:51:34 +0000 (13:51 +0000)]
Prepare for 1.0.2-beta1 release
Dr. Stephen Henson [Mon, 24 Feb 2014 13:50:38 +0000 (13:50 +0000)]
OpenSSL 1.0.2 is now in beta
Dr. Stephen Henson [Mon, 24 Feb 2014 13:50:38 +0000 (13:50 +0000)]
make update
Andy Polyakov [Mon, 24 Feb 2014 12:18:40 +0000 (13:18 +0100)]
config: recognize ARMv8/AArch64 target.
(cherry picked from commit
d099f0ed6ca518052bb167b31e999e1e7734eebf)
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)
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)
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)
Ben Laurie [Sun, 23 Feb 2014 11:21:39 +0000 (11:21 +0000)]
Fix typo.
Ben Laurie [Sun, 23 Feb 2014 11:21:28 +0000 (11:21 +0000)]
Add debug flag.
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)
Andy Polyakov [Fri, 21 Feb 2014 11:12:25 +0000 (12:12 +0100)]
ssl/ssl_cert.c: DANE update.
Dr. Stephen Henson [Thu, 20 Feb 2014 22:57:24 +0000 (22:57 +0000)]
make update
Dr. Stephen Henson [Thu, 20 Feb 2014 22:37:33 +0000 (22:37 +0000)]
fix WIN32 warnings
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)
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)
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)
Dr. Stephen Henson [Sat, 15 Feb 2014 20:16:13 +0000 (20:16 +0000)]
Don't override $srcd for non copy builds.
Dr. Stephen Henson [Sat, 15 Feb 2014 18:19:35 +0000 (18:19 +0000)]
recognise multiblock
Dr. Stephen Henson [Sat, 15 Feb 2014 17:16:19 +0000 (17:16 +0000)]
Add /fixed flag for FIPS links where appropriate.
Dr. Stephen Henson [Sat, 15 Feb 2014 01:27:56 +0000 (01:27 +0000)]
Remove duplicate statement.
(cherry picked from commit
5a7652c3e585e970e5b778074c92e617e48fde38)
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)
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)
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)
Scott Schaefer [Mon, 23 Dec 2013 18:28:30 +0000 (19:28 +0100)]
Fix various spelling errors
(cherry picked from commit
2b4ffc659eabec29f76821f0ac624a2b8c19e4c7)
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)
Dr. Stephen Henson [Fri, 14 Feb 2014 17:49:08 +0000 (17:49 +0000)]
Fix error discrepancy with 1.0.1
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)
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)
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)
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)
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)
Dr. Stephen Henson [Fri, 14 Feb 2014 13:38:26 +0000 (13:38 +0000)]
Add cert_self_signed function to simplify verify
(from master)
Dr. Stephen Henson [Fri, 14 Feb 2014 13:33:43 +0000 (13:33 +0000)]
Simplify X509_STORE_CTX_get1_chain (from master).
Andy Polyakov [Thu, 13 Feb 2014 16:03:14 +0000 (17:03 +0100)]
ssl/ssl[3].h: retain binary compatibility.
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).
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)
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)
Dr. Stephen Henson [Sun, 9 Feb 2014 21:12:12 +0000 (21:12 +0000)]
fix error discrepancy
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.
Dr. Stephen Henson [Sun, 9 Feb 2014 19:57:27 +0000 (19:57 +0000)]
fix error number clash
Ben Laurie [Sun, 9 Feb 2014 19:31:07 +0000 (19:31 +0000)]
Whitespace fixes.
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
Scott Deboy [Sun, 9 Feb 2014 16:26:04 +0000 (08:26 -0800)]
Restore copyright symbol - ISO-8859-1 encoding for Configure file
Ben Laurie [Fri, 6 Sep 2013 13:03:28 +0000 (14:03 +0100)]
Const fix.
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
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
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
Ben Laurie [Sun, 9 Feb 2014 12:18:16 +0000 (12:18 +0000)]
Add new asm modules.
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
Ben Laurie [Tue, 4 Feb 2014 23:16:46 +0000 (23:16 +0000)]
Fix whitespace, new-style comments.
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
Scott Deboy [Thu, 7 Nov 2013 09:08:29 +0000 (01:08 -0800)]
Updating DTCP authorization type to expected value
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
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.
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
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
Dr. Stephen Henson [Thu, 6 Feb 2014 14:31:09 +0000 (14:31 +0000)]
make update
Dr. Stephen Henson [Thu, 6 Feb 2014 14:28:49 +0000 (14:28 +0000)]
update default depflags
Andy Polyakov [Tue, 8 Oct 2013 21:41:31 +0000 (23:41 +0200)]
Configure: recognize experimental-multiblock.
(cherry picked from commit
2d752737c53d0cf4953c11551d6d2a9df3655329)
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)
Andy Polyakov [Wed, 5 Feb 2014 20:43:17 +0000 (21:43 +0100)]
ssl/s3_pkt.c: add multi-block processing [from master].
Andy Polyakov [Wed, 5 Feb 2014 19:36:11 +0000 (20:36 +0100)]
config: recognize little-endian Linux PPC64.
Dr. Stephen Henson [Wed, 5 Feb 2014 18:55:37 +0000 (18:55 +0000)]
Oops, get selection logic right.
(cherry picked from commit
3880579240d476d21f68fd01a391dd325920f479)
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].
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)
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].
Dr. Stephen Henson [Mon, 3 Feb 2014 14:13:04 +0000 (14:13 +0000)]
Add quotes as CC can contain spaces.
PR#3253
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)
Dr. Stephen Henson [Sun, 20 Oct 2013 21:31:00 +0000 (22:31 +0100)]
Fix various typos.
(cherry picked from commit
f3efeaad540b000779277b4fc49a239529ee616e)
Dr. Stephen Henson [Wed, 18 Dec 2013 13:28:44 +0000 (13:28 +0000)]
Update demo.
(cherry picked from commit
88c21c47a3d187d4f8c4e87e3c6088198cb08a99)
Dr. Stephen Henson [Sun, 20 Oct 2013 21:34:14 +0000 (22:34 +0100)]
Update demos/bio/README
(cherry picked from commit
ea131a0644bcebeaa5e911217aadbc9dac241fec)
Dr. Stephen Henson [Sun, 20 Oct 2013 21:21:09 +0000 (22:21 +0100)]
Modify sample accept.cnf
(cherry picked from commit
d80b0eeee59fa48f2506fe103de1b52ef6de3f4f)
Dr. Stephen Henson [Fri, 18 Oct 2013 15:28:38 +0000 (16:28 +0100)]
Add demo for SSL server using SSL_CONF.
(cherry picked from commit
ebd14bfce9ef6b4bf41129a329823130d1002f42)
Ben Laurie [Sun, 2 Feb 2014 15:22:10 +0000 (15:22 +0000)]
Add extension free function.
Andy Polyakov [Sat, 1 Feb 2014 23:17:38 +0000 (00:17 +0100)]
engines/e_capi.c: TCHAR support (cumilative update from master).
Andy Polyakov [Sat, 1 Feb 2014 23:09:17 +0000 (00:09 +0100)]
modes/asm/ghash-s390x.pl: +15% performance improvement on z10.
(cherry picked from commit
d162584b1154153d997fed18a9df2e60771fe06c)
Andy Polyakov [Sat, 1 Feb 2014 23:05:02 +0000 (00:05 +0100)]
Add AES-NI+SHA256 stitch registrations (from master).
Andy Polyakov [Tue, 18 Dec 2012 18:19:54 +0000 (18:19 +0000)]
dso/dso_win32.c: fix compiler warning.
(cherry picked from commit
0a2d5003df1a9ecf801ac3b4a5cb7dda85449315)
Andy Polyakov [Sat, 1 Feb 2014 22:27:49 +0000 (23:27 +0100)]
crypto/cryptlib.c: remove stdio dependency (update from master).
Andy Polyakov [Sat, 1 Feb 2014 22:14:33 +0000 (23:14 +0100)]
camellia/asm/cmll-x86_64.pl: fix symptomless bugs (update from master).
Ben Laurie [Sat, 1 Feb 2014 21:53:09 +0000 (21:53 +0000)]
Remove redundant accessor (you can do the same thing, and more, with
X509_ALGOR_[gs]et0()).
Andy Polyakov [Tue, 18 Dec 2012 18:07:20 +0000 (18:07 +0000)]
util/pl/VC-32.pl fix typo.
(cherry picked from commit
fb0a520897778ebeebe9aaaf116f207a838ebb3f)
Andy Polyakov [Tue, 18 Dec 2012 09:42:31 +0000 (09:42 +0000)]
util/pl/VC-32.pl: refresh, switch to ws2, add crypt32, fix typo (based on
suggestions from Pierre Delaage).
(cherry picked from commit
668bcfd5ca237fdf6fbef1ab463697a4a48caf39)
Resolved conflicts:
util/pl/VC-32.pl
Andy Polyakov [Sat, 19 Jan 2013 20:23:13 +0000 (21:23 +0100)]
Improve WINCE support.
Submitted by: Pierre Delaage
(cherry picked from commit
a006fef78e56b078549a80f4bb4518b6a02eba84)
Resolved conflicts:
crypto/bio/bss_dgram.c
ssl/d1_lib.c
util/pl/VC-32.pl
Andy Polyakov [Mon, 11 Jun 2012 08:52:11 +0000 (08:52 +0000)]
b_sock.c: make getsockopt work in cases when optlen is 64-bit value.
(cherry picked from commit
80c42f3e0c34451dd7cfc65e07bc639759ef07d2)
Andy Polyakov [Sun, 15 Jul 2012 13:29:23 +0000 (13:29 +0000)]
wp-mmx.pl: ~10% performance improvement.
(cherry picked from commit
ae007d4d09f2ed9940c6e581bab9290d78615506)
Andy Polyakov [Sun, 15 Jul 2012 13:37:35 +0000 (13:37 +0000)]
wp-x86_64.pl: ~10% performance improvement.
(cherry picked from commit
701d593f7095db84459c76265349a83d30a4cae5)
Andy Polyakov [Sun, 15 Jul 2012 13:36:25 +0000 (13:36 +0000)]
sha512-ia64.pl: 15-20% performance improvement.
(cherry picked from commit
46a2b3387a3feb044527a58a89555029c809190d)
Andy Polyakov [Sun, 22 Apr 2012 21:18:30 +0000 (21:18 +0000)]
objxref.pl: improve portability.
(cherry picked from commit
71fa3bc5ece9121d1aa9bb513b5641e9ea605e14)
Adam Langley [Mon, 3 Jun 2013 19:45:11 +0000 (15:45 -0400)]
Add volatile qualifications to two blocks of inline asm to stop GCC from
eliminating them as dead code.
Both volatile and "memory" are used because of some concern that the compiler
may still cache values across the asm block without it, and because this was
such a painful debugging session that I wanted to ensure that it's never
repeated.
(cherry picked from commit
7753a3a68431aa81b82beea4c3f5374b41454679)
Andy Polyakov [Sat, 1 Feb 2014 20:51:51 +0000 (21:51 +0100)]
PPC assembly pack: ppc64-mont update from master.
Andy Polyakov [Sat, 1 Feb 2014 20:48:31 +0000 (21:48 +0100)]
PPC assembly pack: jumbo update from master.
Add Vector Permutation AES and little-endian support.
Andy Polyakov [Sat, 1 Feb 2014 20:27:46 +0000 (21:27 +0100)]
crypto/aes/asm/aesni-x86[_64].pl: jumbo update from
Andy Polyakov [Sat, 1 Feb 2014 20:24:55 +0000 (21:24 +0100)]
crypto/sha/asm/sha1-x86_64.pl: jumbo update from
Ben Laurie [Sat, 1 Feb 2014 18:29:26 +0000 (18:29 +0000)]
Add more accessors.
Ben Laurie [Sat, 1 Feb 2014 17:52:26 +0000 (17:52 +0000)]
Add accessor for x509.cert_info.
Ben Laurie [Wed, 29 Jan 2014 16:57:32 +0000 (17:57 +0100)]
Fix warning.