openssl.git
6 years agoAdd -no_resumption_on_reneg to SSL_CONF.
Dr. Stephen Henson [Thu, 27 Mar 2014 15:51:25 +0000 (15:51 +0000)]
Add -no_resumption_on_reneg to SSL_CONF.

6 years agoUpdate chain building function.
Dr. Stephen Henson [Thu, 27 Mar 2014 14:20:16 +0000 (14:20 +0000)]
Update chain building function.

Don't clear verification errors from the error queue unless
SSL_BUILD_CHAIN_FLAG_CLEAR_ERROR is set.

If errors occur during verification and SSL_BUILD_CHAIN_FLAG_IGNORE_ERROR
is set return 2 so applications can issue warnings.

6 years agoAllow duplicate certs in ssl_build_cert_chain
Emilia Kasper [Mon, 24 Mar 2014 11:33:54 +0000 (12:33 +0100)]
Allow duplicate certs in ssl_build_cert_chain

6 years agoWorkaround for some CMS signature formats.
Dr. Stephen Henson [Wed, 19 Mar 2014 17:28:01 +0000 (17:28 +0000)]
Workaround for some CMS signature formats.

Some CMS SignedData structure use a signature algorithm OID such
as SHA1WithRSA instead of the RSA algorithm OID. Workaround this
case by tolerating the signature if we recognise the OID.
(cherry picked from commit 3a98f9cf20c6af604799ee079bec496b296bb5cc)

6 years agoRetry callback only after ClientHello received.
Piotr Sikora [Tue, 18 Mar 2014 23:55:32 +0000 (23:55 +0000)]
Retry callback only after ClientHello received.
(cherry picked from commit f04665a653665cd6432b9adfeb7c7f12a7447d26)

6 years agoUpdate ordinals.
Dr. Stephen Henson [Wed, 12 Mar 2014 14:35:54 +0000 (14:35 +0000)]
Update ordinals.

Use a previously unused value as we will be updating multiple released
branches.
(cherry picked from commit 0737acd2a8cc688902b5151cab5dc6737b82fb96)

6 years agoFix for CVE-2014-0076
Dr. Stephen Henson [Wed, 12 Mar 2014 14:16:19 +0000 (14:16 +0000)]
Fix for CVE-2014-0076

Fix for the attack described in the paper "Recovering OpenSSL
ECDSA Nonces Using the FLUSH+RELOAD Cache Side-channel Attack"
by Yuval Yarom and Naomi Benger. Details can be obtained from:
http://eprint.iacr.org/2014/140

Thanks to Yuval Yarom and Naomi Benger for discovering this
flaw and to Yuval Yarom for supplying a fix.
(cherry picked from commit 2198be3483259de374f91e57d247d0fc667aef29)

Conflicts:

CHANGES

6 years agotypo
Dr. Stephen Henson [Mon, 10 Mar 2014 15:45:30 +0000 (15:45 +0000)]
typo
(cherry picked from commit a029788b0e0c19cee4007cc1f73201cf2c13addf)

6 years agoRemove -WX option from debug-VC-WIN32
Dr. Stephen Henson [Fri, 7 Mar 2014 19:04:45 +0000 (19:04 +0000)]
Remove -WX option from debug-VC-WIN32
(cherry picked from commit 7a3e67f029969620966b8a627b8485d83692cca5)

6 years agoengines/ccgost/gosthash.c: simplify and avoid SEGV.
Andy Polyakov [Fri, 7 Mar 2014 10:02:25 +0000 (11:02 +0100)]
engines/ccgost/gosthash.c: simplify and avoid SEGV.

PR: 3275
(cherry picked from commit ea38f020492042bc1d1adc26ef197b0b9cadf968)

6 years agoSPARC T4 assembly pack: treat zero input length in CBC.
Andy Polyakov [Fri, 7 Mar 2014 09:30:37 +0000 (10:30 +0100)]
SPARC T4 assembly pack: treat zero input length in CBC.

The problem is that OpenSSH calls EVP_Cipher, which is not as
protective as EVP_CipherUpdate. Formally speaking we ought to
do more checks in *_cipher methods, including rejecting
lengths not divisible by block size (unless ciphertext stealing
is in place). But for now I implement check for zero length in
low-level based on precedent.

PR: 3087, 2775
(cherry picked from commit 5e44c144e649a53bae2724b34d908f6cb26b01ed)

6 years agodh_check.c: check BN_CTX_get's return value.
Andy Polyakov [Thu, 6 Mar 2014 13:19:37 +0000 (14:19 +0100)]
dh_check.c: check BN_CTX_get's return value.
(cherry picked from commit 53e5161231854d64fd89e993944609a329a92db4)

6 years agotest/Makefile: allow emulated test (e.g. under wine) [from master].
Andy Polyakov [Thu, 6 Mar 2014 13:09:58 +0000 (14:09 +0100)]
test/Makefile: allow emulated test (e.g. under wine) [from master].

Submitted by: Roumen Petrov

6 years agobss_dgram.c,d1_lib.c: make it compile with mingw.
Andy Polyakov [Thu, 6 Mar 2014 13:03:02 +0000 (14:03 +0100)]
bss_dgram.c,d1_lib.c: make it compile with mingw.

Submitted by: Roumen Petrov
(cherry picked from commit 972b0dc3500a26edb178a5446a0cdfb8f450f853)

6 years agoFor self signed root only indicate one error.
Dr. Stephen Henson [Mon, 3 Mar 2014 23:33:51 +0000 (23:33 +0000)]
For self signed root only indicate one error.

6 years agoSync crypto documentation with master branch.
Dr. Stephen Henson [Mon, 3 Mar 2014 15:12:17 +0000 (15:12 +0000)]
Sync crypto documentation with master branch.

6 years agoUse nid not cipher type as some ciphers don't have OIDs.
Dr. Stephen Henson [Sun, 2 Mar 2014 15:00:21 +0000 (15:00 +0000)]
Use nid not cipher type as some ciphers don't have OIDs.

6 years agoMake null cipher work in FIPS mode.
Dr. Stephen Henson [Sun, 2 Mar 2014 13:34:40 +0000 (13:34 +0000)]
Make null cipher work in FIPS mode.

6 years agoAdd new VMS hack symbol, update ordinals.
Dr. Stephen Henson [Sun, 2 Mar 2014 13:37:31 +0000 (13:37 +0000)]
Add new VMS hack symbol, update ordinals.

6 years agoAdd additional FIPS digests.
Dr. Stephen Henson [Sat, 1 Mar 2014 23:01:07 +0000 (23:01 +0000)]
Add additional FIPS digests.

Add a few special case digests not returned by FIPS_get_digestbynid().

Thanks to Roumen Petrov <openssl@roumenpetrov.info> for reporting this
issue.

6 years agoAdd function to free compression methods.
Dr. Stephen Henson [Fri, 28 Feb 2014 18:37:08 +0000 (18:37 +0000)]
Add function to free compression methods.

Although the memory allocated by compression methods is fixed and
cannot grow over time it can cause warnings in some leak checking
tools. The function SSL_COMP_free_compression_methods() will free
and zero the list of supported compression methods. This should
*only* be called in a single threaded context when an application
is shutting down to avoid interfering with existing contexts
attempting to look up compression methods.

6 years agoPKCS#8 support for alternative PRFs.
Dr. Stephen Henson [Fri, 28 Feb 2014 17:23:54 +0000 (17:23 +0000)]
PKCS#8 support for alternative PRFs.

Add option to set an alternative to the default hmacWithSHA1 PRF
for PKCS#8 private key encryptions. This is used automatically
by PKCS8_encrypt if the nid specified is a PRF.

Add option to pkcs8 utility.

Update docs.

6 years agoFix memory leak.
Dr. Stephen Henson [Fri, 28 Feb 2014 17:00:38 +0000 (17:00 +0000)]
Fix memory leak.

6 years agoMakefile.org: fix syntax error on Solaris.
Andy Polyakov [Fri, 28 Feb 2014 21:54:40 +0000 (22:54 +0100)]
Makefile.org: fix syntax error on Solaris.

PR: 3271
(cherry picked from commit 65370f9bbcbfc4a5bb87aa5e30f74da48966b7c1)

6 years agoFix compilation errors with no-nextprotoneg
Dr. Stephen Henson [Fri, 28 Feb 2014 13:35:30 +0000 (13:35 +0000)]
Fix compilation errors with no-nextprotoneg

6 years agoFix fips flag handling.
Dr. Stephen Henson [Thu, 27 Feb 2014 18:48:41 +0000 (18:48 +0000)]
Fix fips flag handling.

Don't set the fips flags in cipher and digests as the implementations
aren't suitable for FIPS mode and will be redirected to the FIPS module
versions anyway.

Return EVP_CIPH_FLAG_FIPS or EVP_MD_FLAG_FIPS if a FIPS implementation
exists when calling EVP_CIPHER_flags and EVP_MD_flags repectively.

Remove unused FIPS code from e_aes.c: the 1.0.2 branch will never be
used to build a FIPS module.

6 years agoRemove unused file.
Dr. Stephen Henson [Thu, 27 Feb 2014 17:19:32 +0000 (17:19 +0000)]
Remove unused file.

The file evp_fips.c isn't used in OpenSSL 1.0.2 as FIPS and non-FIPS
implementations of algorithms can coexist.

6 years agoevp/e_aes.c: harmonize with 1.0.1.
Andy Polyakov [Thu, 27 Feb 2014 16:47:23 +0000 (17:47 +0100)]
evp/e_aes.c: harmonize with 1.0.1.

6 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)

6 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)

6 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)

6 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)

6 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)

6 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

6 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

6 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)

6 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

6 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)

6 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)

6 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)

6 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)

6 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)

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

6 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

6 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.

6 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.

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

6 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)

6 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)

6 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.

6 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)

6 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

6 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.

6 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)

6 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)

6 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

6 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

6 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

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

6 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)

6 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)

6 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)

6 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)

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

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

6 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)

6 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.

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

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

6 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)

6 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)

6 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)

6 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.

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

6 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.

6 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)

6 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)

6 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)

6 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)

6 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)

6 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)

6 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

6 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)

6 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)

6 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)

6 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)

6 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)

6 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)

6 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).

6 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.

6 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).

6 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)

6 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)

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

6 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.

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

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

6 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

6 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

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