minor update

stamparm · stamparm · commit b02363b1aa55 · 2011-12-27T11:25:40.000Z
diff --git a/lib/core/dump.py b/lib/core/dump.py
@@ -24,6 +24,7 @@
 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 @@ def dbTableValues(self, tableValues):
                     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
@@ -70,15 +70,15 @@ 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'
     ORACLE = r'(?i)\As:[0-9a-f]{60}\Z'
     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
