PR#3286
(cherry picked from commit 71e95000afb2227fe5cac1c79ae884338bcd8d0b)

Add certificates if -nocerts and -certfile specified when signing
in smime application. This can be used this to specify the
order certificates appear in the PKCS#7 structure: some broken
applications require a certain ordering.

PR#3316
(cherry picked from commit e114abee9ec084a56c1d6076ac6de8a7a3a5cf34)

PR#3302
(cherry picked from commit 9717f01951f976f76dd40a38d9fc7307057fa4c4)

Delays the queue insertion until after the ssl3_setup_buffers() call due to use-after-free bug. PR#3362

(cherry picked from commit ea2bb861f0daaa20819bf9ac8c146f7593feacd4)

Conflicts:

	apps/s_cb.c

Add TLS padding extension to SSL_OP_ALL so it is used with other
"bugs" options and can be turned off.

This replaces SSL_OP_SSLREF2_REUSE_CERT_TYPE_BUG which is an ancient
option referring to SSLv2 and SSLREF.

PR#3336
(cherry picked from commit 758415b2259fa45d3fe17d8e53ae1341b7b6e482)

Conflicts:

	ssl/t1_lib.c

(cherry picked from commit 3009244d)

Make sure there is an extra 4 bytes for server done message when
NETSCAPE_HANG_BUG is defined.

PR#3361
(cherry picked from commit 92d81ba6)

PR#3313
(cherry picked from commit 7e2c6f7e)

PR#3319
(cherry picked from commit 84691390eae86befd33c83721dacedb539ae34e6)

(cherry picked from commit 2c575907d2c8601a18716f718ce309ed4e1f1783)

PR#3249
(cherry picked from commit 8909bf20269035d295743fca559207ef2eb84eb3)

PR#3278
(cherry picked from commit de56fe797081fc09ebd1add06d6e2df42a324fd5)

(cherry picked from commit 3820fec3a09faecba7fe9912aa20ef7fcda8337b)

(cherry picked from commit b83d09f5)

Replaces the entire test with a trivial implementation when
OPENSSL_NO_HEARTBEATS is defined.

Fixes to host checking wild card support and add support for
setting host checking flags when verifying a certificate
chain.
(cherry picked from commit 397a8e74)

Use triple DES for certificate encryption if no-rc2 is
specified.

PR#3357

PR#3357
(cherry picked from commit ca3ffd9670f2b589bf8cc04923f953e06d6fbc58)

(cherry picked from commit dcca7b13)

(cherry picked from commit 6db14dbc)

Regression test against CVE-2014-0160 (Heartbleed).

More info: http://mike-bland.com/tags/heartbleed.html

(based on commit 35cb55988b75573105eefd00d27d0138eebe40b1)

Moved note about lack of support for AEAD modes out of BUGS section to SUPPORTED CIPHERS section (bug has been fixed, but still no support for AEAD)

(cherry picked from commit 09184dddead165901700b31eb39d540ba30f93c5)

various link settings. PR#3332