deprecated gnutls_privkey_sign_raw_data()

diff --git a/lib/includes/gnutls/abstract.h b/lib/includes/gnutls/abstract.h
index 541b7ecbd501c38986247a3eb9b8c17cf975e0d5..d030f0cce5fee7e36786c36ab75d38337ea10d94 100644 (file)
--- a/lib/includes/gnutls/abstract.h
+++ b/lib/includes/gnutls/abstract.h
@@ -54,12 +54,6 @@ extern "C"
     GNUTLS_PUBKEY_GET_OPENPGP_FINGERPRINT = 1<<3,
   } gnutls_pubkey_flags_t;
 
-struct gnutls_pubkey_st;
-typedef struct gnutls_pubkey_st *gnutls_pubkey_t;
-
-struct gnutls_privkey_st;
-typedef struct gnutls_privkey_st *gnutls_privkey_t;
-
 typedef int (*gnutls_privkey_sign_func) (gnutls_privkey_t key,
                                          void *userdata,
                                          const gnutls_datum_t * raw_data,
@@ -310,11 +304,6 @@ int gnutls_privkey_sign_hash (gnutls_privkey_t signer,
                              const gnutls_datum_t * hash_data,
                              gnutls_datum_t * signature);
 
-int
-gnutls_privkey_sign_raw_data (gnutls_privkey_t key,
-                             unsigned flags,
-                              const gnutls_datum_t * data,
-                              gnutls_datum_t * signature);
 
 int gnutls_privkey_decrypt_data (gnutls_privkey_t key,
                                  unsigned int flags,

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 6710cad154f846438f960769d535b9de6bc5902d..2e829fc9f3f7b633d1234f3f6199b806fdfc17f3 100644 (file)
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -310,6 +310,12 @@ gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
                                               res,
                                               gnutls_rsa_params_t rsa_params) _GNUTLS_GCC_ATTR_DEPRECATED;
 
+  /* use gnutls_privkey_sign_hash() with the GNUTLS_PRIVKEY_SIGN_FLAG_TLS1_RSA flag */
+  int gnutls_privkey_sign_raw_data (gnutls_privkey_t key,
+                             unsigned flags,
+                              const gnutls_datum_t * data,
+                              gnutls_datum_t * signature) _GNUTLS_GCC_ATTR_DEPRECATED;
+
 #ifdef _ISOC99_SOURCE
 /* we provide older functions for compatibility as inline functions that
  * depend on gnutls_session_get_random. */

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 779556cd2d09fe853ce5f74cab8dafe02aa3213b..7b4a57a758cc75a1cfa9d88ab3642eab4ac8210f 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -1162,6 +1162,12 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
 
 /* x.509 types */
 
+  struct gnutls_pubkey_st;
+  typedef struct gnutls_pubkey_st *gnutls_pubkey_t;
+
+  struct gnutls_privkey_st;
+  typedef struct gnutls_privkey_st *gnutls_privkey_t;
+
   struct gnutls_x509_privkey_int;
   typedef struct gnutls_x509_privkey_int *gnutls_x509_privkey_t;