@@ -203,11 +203,6 @@ Maximum time in seconds for each download operation. 0 means no timeout.

 .br

 Default: 0

 .TP

-\fBSafeBrowsing BOOL\fR

-This option enables support for Google Safe Browsing. When activated for the first time, freshclam will download a new database file (safebrowsing.cvd) which will be automatically loaded by clamd and clamscan during the next reload, provided that the heuristic phishing detection is turned on. This database includes information about websites that may be phishing sites or possible sources of malware. When using this option, it's mandatory to run freshclam at least every 30 minutes. Freshclam uses the ClamAV's mirror infrastructure to distribute the database and its updates but all the contents are provided under Google's terms of use. See https://support.google.com/code/answer/70015 and https://www.clamav.net/documents/safebrowsing for more information.

-.br

-Default: no

-.TP

 \fBBytecode BOOL\fR

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

 .br

@@ -183,21 +183,6 @@ DatabaseMirror database.clamav.net

 # Default: yes

 #TestDatabases yes

-# This option enables support for Google Safe Browsing. When activated for

-# the first time, freshclam will download a new database file

-# (safebrowsing.cvd) which will be automatically loaded by clamd and

-# clamscan during the next reload, provided that the heuristic phishing

-# detection is turned on. This database includes information about websites

-# that may be phishing sites or possible sources of malware. When using this

-# option, it's mandatory to run freshclam at least every 30 minutes.

-# Freshclam uses the ClamAV's mirror infrastructure to distribute the

-# database and its updates but all the contents are provided under Google's

-# terms of use.

-# See https://transparencyreport.google.com/safe-browsing/overview

-# and https://www.clamav.net/documents/safebrowsing for more information.

-# Default: no

-#SafeBrowsing yes

-

 # This option enables downloading of bytecode.cvd, which includes additional

 # detection mechanisms and improvements to the ClamAV engine.

 # Default: yes

@@ -1701,16 +1701,6 @@ int main(int argc, char **argv)

             status = ret;

             goto done;

         }

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

-            if (FC_SUCCESS != (ret = string_list_add("safebrowsing", &optInList, &nOptIns))) {

-                free_string_list(optInList, nOptIns);

-                optInList = NULL;

-

-                mprintf("!Failed to add safebrowsing to list of opt-in databases.\n");

-                status = ret;

-                goto done;

-            }

-        }

         /*

          * Collect list of database opt-outs.

@@ -550,14 +550,13 @@ const struct clam_option __clam_options[] = {

     {"ReceiveTimeout", NULL, 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 0, NULL, 0, OPT_FRESHCLAM, "Maximum time in seconds for each download operation. 0 means no timeout.", "0"},

-    {"SafeBrowsing", NULL, 0, CLOPT_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 https://transparencyreport.google.com/safe-browsing/overview \n and https://www.clamav.net/documents/safebrowsing for more information.", "yes"},

-

     {"Bytecode", NULL, 0, CLOPT_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, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Disable authenticode certificate chain verification in PE files.", "no"},

     /* Deprecated options */

+    {"SafeBrowsing", NULL, 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_FRESHCLAM | OPT_DEPRECATED, "Deprecated option to download signatures derived from the Google Safe Browsing API. See https://blog.clamav.net/2020/06/the-future-of-clamav-safebrowsing.html for more details.", "no"},

     {"TimeLimit", "timelimit", 0, CLOPT_TYPE_NUMBER, MATCH_NUMBER, 0, NULL, 0, OPT_CLAMSCAN | OPT_DEPRECATED, "Deprecated option to set the max-scantime.\nThe value is in milliseconds.", "120000"},

     {"DetectBrokenExecutables", "detect-broken", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 0, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN | OPT_DEPRECATED, "Deprecated option to alert on broken PE and ELF executable files.", "no"},

     {"AlgorithmicDetection", "algorithmic-detection", 0, CLOPT_TYPE_BOOL, MATCH_BOOL, 1, NULL, 0, OPT_CLAMD | OPT_CLAMSCAN, "Deprecated option to enable heuristic alerts (e.g. \"Heuristics.<sig name>\")", "no"},

@@ -180,21 +180,6 @@ DatabaseMirror database.clamav.net

 # Default: yes

 #TestDatabases yes

-# This option enables support for Google Safe Browsing. When activated for

-# the first time, freshclam will download a new database file

-# (safebrowsing.cvd) which will be automatically loaded by clamd and

-# clamscan during the next reload, provided that the heuristic phishing

-# detection is turned on. This database includes information about websites

-# that may be phishing sites or possible sources of malware. When using this

-# option, it's mandatory to run freshclam at least every 30 minutes.

-# Freshclam uses the ClamAV's mirror infrastructure to distribute the

-# database and its updates but all the contents are provided under Google's

-# terms of use.

-# See https://transparencyreport.google.com/safe-browsing/overview

-# and https://www.clamav.net/documents/safebrowsing for more information.

-# Default: no

-#SafeBrowsing yes

-

 # This option enables downloading of bytecode.cvd, which includes additional

 # detection mechanisms and improvements to the ClamAV engine.

 # Default: yes