Functions for RSA-EXPORT were marked as deprecated.

diff --git a/lib/includes/gnutls/compat.h b/lib/includes/gnutls/compat.h
index 6c8e3c11b706a81e518cacfe249733fee67ef69c..becf98bb1297d834ed8165cdd3f37c3cf1bd5313 100644 (file)
--- a/lib/includes/gnutls/compat.h
+++ b/lib/includes/gnutls/compat.h
@@ -289,6 +289,45 @@ gnutls_sign_callback_get (gnutls_session_t session, void **userdata)
                                             const int *list)
                                             _GNUTLS_GCC_ATTR_DEPRECATED;
 
+/* RSA params 
+ */
+  int gnutls_rsa_params_init (gnutls_rsa_params_t * rsa_params) _GNUTLS_GCC_ATTR_DEPRECATED;
+  void gnutls_rsa_params_deinit (gnutls_rsa_params_t rsa_params) _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_rsa_params_cpy (gnutls_rsa_params_t dst,
+                             gnutls_rsa_params_t src) _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_rsa_params_import_raw (gnutls_rsa_params_t rsa_params,
+                                    const gnutls_datum_t * m,
+                                    const gnutls_datum_t * e,
+                                    const gnutls_datum_t * d,
+                                    const gnutls_datum_t * p,
+                                    const gnutls_datum_t * q,
+                                    const gnutls_datum_t * u);
+  int gnutls_rsa_params_generate2 (gnutls_rsa_params_t params,
+                                   unsigned int bits) _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_rsa_params_export_raw (gnutls_rsa_params_t rsa,
+                                    gnutls_datum_t * m, gnutls_datum_t * e,
+                                    gnutls_datum_t * d, gnutls_datum_t * p,
+                                    gnutls_datum_t * q, gnutls_datum_t * u,
+                                    unsigned int *bits) _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_rsa_params_export_pkcs1 (gnutls_rsa_params_t params,
+                                      gnutls_x509_crt_fmt_t format,
+                                      unsigned char *params_data,
+                                      size_t * params_data_size) _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_rsa_params_import_pkcs1 (gnutls_rsa_params_t params,
+                                      const gnutls_datum_t * pkcs1_params,
+                                      gnutls_x509_crt_fmt_t format) _GNUTLS_GCC_ATTR_DEPRECATED;
+
+  int gnutls_rsa_export_get_pubkey (gnutls_session_t session,
+                                    gnutls_datum_t * exponent,
+                                    gnutls_datum_t * modulus) _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_rsa_export_get_modulus_bits (gnutls_session_t session) _GNUTLS_GCC_ATTR_DEPRECATED;
+  int gnutls_set_default_export_priority (gnutls_session_t session) _GNUTLS_GCC_ATTR_DEPRECATED;
+
+  void
+    gnutls_certificate_set_rsa_export_params (gnutls_certificate_credentials_t
+                                              res,
+                                              gnutls_rsa_params_t rsa_params) _GNUTLS_GCC_ATTR_DEPRECATED;
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/lib/includes/gnutls/gnutls.h.in b/lib/includes/gnutls/gnutls.h.in
index 5034d8065032b15f53f77f4732b997495d6ac13b..83d4743ef009eb71058f0fc83f9ff73d4eb6860a 100644 (file)
--- a/lib/includes/gnutls/gnutls.h.in
+++ b/lib/includes/gnutls/gnutls.h.in
@@ -917,7 +917,6 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
   /* for compatibility
    */
   int gnutls_set_default_priority (gnutls_session_t session);
-  int gnutls_set_default_export_priority (gnutls_session_t session);
 
 /* Returns the name of a cipher suite */
   const char *gnutls_cipher_suite_get_name (gnutls_kx_algorithm_t
@@ -1072,10 +1071,6 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
 
   void gnutls_certificate_set_dh_params (gnutls_certificate_credentials_t res,
                                          gnutls_dh_params_t dh_params);
-  void
-    gnutls_certificate_set_rsa_export_params (gnutls_certificate_credentials_t
-                                              res,
-                                              gnutls_rsa_params_t rsa_params);
   void gnutls_certificate_set_verify_flags (gnutls_certificate_credentials_t
                                             res, unsigned int flags);
   void gnutls_certificate_set_verify_limits (gnutls_certificate_credentials_t
@@ -1215,33 +1210,6 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
   int gnutls_dh_params_cpy (gnutls_dh_params_t dst, gnutls_dh_params_t src);
 
 
-/* RSA params 
- */
-  int gnutls_rsa_params_init (gnutls_rsa_params_t * rsa_params);
-  void gnutls_rsa_params_deinit (gnutls_rsa_params_t rsa_params);
-  int gnutls_rsa_params_cpy (gnutls_rsa_params_t dst,
-                             gnutls_rsa_params_t src);
-  int gnutls_rsa_params_import_raw (gnutls_rsa_params_t rsa_params,
-                                    const gnutls_datum_t * m,
-                                    const gnutls_datum_t * e,
-                                    const gnutls_datum_t * d,
-                                    const gnutls_datum_t * p,
-                                    const gnutls_datum_t * q,
-                                    const gnutls_datum_t * u);
-  int gnutls_rsa_params_generate2 (gnutls_rsa_params_t params,
-                                   unsigned int bits);
-  int gnutls_rsa_params_export_raw (gnutls_rsa_params_t rsa,
-                                    gnutls_datum_t * m, gnutls_datum_t * e,
-                                    gnutls_datum_t * d, gnutls_datum_t * p,
-                                    gnutls_datum_t * q, gnutls_datum_t * u,
-                                    unsigned int *bits);
-  int gnutls_rsa_params_export_pkcs1 (gnutls_rsa_params_t params,
-                                      gnutls_x509_crt_fmt_t format,
-                                      unsigned char *params_data,
-                                      size_t * params_data_size);
-  int gnutls_rsa_params_import_pkcs1 (gnutls_rsa_params_t params,
-                                      const gnutls_datum_t * pkcs1_params,
-                                      gnutls_x509_crt_fmt_t format);
 
 /* Session stuff
  */
@@ -1554,12 +1522,6 @@ gnutls_ecc_curve_t gnutls_ecc_curve_get(gnutls_session_t session);
   int gnutls_dh_get_pubkey (gnutls_session_t session,
                             gnutls_datum_t * raw_key);
 
-  /* RSA */
-  int gnutls_rsa_export_get_pubkey (gnutls_session_t session,
-                                    gnutls_datum_t * exponent,
-                                    gnutls_datum_t * modulus);
-  int gnutls_rsa_export_get_modulus_bits (gnutls_session_t session);
-
   /* X509PKI */