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

Conflicts:
	crypto/buffer/buffer.c

(cherry picked from commit 415ece73)

    - EC_GROUP_cmp shouldn't consider curves equal just because
      the curve name is the same. (They really *should* be the same
      in this case, but there's an EC_GROUP_set_curve_name API,
      which could be misused.)

    - EC_POINT_cmp shouldn't return 0 for ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED
      or EC_R_INCOMPATIBLE_OBJECTS errors because in a cmp API, 0 indicates
      equality (not an error).

    Reported by: king cope

(cherry picked from commit 312a46791ab465cfa3bf26764361faed0e5df014)

OS X 10.8..10.8.3 has broken support for ECDHE-ECDSA ciphers.

(cherry picked from commit 3a918ea2bbf4175d9461f81be1403d3781b2c0dc)

This fix ensures that
* A HelloRequest is retransmitted if not responded by a ClientHello
* The HelloRequest "consumes" the sequence number 0. The subsequent
ServerHello uses the sequence number 1.
* The client also expects the sequence number of the ServerHello to
be 1 if a HelloRequest was received earlier.
This patch fixes the RFC violation.
(cherry picked from commit b62f4daa)

Conflicts:

	ssl/d1_pkt.c

Reported by: Prashant Jaikumar <rmstar@gmail.com>

Fix handling of application data received before a handshake.
(cherry picked from commit 0c75eeac)

PR #3090
Reported by: Franck Youssef <fry@open.ch>

If no new reason codes are obtained after checking a CRL exit with an
error to avoid repeatedly checking the same CRL.

This will only happen if verify errors such as invalid CRL scope are
overridden in a callback.
(cherry picked from commit 4b26645c)

PR: 3028
Fix bug introduced in PEM_X509_INFO_bio which wouldn't process RSA keys
correctly if they appeared first.
(cherry picked from commit 5ae8d6bc)

Submitted by: Bryan Drewery
PR: 3075
(cherry picked from commit c256e69d)

(cherry picked from commit 04638f2f)

(cherry picked from commit 0ded2a06)

The only standard compression method is stateful and is incompatible with
DTLS.
(cherry picked from commit e14b8410)

PR: 3005
(cherry picked from commit 5702e965)

(cherry picked from commit 80ccc66d)

If an ASN1_INTEGER structure is allocated but not explicitly set encode
it as zero: don't generate an invalid zero length INTEGER.
(cherry picked from commit 1643edc6)

(cherry picked from commit 1546fb78)

podlators 2.5.0 has switched to dying on POD syntax errors. This means
that a bunch of long-standing erroneous POD in the openssl documentation
now leads to fatal errors from pod2man, halting installation.

Unfortunately POD constraints mean that you have to sort numeric lists
in ascending order if they start with 1: you cannot do 1, 0, 2 even if
you want 1 to appear first. I've reshuffled such (alas, I wish there
were a better way but I don't know of one).
(cherry picked from commit 5cc27077)

(cherry picked from commit 9c437e2f)

Need to check DTLS_BAD_VER as well as DTLS1_VERSION.
PR:2984

(cherry picked from commit cbf9b4ae)

Now we set the current certificate to the one used by a server
there is no need to call ssl_get_server_send_cert which will
fail if we haven't sent a certificate yet.
(cherry picked from commit 147dbb2f)

(cherry picked from commit f88dbb83)

(cherry picked from commit 3caeef94)

(cherry picked from commit f93a4187)

(cherry picked from commit e9baceab)

(cherry picked from commit 8545f73b)

Fix the calculation that checks there is enough room in a record
after removing padding and optional explicit IV. (by Steve)

For AEAD remove the correct number of padding bytes (by Andy)
(cherry picked from commit 32cc2479)

Resolved conflicts:

	ssl/s3_cbc.c

Kludge alert. This is arranged by passing padding length in unused
bits of SSL3_RECORD->type, so that orig_len can be reconstructed.
(cherry picked from commit 8bfd4c65)