Move deprecated SRP alerts to compat.h.

diff --git a/includes/gnutls/compat.h b/includes/gnutls/compat.h
index 5732abbc21cadc1d37b4e3849c1403be678b45ea..d1e46494a853a482bfe4e03c206ac863ace5bb33 100644 (file)
--- a/includes/gnutls/compat.h
+++ b/includes/gnutls/compat.h
@@ -57,4 +57,9 @@
    removed in 2.1.x. */
 #define GNUTLS_E_OPENPGP_TRUSTDB_VERSION_UNSUPPORTED GNUTLS_E_INTERNAL_ERROR
 
+/* Old SRP alerts removed in 2.1.x because the TLS-SRP RFC was
+   modified to use the PSK alert. */
+#define GNUTLS_A_MISSING_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY
+#define GNUTLS_A_UNKNOWN_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY
+
 #endif /* GCOMPAT_H */

diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in
index 34fb28bbcd3ab2a2becf05c8e5bb7fe98bfc6ddf..682c04133ac1570c68636596dd645d0a09e14bc6 100644 (file)
--- a/includes/gnutls/gnutls.h.in
+++ b/includes/gnutls/gnutls.h.in
@@ -168,9 +168,6 @@ extern "C"
     GNUTLS_AL_FATAL
   } gnutls_alert_level_t;
 
-#define GNUTLS_A_MISSING_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY
-#define GNUTLS_A_UNKNOWN_SRP_USERNAME GNUTLS_A_UNKNOWN_PSK_IDENTITY
-
   typedef enum
   {
     GNUTLS_A_CLOSE_NOTIFY,