dropped source backwards compatibility

diff --git a/includes/gnutls/extra.h b/includes/gnutls/extra.h
index 4d7218c28ed09ac26645a9ca2521b381a50319d1..ec009648e215925bf71b080684feafa4da3ec105 100644 (file)
--- a/includes/gnutls/extra.h
+++ b/includes/gnutls/extra.h
@@ -99,21 +99,4 @@ int gnutls_global_init_extra(void);
  */
 const char* gnutls_extra_check_version( const char*);
 
-/* Defines for compatibility with previous versions.
- */
-#define GNUTLS_SRP_SERVER_CREDENTIALS gnutls_srp_server_credentials
-#define GNUTLS_SRP_CLIENT_CREDENTIALS gnutls_srp_client_credentials
-
-#define gnutls_srp_free_client_sc gnutls_srp_free_client_credentials
-#define gnutls_srp_allocate_client_sc gnutls_srp_allocate_client_credentials
-#define gnutls_srp_free_client_cred gnutls_srp_free_client_credentials
-#define gnutls_srp_allocate_client_cred gnutls_srp_allocate_client_credentials
-#define gnutls_srp_set_client_cred gnutls_srp_set_client_credentials
-
-#define gnutls_srp_free_server_sc gnutls_srp_free_server_credentials
-#define gnutls_srp_allocate_server_sc gnutls_srp_allocate_server_credentials
-#define gnutls_srp_free_server_cred gnutls_srp_free_server_credentials
-#define gnutls_srp_allocate_server_cred gnutls_srp_allocate_server_credentials
-#define gnutls_srp_set_server_cred_file gnutls_srp_set_server_credentials_file
-
 #endif

diff --git a/lib/gnutls.h.in.in b/lib/gnutls.h.in.in
index d0468ddddbc21571d59dc8d6c81a5db9a2059cf7..f29e7a6de5cc759756a4da8b6de7941c8c40b4f5 100644 (file)
--- a/lib/gnutls.h.in.in
+++ b/lib/gnutls.h.in.in
@@ -176,7 +176,6 @@ ssize_t gnutls_record_recv( gnutls_session session, void *data, size_t sizeofdat
 #define gnutls_read gnutls_record_recv
 #define gnutls_write gnutls_record_send
 
-#define gnutls_handshake_get_direction gnutls_record_get_direction
 int gnutls_record_get_direction(gnutls_session session);
 
 size_t gnutls_record_get_max_size( gnutls_session session);
@@ -359,65 +358,4 @@ void gnutls_openpgp_send_key(gnutls_session session, gnutls_openpgp_key_status s
 
 int gnutls_x509_fingerprint(gnutls_digest_algorithm algo, const gnutls_datum* data, char* result, size_t* result_size);
 
-/* defines for compatibility with older versions.
- */
-#define GNUTLS_RSA_PARAMS gnutls_rsa_params
-#define GNUTLS_DH_PARAMS gnutls_dh_params
-#define GNUTLS_STATE gnutls_session
-#define GNUTLS_LIST const int*
-#define GNUTLS_TRANSPORT_PTR gnutls_transport_ptr
-#define GNUTLS_PKAlgorithm gnutls_pk_algorithm
-#define GNUTLS_X509_CertificateFmt gnutls_x509_certificate_format
-#define GNUTLS_CertificateType gnutls_certificate_type
-#define GNUTLS_Version gnutls_protocol_version
-#define GNUTLS_CloseRequest gnutls_close_request
-#define GNUTLS_OpenPGPKeyStatus gnutls_openpgp_key_status
-#define GNUTLS_CertificateRequest gnutls_certificate_request
-#define GNUTLS_CertificateStatus gnutls_certificate_status
-#define GNUTLS_ConnectionEnd gnutls_connection_end
-#define GNUTLS_CompressionMethod gnutls_compression_method
-#define GNUTLS_DigestAlgorithm gnutls_digest_algorithm
-#define GNUTLS_CredType gnutls_credentials_type
-#define GNUTLS_KXAlgorithm gnutls_kx_algorithm
-#define GNUTLS_BulkCipherAlgorithm gnutls_cipher_algorithm
-#define GNUTLS_MACAlgorithm gnutls_mac_algorithm
-#define GNUTLS_AlertLevel gnutls_alert_level
-#define GNUTLS_AlertDescription gnutls_alert_description
-#define GNUTLS_CERTIFICATE_CLIENT_CREDENTIALS gnutls_certificate_client_credentials
-#define GNUTLS_CERTIFICATE_SERVER_CREDENTIALS gnutls_certificate_server_credentials
-#define GNUTLS_CERTIFICATE_CREDENTIALS gnutls_certificate_credentials
-#define GNUTLS_ANON_SERVER_CREDENTIALS gnutls_anon_server_credentials
-#define GNUTLS_ANON_CLIENT_CREDENTIALS gnutls_anon_client_credentials
-#define gnutls_transport_set_push_func gnutls_transport_set_push_function
-#define gnutls_transport_set_pull_func gnutls_transport_set_pull_function
-#define gnutls_global_set_log_func gnutls_global_set_log_function
-#define gnutls_global_set_mem_func gnutls_global_set_mem_functions
-
-#define gnutls_certificate_free_sc gnutls_certificate_free_credentials
-#define gnutls_certificate_allocate_sc gnutls_certificate_allocate_credentials
-#define gnutls_certificate_free_cred gnutls_certificate_free_credentials
-#define gnutls_certificate_allocate_cred gnutls_certificate_allocate_credentials
-
-#define gnutls_anon_free_client_sc gnutls_anon_free_client_credentials
-#define gnutls_anon_allocate_client_sc gnutls_anon_allocate_client_credentials
-#define gnutls_anon_free_server_sc gnutls_anon_free_server_credentials
-#define gnutls_anon_allocate_server_sc gnutls_anon_allocate_server_credentials
-
-#define gnutls_anon_free_client_cred gnutls_anon_free_client_credentials
-#define gnutls_anon_allocate_client_cred gnutls_anon_allocate_client_credentials
-#define gnutls_anon_free_server_cred gnutls_anon_free_server_credentials
-#define gnutls_anon_allocate_server_cred gnutls_anon_allocate_server_credentials
-
-#define gnutls_state_get_ptr gnutls_session_get_ptr
-#define gnutls_state_set_ptr gnutls_session_set_ptr
-#define gnutls_handshake_set_exportable_detection(x,y) 0
-#define gnutls_cert_type_get gnutls_certificate_type_get
-#define gnutls_cert_type_set_priority gnutls_certificate_type_set_priority
-#define gnutls_cert_type_get_name gnutls_certificate_type_get_name
-#define gnutls_cred_set        gnutls_credentials_set
-
-#define gnutls_b64_encode_fmt gnutls_pem_base64_encode
-#define gnutls_b64_encode_fmt2 gnutls_pem_base64_encode_alloc
-#define gnutls_b64_decode_fmt(a,b,c) gnutls_pem_base64_decode( NULL,a,b,c)
-#define gnutls_b64_decode_fmt2(a,b)  gnutls_pem_base64_decode_alloc(NULL,a,b)