From: Nikos Mavrogiannopoulos Date: Sat, 5 Feb 2011 09:31:55 +0000 (+0100) Subject: Removed functions: X-Git-Tag: gnutls_2_99_0~334 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a95c1f3ee290b07c9dfadfd280e2ba6cbc85baf;p=thirdparty%2Fgnutls.git Removed functions: gnutls_ext_register, gnutls_certificate_get_x509_crls, gnutls_certificate_get_x509_cas and bumped library version number. --- diff --git a/NEWS b/NEWS index 7390792f5b..a3e2c3a12e 100644 --- a/NEWS +++ b/NEWS @@ -71,9 +71,6 @@ gnutls_x509_privkey_sign_hash: DEPRECATED (use: gnutls_privkey_sign_hash2) gnutls_x509_privkey_verify_data: DEPRECATED (use: gnutls_pubkey_verify_data) gnutls_psk_netconf_derive_key: DEPRECATED gnutls_session_set_finished_function: DEPRECATED -gnutls_ext_register: DEPRECATED -gnutls_certificate_get_x509_crls: DEPRECATED -gnutls_certificate_get_x509_cas: DEPRECATED gnutls_session_get_server_random: DEPRECATED gnutls_session_get_client_random: DEPRECATED gnutls_session_get_master_secret: DEPRECATED @@ -85,6 +82,9 @@ gnutls_openpgp_privkey_sign_hash: DEPRECATED (use: gnutls_privkey_sign_hash2) gnutls_pkcs11_privkey_sign_hash: REMOVED (was added in 2.11.0) gnutls_pkcs11_privkey_decrypt_data: REMOVED (was added in 2.11.0) gnutls_privkey_sign_hash: REMOVED (was added in 2.11.0) +gnutls_ext_register: REMOVED +gnutls_certificate_get_x509_crls: REMOVED +gnutls_certificate_get_x509_cas: REMOVED * Version 2.11.6 (released 2010-12-06) diff --git a/lib/gnutls_cert.c b/lib/gnutls_cert.c index 00a5ea62b3..ef8b3d5ac8 100644 --- a/lib/gnutls_cert.c +++ b/lib/gnutls_cert.c @@ -98,52 +98,10 @@ gnutls_certificate_free_keys (gnutls_certificate_credentials_t sc) void gnutls_certificate_free_cas (gnutls_certificate_credentials_t sc) { - /* do nothing for now */ + /* FIXME: do nothing for now */ return; } -/** - * gnutls_certificate_get_x509_cas: - * @sc: is a #gnutls_certificate_credentials_t structure. - * @x509_ca_list: will point to the CA list. Should be treated as constant - * @ncas: the number of CAs - * - * This function will export all the CAs associated with the given - * credentials. - * - * Since: 2.4.0 - * Deprecated and defunctional since: 2.11.0 - **/ -void -gnutls_certificate_get_x509_cas (gnutls_certificate_credentials_t sc, - gnutls_x509_crt_t ** x509_ca_list, - unsigned int *ncas) -{ - *x509_ca_list = NULL; - *ncas = 0; -} - -/** - * gnutls_certificate_get_x509_crls: - * @sc: is a #gnutls_certificate_credentials_t structure. - * @x509_crl_list: the exported CRL list. Should be treated as constant - * @ncrls: the number of exported CRLs - * - * This function will export all the CRLs associated with the given - * credentials. - * - * Since: 2.4.0 - * Deprecated and defunctional since: 2.11.0 - **/ -void -gnutls_certificate_get_x509_crls (gnutls_certificate_credentials_t sc, - gnutls_x509_crl_t ** x509_crl_list, - unsigned int *ncrls) -{ - *x509_crl_list = NULL; - *ncrls = 0; -} - #ifdef ENABLE_OPENPGP /** diff --git a/lib/gnutls_extensions.c b/lib/gnutls_extensions.c index 05ca7e2e2e..6449a39f15 100644 --- a/lib/gnutls_extensions.c +++ b/lib/gnutls_extensions.c @@ -396,40 +396,6 @@ _gnutls_ext_register (extension_entry_st * mod) return GNUTLS_E_SUCCESS; } -/*- - * gnutls_ext_register: - * @type: the 16-bit integer referring to the extension type - * @name: human printable name of the extension used for debugging - * @parse_type: either #GNUTLS_EXT_TLS or %GNUTLS_EXT_APPLICATION. - * @recv_func: a function to receive extension data - * @send_func: a function to send extension data - * - * This function is used to register a new TLS extension handler. - * - * Returns: %GNUTLS_E_SUCCESS on success, or an error code. - * - * Deprecated in: 2.11.0 - -*/ -int -gnutls_ext_register (int type, - const char *name, - gnutls_ext_parse_type_t parse_type, - gnutls_ext_recv_func recv_func, - gnutls_ext_send_func send_func) -{ - extension_entry_st ee; - - memset (&ee, 0, sizeof (ee)); - - ee.type = type; - ee.name = name; - ee.parse_type = parse_type; - ee.recv_func = recv_func; - ee.send_func = send_func; - /* FIXME: Why is this exported? Should it be removed? */ - return _gnutls_ext_register (&ee); -} - int _gnutls_ext_pack (gnutls_session_t session, gnutls_buffer_st * packed) { diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h index a047dc89a7..d45f47abe8 100644 --- a/lib/includes/gnutls/compat.h +++ b/lib/includes/gnutls/compat.h @@ -177,17 +177,6 @@ gnutls_sign_func gnutls_sign_callback_get (gnutls_session_t session, void **userdata) _GNUTLS_GCC_ATTR_DEPRECATED; -/* Extension API is no longer exported because a lot of internal - * structures are used. Currently it works due to a compatibility - * layer, but will be removed in later versions. - */ - int gnutls_ext_register (int type, - const char *name, - gnutls_ext_parse_type_t parse_type, - gnutls_ext_recv_func recv_func, - gnutls_ext_send_func send_func) - _GNUTLS_GCC_ATTR_DEPRECATED; - /* We no longer support the finished callback. Use * gnutls_session_channel_binding for similar functionality. */ @@ -308,18 +297,4 @@ gnutls_sign_callback_get (gnutls_session_t session, void **userdata) unsigned int flags) _GNUTLS_GCC_ATTR_DEPRECATED; -/* These functions cannot be supported. They export internal - * structure. - */ - void gnutls_certificate_get_x509_cas (gnutls_certificate_credentials_t sc, - gnutls_x509_crt_t ** x509_ca_list, - unsigned int *ncas) - _GNUTLS_GCC_ATTR_DEPRECATED; - - void gnutls_certificate_get_x509_crls (gnutls_certificate_credentials_t sc, - gnutls_x509_crl_t ** x509_crl_list, - unsigned int *ncrls) - _GNUTLS_GCC_ATTR_DEPRECATED; - - #endif /* _GNUTLS_COMPAT_H */ diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4 index 42e45574b0..0504b6b91b 100644 --- a/lib/m4/hooks.m4 +++ b/lib/m4/hooks.m4 @@ -26,9 +26,9 @@ AC_DEFUN([LIBGNUTLS_HOOKS], # Interfaces changed/added/removed: CURRENT++ REVISION=0 # Interfaces added: AGE++ # Interfaces removed: AGE=0 - AC_SUBST(LT_CURRENT, 44) - AC_SUBST(LT_REVISION, 6) - AC_SUBST(LT_AGE, 18) + AC_SUBST(LT_CURRENT, 27) + AC_SUBST(LT_REVISION, 0) + AC_SUBST(LT_AGE, 0) AC_SUBST(CXX_LT_CURRENT, 27) AC_SUBST(CXX_LT_REVISION, 0)