summaryrefslogtreecommitdiff
path: root/includes/gnutls/gnutls.h.in
diff options
context:
space:
mode:
Diffstat (limited to 'includes/gnutls/gnutls.h.in')
-rw-r--r--includes/gnutls/gnutls.h.in27
1 files changed, 25 insertions, 2 deletions
diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 345752474b..70ef5c6183 100644
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -165,6 +165,13 @@ extern "C"
GNUTLS_CLIENT
} gnutls_connection_end_t;
+ typedef enum
+ {
+ GNUTLS_PRIORITIES_PERFORMANCE,
+ GNUTLS_PRIORITIES_SECURITY,
+ GNUTLS_PRIORITIES_EXPORT
+ } gnutls_priority_t;
+
typedef enum
{
GNUTLS_AL_WARNING = 1,
@@ -516,10 +523,26 @@ extern "C"
int gnutls_cipher_convert_priority (int* out_priority, int out_priority_len, const char *prio, char sep);
int gnutls_certificate_type_convert_priority (int* out_priority, int out_priority_len, const char *prio, char sep);
+#ifdef __GNUC__
+
+#define _GNUTLS_GCC_VERSION (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__)
+
+#if _GNUTLS_GCC_VERSION >= 30100
+#define _GNUTLS_GCC_ATTR_DEPRECATED __attribute__ ((__deprecated__))
+#endif
+
+#endif /* __GNUC__ */
+
+#ifndef _GNUTLS_GCC_ATTR_DEPRECATED
+#define _GNUTLS_GCC_ATTR_DEPRECATED
+#endif
+
+
/* if you just want some defaults, use the following.
*/
- int gnutls_set_default_priority (gnutls_session_t session);
- int gnutls_set_default_export_priority (gnutls_session_t session);
+ void gnutls_set_default_priority2 (gnutls_session_t session, gnutls_priority_t flag);
+ int gnutls_set_default_priority (gnutls_session_t session) _GNUTLS_GCC_ATTR_DEPRECATED;
+ int gnutls_set_default_export_priority (gnutls_session_t session) _GNUTLS_GCC_ATTR_DEPRECATED;
/* Returns the name of a cipher suite */
const char *gnutls_cipher_suite_get_name (gnutls_kx_algorithm_t