Merge branch 'mbland-heartbeat-test'
Fix a wrong parameter count ERR_add_error_data
Fix bug in signature algorithm copy.
Adding padding extension to trace code.
For portability use BUF_strndup instead of strndup.
Don't allocate more than is needed in BUF_strndup().
aesv8-armx.pl: optimize by adding 128-bit code paths.
aesv8-armx.pl: fix typo.
Change default cipher in smime app to des3.

PR#3357
Fix for PKCS12_create if no-rc2 specified.

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

PR#3357
Fixes to host checking.

Fixes to host checking wild card support and add support for
setting host checking flags when verifying a certificate
chain.
Implement BUF_strnlen() and use it instead of strlen().
Remove redundant test.
Fixed unterminated B tag, causing build to fail with newer pod2man versions
Fixed minor copy&paste error, and stray space causing rendering problem
Check length first in BUF_strnlen().
Fix heartbeat_test for -DOPENSSL_NO_HEARTBEATS

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