From b02363b1aa55ef07a99bf28373b7fa9b7f6dd84b Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Tue, 27 Dec 2011 11:25:40 +0000
Subject: [PATCH] minor update

---
 lib/core/dump.py  | 6 +++++-
 lib/core/enums.py | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/core/dump.py b/lib/core/dump.py
index 2aba175ee..2acba52b0 100644
--- a/lib/core/dump.py
+++ b/lib/core/dump.py
@@ -24,6 +24,7 @@ from lib.core.data import conf
 from lib.core.data import kb
 from lib.core.data import logger
 from lib.core.enums import DBMS
+from lib.core.exception import sqlmapValueException
 from lib.core.replication import Replication
 from lib.core.settings import TRIM_STDOUT_DUMP_SIZE
 from lib.core.settings import UNICODE_ENCODING
@@ -450,7 +451,10 @@ class Dump:
                     field += 1
 
             if conf.replicate:
-                rtable.insert(values)
+                try:
+                    rtable.insert(values)
+                except sqlmapValueException:
+                    pass
 
             self.__write("|", console=console)
 
diff --git a/lib/core/enums.py b/lib/core/enums.py
index b97e1af4d..88b7d4d67 100644
--- a/lib/core/enums.py
+++ b/lib/core/enums.py
@@ -70,7 +70,7 @@ class REFLECTIVE_COUNTER:
 
 class HASH:
     MYSQL = r'(?i)\A\*[0-9a-f]{40}\Z'
-    MYSQL_OLD = r'(?i)\A[0-9a-f]{16}\Z'
+    MYSQL_OLD = r'(?i)\A(?![0-9]{16})[0-9a-f]{16}\Z'
     POSTGRES = r'(?i)\Amd5[0-9a-f]{32}\Z'
     MSSQL = r'(?i)\A0x0100[0-9a-f]{8}[0-9a-f]{40}\Z'
     MSSQL_OLD = r'(?i)\A0x0100[0-9a-f]{8}[0-9a-f]{80}\Z'
@@ -78,7 +78,7 @@ class HASH:
     ORACLE_OLD = r'(?i)\A[01-9a-f]{16}\Z'
     MD5_GENERIC = r'(?i)\A[0-9a-f]{32}\Z'
     SHA1_GENERIC = r'(?i)\A[0-9a-f]{40}\Z'
-    CRYPT_GENERIC = r'(?i)\A[./0-9A-Za-z]{13}\Z'
+    CRYPT_GENERIC = r'(?i)\A(?![0-9]{13})[./0-9A-Za-z]{13}\Z'
     WORDPRESS = r'(?i)\A\$P\$[./0-9A-Za-z]{31}\Z'
 
 # Reference: http://www.zytrax.com/tech/web/mobile_ids.html