From 038bec784e528ce273169f178c35991fbc3bea92 Mon Sep 17 00:00:00 2001 From: Scott Deboy Date: Tue, 18 Jun 2013 14:34:38 -0700 Subject: 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 36086186a9b90cdad0d2cd0a598a10f03f8f4bcc) Conflicts: Configure apps/s_client.c apps/s_server.c ssl/ssl.h ssl/ssl3.h ssl/ssltest.c --- crypto/symhacks.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'crypto/symhacks.h') diff --git a/crypto/symhacks.h b/crypto/symhacks.h index 66733a302b..5774d24561 100644 --- a/crypto/symhacks.h +++ b/crypto/symhacks.h @@ -207,12 +207,12 @@ #undef tls1_send_server_supplemental_data #define tls1_send_server_supplemental_data tls1_send_server_suppl_data +#undef tls1_send_client_supplemental_data +#define tls1_send_client_supplemental_data tls1_send_client_suppl_data #undef tls1_get_server_supplemental_data #define tls1_get_server_supplemental_data tls1_get_server_suppl_data - -#undef SSL_SESSION_get_tlsext_authz_server_audit_proof -#define SSL_SESSION_get_tlsext_authz_server_audit_proof \ - S_SES_get_tlsx_auz_srvr_aud_prf +#undef tls1_get_client_supplemental_data +#define tls1_get_client_supplemental_data tls1_get_client_suppl_data #undef ssl3_cbc_record_digest_supported #define ssl3_cbc_record_digest_supported ssl3_cbc_record_digest_support -- cgit v1.2.3