@@ -188,11 +188,6 @@ Default: disabled

 This option enables downloading of bytecode.cvd, which includes additional detection mechanisms and improvements to the ClamAV engine.

 .br

 Default: enabled

-.TP

-\fEnhancedSigs BOOL\fR

-The enhanced signatures cvd contains certificate, file size wildcard hashing, and sha1 and sha256 signatures. If this option is enabled, retrieve the file enhanced.cvd. If disabled, attempt to remove enhanced.cvd from the database directory.

-.br

-Default: enabled

 .SH "FILES"

 .LP 

 @CFGDIR@/freshclam.conf

@@ -225,13 +225,6 @@ DatabaseMirror database.clamav.net

 # Default: enabled

 #Bytecode yes

-# The enhanced signatures cvd contains certificate, file size wildcard hashing, 

-# and sha1 and sha256 hash signatures. If this option is enabled, retrieve the

-# file enhanced.cvd. If disabled, attempt to remove enhanced.cvd from the 

-# database directory.

-# Default: enabled

-#EnhancedSigs yes

-

 # Download an additional 3rd party signature database distributed through

 # the ClamAV mirrors. Here you can find a list of available databases:

 # http://www.clamav.net/download/cvd/3rdparty

@@ -126,10 +126,6 @@ textrecordfield (const char * dbname)

     {

         return 2;

     }

-    else if (!strcmp (dbname, "enhanced"))

-    {

-        return 8;

-    }

     else if (!strcmp (dbname, "bytecode"))

     {

         return 7;

@@ -2988,39 +2984,6 @@ downloadmanager (const struct optstruct *opts, const char *hostname,

         else if (ret == 0)

             updated = 1;

-        if (optget(opts, "EnhancedSigs")->enabled) {

-            ret = updatedb("enhanced", hostname, ipaddr, &signo, opts,

-                           dnsreply, localip, outdated, &mdat, logerr, 0,

-                           attempt);

-            if (ret > 50) {

-                if (dnsreply)

-                    free (dnsreply);

-                if (newver)

-                    free (newver);

-                mirman_write ("mirrors.dat", dbdir, &mdat);

-                mirman_free (&mdat);

-                cli_rmdirs (updtmpdir);

-                return ret;

-            } else if (ret == 0) {

-                updated = 1;

-            }

-        }

-        else {

-            const char *enhanceddb = NULL;

-

-            if (!access("enhanced.cvd", R_OK))

-                enhanceddb = "enhanced.cvd";

-            else if (!access ("enhanced.cld", R_OK))

-                enhanceddb = "enhanced.cld";

-

-            if (enhanceddb) {

-                if (unlink (enhanceddb))

-                    logg ("^EnhancedSigs is disabled but can't remove old %s\n", enhanceddb);

-                else

-                    logg ("*%s removed\n", enhanceddb);

-             }

-        }

-

         if (!optget (opts, "SafeBrowsing")->enabled)

         {

             const char *safedb = NULL;

@@ -435,7 +435,6 @@ const struct clam_option __clam_options[] = {

     { "SafeBrowsing", NULL, 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_FRESHCLAM, "This option enables support for Google Safe Browsing. When activated for\nthe first time, freshclam will download a new database file (safebrowsing.cvd)\nwhich will be automatically loaded by clamd and clamscan during the next\nreload, provided that the heuristic phishing detection is turned on. This\ndatabase includes information about websites that may be phishing sites or\npossible sources of malware. When using this option, it's mandatory to run\nfreshclam at least every 30 minutes.\nFreshclam uses the ClamAV's mirror infrastructure to distribute the\ndatabase and its updates but all the contents are provided under Google's\nterms of use. See http://code.google.com/support/bin/answer.py?answer=70015\nand http://safebrowsing.clamav.net for more information.", "yes" },

-    { "EnhancedSigs", NULL, 0, TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_FRESHCLAM, "This option enables downloading of enhanced signatures including certificate, file size wildcard hashing, sha1, and sha256 signatures.", "yes" },

     { "Bytecode", NULL, 0, TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_FRESHCLAM, "This option enables downloading of bytecode.cvd, which includes additional\ndetection mechanisms and improvements to the ClamAV engine.", "yes" },

     { "DisableCertCheck", "nocerts", 0, TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Disable authenticode certificate chain verification in PE files.", "no" },