Force no SSL2 when custom extensions in use.
Don't clear extension state when cert is set.
Clear on renegotiate.

Conflicts:
	ssl/t1_lib.c

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

Merge branch 'OpenSSL_1_0_2-stable' of /usr/local/google/home/bmoeller/openssl/openssl into OpenSSL_1_0_2-stable

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

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

PR: 3125
Submitted by: Kyle McMartin
(cherry picked from commit 8e52a906)

(cherry picked from commit 139cd16c)

Avoid occasional up to 8% performance drops.
(cherry picked from commit 7a1a1223)

(cherry picked from commit 72a15870)

This reverts commit 514f1a78.

(cherry picked from commit ce455596)

When verifying a partial path always check to see if the EE certificate
is explicitly trusted: the path could contain other untrusted certificates.
(cherry picked from commit 52073b76)

(cherry picked from commit c3eb3376)

(cherry picked from commit b093a06866bf632a97a9a0286e2d08f69c3cf7dd)

(cherry picked from commit 3a918ea2bbf4175d9461f81be1403d3781b2c0dc)

(cherry picked from commit f7ac0ec8)

Backport of ASN1_TIME_diff and OPENSSL_gmtime_diff functions from master
branch.

(cherry picked from commit 51b9115b)

is needed to test some profiles/protocols which reject certificates
with unsupported versions.
(cherry picked from commit df316fd4)

(cherry picked from commit 96cfba0f)

(cherry picked from commit 7c8ac505)

(cherry picked from commit b5cadfb5)

(cherry picked from commit 68575593)

just like a "real" server making it easier to trace any problems.

(manually applied from commit 35b0ea4e)

(cherry picked from commit 14536c8c)

by client and send back to server. Also prints an abbreviated summary of
the connection parameters.
(cherry picked from commit 4f3df8be)

New option -verify_quiet to shut up the verify callback unless there is
an error.

(manually applied from commit 2a7cbe77)

Preliminary documentation for chain and verify stores and certificate chain
setting functions.
(cherry picked from commit eeb15452)

(cherry picked from commit 42082eda)

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)

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

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