[Minor] Disable version 4 of hashes

diff --git a/src/fuzzy_storage.c b/src/fuzzy_storage.c
index 247653c1de1b4acb65f79bd61e626cb0ec0b9f3f..532532f16bb658bdd3a7d27ab42e985ef5813b52 100644 (file)
--- a/src/fuzzy_storage.c
+++ b/src/fuzzy_storage.c
@@ -745,18 +745,6 @@ rspamd_fuzzy_command_valid (struct rspamd_fuzzy_cmd *cmd, gint r)
        enum rspamd_fuzzy_epoch ret = RSPAMD_FUZZY_EPOCH_MAX;
 
        switch (cmd->version) {
-       case 4:
-               if (cmd->shingles_count > 0) {
-                       if (r == sizeof (struct rspamd_fuzzy_shingle_cmd)) {
-                               ret = RSPAMD_FUZZY_EPOCH11;
-                       }
-               }
-               else {
-                       if (r == sizeof (*cmd)) {
-                               ret = RSPAMD_FUZZY_EPOCH11;
-                       }
-               }
-               break;
        case 3:
                if (cmd->shingles_count > 0) {
                        if (r == sizeof (struct rspamd_fuzzy_shingle_cmd)) {

diff --git a/src/fuzzy_storage.h b/src/fuzzy_storage.h
index c23672ed89528563ecbfd9ba3885a22c71a999c9..a9c3f174b3cdd6fdbf884b613d650710b5f2eac0 100644 (file)
--- a/src/fuzzy_storage.h
+++ b/src/fuzzy_storage.h
@@ -6,7 +6,7 @@
 #include "shingles.h"
 #include "cryptobox.h"
 
-#define RSPAMD_FUZZY_VERSION 4
+#define RSPAMD_FUZZY_VERSION 3
 #define RSPAMD_FUZZY_KEYLEN 8
 
 /* Commands for fuzzy storage */
@@ -24,7 +24,6 @@ enum rspamd_fuzzy_epoch {
        RSPAMD_FUZZY_EPOCH8, /**< 0.8 till 0.9 */
        RSPAMD_FUZZY_EPOCH9, /**< 0.9 + */
        RSPAMD_FUZZY_EPOCH10, /**< 1.0+ encryption */
-       RSPAMD_FUZZY_EPOCH11, /**< 1.3+ multiple flags */
        RSPAMD_FUZZY_EPOCH_MAX
 };
 

diff --git a/src/plugins/fuzzy_check.c b/src/plugins/fuzzy_check.c
index bda4a12bc4edc54d1ce4551a5291d31d308a0cc7..1a2a9b782947371a56d7c8dac080d9146eda49ad 100644 (file)
--- a/src/plugins/fuzzy_check.c
+++ b/src/plugins/fuzzy_check.c
@@ -54,12 +54,7 @@
 #define DEFAULT_RETRANSMITS 3
 #define DEFAULT_PORT 11335
 
-/*
- * WARNING:
- * As 1.3 is not yet stable, we want to keep compatibility here as 1.2 won't
- * recognize version 4 unless 1.2.7
- */
-#define RSPAMD_FUZZY_PLUGIN_VERSION 3
+#define RSPAMD_FUZZY_PLUGIN_VERSION RSPAMD_FUZZY_VERSION
 
 static const gint rspamd_fuzzy_hash_len = 5;