(cherry picked from commit 3eddd1706a30cdf3dc9278692d8ee9038eac8a0d)

PR: 3201
(cherry picked from commit 03da57fe)

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

PR: 3251
Suggested by: Thorsten Schning
(cherry picked from commit 3ae1b534)

PR: 3251
Suggested by: Thorsten Schning
(cherry picked from commit 779c51c6)

when adding duplicates in add_cert_dir.

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

(cherry picked from commit 5a7652c3)

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

(cherry picked from commit e547c45f)

(cherry picked from commit 2b4ffc65)

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 856c6dfb)

Remove reference to ERR_TXT_MALLOCED in the error library as that is
only used internally. Indicate that returned error data must not be
freed.
(cherry picked from commit f2d678e6)

(cherry picked from commit cb218267)

(cherry picked from commit 717cc858)

Always add a dynamically loaded ENGINE to list. Otherwise it can cause
problems when multiply loaded, especially if it adds new public key methods.
For all current engines we only want a single implementation anyway.
(cherry picked from commit e933f91f)

Use default instead of ENGINE version of digest. Without this
errors will occur if you use an ENGINE for a private key and
it doesn't implement the digest in question.
(cherry picked from commit 4eedf86a)

PR#3178
(cherry picked from commit eb85ee9a)

(cherry picked from commit 8f4077ca)

The flag SSL_OP_MSIE_SSLV2_RSA_PADDING hasn't done anything since OpenSSL
0.9.7h but deleting it will break source compatibility with any software
that references it. Restore it but #define to zero.
(cherry picked from commit b17d6b8d)

For DTLS we might need to retransmit messages from the previous session
so keep a copy of write context in DTLS retransmission buffers instead
of replacing it after sending CCS. CVE-2013-6450.
(cherry picked from commit 34628967)

Conflicts:

	ssl/ssl_locl.h

(cherry picked from commit a6c62f0c)

(cherry picked from commit 16bc45ba)

(cherry picked from commit 01be36ef70525e81fc358d2e559bdd0a0d9427a5)

(cherry picked from commit 7040d73d22987532faa503630d6616cf2788c975)

Original definition depended on __LONG_MAX__ that is not guaranteed to
be present. As we don't support platforms with int narrower that 32 bits
it's appropriate to make defition inconditional.

PR: 3165
(cherry picked from commit 96180cac)

(cherry picked from commit a4947e4e)

<christian@python.org>.

Conflicts:
	crypto/evp/p5_crpt2.c

Submitted by: Yuriy Kaminskiy
(cherry picked from commit 524b00c0)

Resolved conflicts:

	crypto/evp/e_des3.c
(cherry picked from commit eb22b7ec)