(and remove duplicates).

(cherry picked from commit 9587429f)

(other processors unaffected).
(cherry picked from commit 98e143f1)

Revert libssl ordinals to OpenSSL 1.0.1 values first to tidy up and
avoid entries for deleted functions.

Merge branch '102_stable_tlsext_suppdata_changes' of git://github.com/scottdeboy/openssl into scottdeboy-102_stable_tlsext_suppdata_changes

(cherry picked from commit 5eda213e)
Conflicts:
	apps/s_client.c
	apps/s_server.c

(cherry picked from commit a6a48e87)
Conflicts:
	ssl/s3_clnt.c
	ssl/t1_lib.c

Reverting 1.0.2-only changes supporting the prior authz RFC5878-based tests from commit 835d104f

The contract for custom extension callbacks has changed - all custom extension callbacks are triggered

Whitespace fixes

(cherry picked from commit e9add063)
Conflicts:
	ssl/s3_clnt.c

If multiple TLS extensions are expected but not received, the TLS extension and supplemental data 'generate' callbacks are the only chance for the receive-side to trigger a specific TLS alert during the handshake.

Removed logic which no-op'd TLS extension generate callbacks (as the generate callbacks need to always be called in order to trigger alerts), and updated the serverinfo-specific custom TLS extension callbacks to track which custom TLS extensions were received by the client, where no-ops for 'generate' callbacks are appropriate.

(cherry picked from commit ac20719d)
Conflicts:
	ssl/t1_lib.c

Free generated supp data after handshake completion, add comment regarding use of num_renegotiations in TLS and supp data generation callbacks

(cherry picked from commit 67c408ce)
Conflicts:
	apps/s_client.c
	apps/s_server.c

Add callbacks supporting generation and retrieval of supplemental data entries, facilitating RFC 5878 (TLS auth extensions)
Removed prior audit proof logic - audit proof support was implemented using the generic TLS extension API
Tests exercising the new supplemental data registration and callback api can be found in ssltest.c.
Implemented changes to s_server and s_client to exercise supplemental data callbacks via the -auth argument, as well as additional flags to exercise supplemental data being sent only during renegotiation.

(cherry picked from commit 36086186)
Conflicts:
	Configure
	apps/s_client.c
	apps/s_server.c
	ssl/ssl.h
	ssl/ssl3.h
	ssl/ssltest.c

(cherry picked from commit 2d752737)

(cherry picked from commit b45e874d)

(cherry picked from commit 3880579240d476d21f68fd01a391dd325920f479)

If an application calls the macro SSL_CTX_get_extra_chain_certs
return either the old "shared" extra certificates or those associated
with the current certificate.

This means applications which call SSL_CTX_use_certificate_chain_file
and retrieve the additional chain using SSL_CTX_get_extra_chain_certs
will still work. An application which only wants to check the shared
extra certificates can call the new macro
SSL_CTX_get_extra_chain_certs_only
(cherry picked from commit a51f7676)

PR#3253

New ctrl sets current certificate based on certain criteria. Currently
two options: set the first valid certificate as current and set the
next valid certificate as current. Using these an application can
iterate over all certificates in an SSL_CTX or SSL structure.
(cherry picked from commit 0f78819c)

(cherry picked from commit f3efeaad)

(cherry picked from commit 88c21c47)

(cherry picked from commit ea131a06)

(cherry picked from commit d80b0eee)

(cherry picked from commit ebd14bfc)