diff --git a/src/lib/writer-html.cc b/src/lib/writer-html.cc index 8984c3c3..29342386 100644 --- a/src/lib/writer-html.cc +++ b/src/lib/writer-html.cc @@ -62,7 +62,7 @@ namespace HtmlLib { .infoEvent { color:#808080; } .infoEventComment { color:#00C0C0; } .traceEvent { color: #C0C0C0; } - .newDefect { color: #00FF00; } + .newFinding { color: #00FF00; } .parseWarning { color: #FF0000; } .impFlag { color: #FF0000; font-weight: bold; } #scanProps { font-family: monospace; } @@ -128,7 +128,7 @@ std::string digTitle(const TScanProps &props) { it = props.find("diffbase-project-name"); if (NA != it) { - title += " - defects not occurring in "; + title += " - findings not occurring in "; title += it->second; } @@ -296,7 +296,7 @@ void HtmlWriterCore::writeHeaderOnce( writeScanProps(str_, props); // initialize the section for defects - HtmlLib::initSection(str_, "List of Defects"); + HtmlLib::initSection(str_, "List of Findings"); HtmlLib::initPre(str_); headerWritten_ = true; @@ -399,11 +399,11 @@ void HtmlWriter::setDiffBase( : it->second; if (projName.empty()) { - d->newDefMsg = "newly introduced defect"; + d->newDefMsg = "newly introduced finding"; return; } - d->newDefMsg += "defect not occurring in "; + d->newDefMsg += "finding not occurring in "; d->newDefMsg += projName; d->newDefMsg += ""; } @@ -462,7 +462,7 @@ void HtmlWriter::Private::writeNewDefWarning(const Defect &def) return; // a newly introduced defect - this->str << " [warning: " + this->str << " [warning: " << this->newDefMsg << "]"; } diff --git a/tests/cshtml/0001-smoke/scan-results.html b/tests/cshtml/0001-smoke/scan-results.html index d0870c18..29033a2d 100644 --- a/tests/cshtml/0001-smoke/scan-results.html +++ b/tests/cshtml/0001-smoke/scan-results.html @@ -10,7 +10,7 @@ .infoEvent { color:#808080; } .infoEventComment { color:#00C0C0; } .traceEvent { color: #C0C0C0; } - .newDefect { color: #00FF00; } + .newFinding { color: #00FF00; } .parseWarning { color: #FF0000; } .impFlag { color: #FF0000; font-weight: bold; } #scanProps { font-family: monospace; } @@ -21,7 +21,7 @@

curl-7.60.0-1.el8+7

[Show plain-text results] -

List of Defects

+

List of Findings

 Error: SHELLCHECK_WARNING: [#def1]
 /usr/bin/curl-config:25:1: warning[SC2034]: exec_prefix appears unused. Verify it or export it.
@@ -79,7 +79,7 @@ 
List of Defects

 # 1373|   
 # 1374|     if(data->set.fopensocket) {
 
-Error: CPPCHECK_WARNING (CWE-456): [#def7] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CPPCHECK_WARNING (CWE-456): [#def7] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/curl_ntlm_core.c:414: error[uninitvar]: Uninitialized variable: ks
 #  412|     DES_key_schedule ks;
 #  413|   
@@ -98,7 +98,7 @@ 
List of Defects

 #  482|   
 #  483|     {
 
-Error: CPPCHECK_WARNING (CWE-456): [#def9] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CPPCHECK_WARNING (CWE-456): [#def9] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/curl_ntlm_core.c:489: error[uninitvar]: Uninitialized variable: ks
 #  487|       DES_key_schedule ks;
 #  488|   
@@ -106,7 +106,7 @@ 
List of Defects

 #  490|       DES_ecb_encrypt((DES_cblock *)magic, (DES_cblock *)lmbuffer,
 #  491|                       DESKEY(ks), DES_ENCRYPT);
 
-Error: DEADCODE (CWE-561): [#def10] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def10] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/curl_ntlm_core.c:571: assignment: Assigning: "result" = "((void)data) , CURLE_OK".
 curl-7.60.0/lib/curl_ntlm_core.c:572: const: At condition "result", the value of "result" must be equal to 0.
 curl-7.60.0/lib/curl_ntlm_core.c:572: dead_error_condition: The condition "result" cannot be true.
@@ -117,7 +117,7 @@ 
List of Defects

 #  574|   
 #  575|     {
 
-Error: TAINTED_STRING (CWE-20): [#def11] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: TAINTED_STRING (CWE-20): [#def11] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/curl_ntlm_wb.c:129: cond_false: Condition "conn->ntlm_auth_hlpr_socket != -1", taking false branch.
 curl-7.60.0/lib/curl_ntlm_wb.c:129: cond_false: Condition "conn->ntlm_auth_hlpr_pid", taking false branch.
 curl-7.60.0/lib/curl_ntlm_wb.c:131: if_end: End of if statement.
@@ -156,7 +156,7 @@ 
List of Defects

 #  221|               "--helper-protocol", "ntlmssp-client-1",
 #  222|               "--use-cached-creds",
 
-Error: TAINTED_STRING (CWE-20): [#def12] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: TAINTED_STRING (CWE-20): [#def12] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/curl_ntlm_wb.c:129: cond_false: Condition "conn->ntlm_auth_hlpr_socket != -1", taking false branch.
 curl-7.60.0/lib/curl_ntlm_wb.c:129: cond_false: Condition "conn->ntlm_auth_hlpr_pid", taking false branch.
 curl-7.60.0/lib/curl_ntlm_wb.c:131: if_end: End of if statement.
@@ -258,16 +258,16 @@ 
List of Defects

 #  228|               "--helper-protocol", "ntlmssp-client-1",
 #  229|               "--use-cached-creds",
 
-Error: CLANG_WARNING: [#def15] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CLANG_WARNING: [#def15] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/formdata.c: internal warning: child 19175 timed out after 30s
 
-Error: CLANG_WARNING: [#def16] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CLANG_WARNING: [#def16] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/formdata.c: internal warning: child 31044 timed out after 30s
 
-Error: CLANG_WARNING: [#def17] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CLANG_WARNING: [#def17] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/ftp.c: internal warning: child 31022 timed out after 30s
 
-Error: DEADCODE (CWE-561): [#def18] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def18] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/ftp.c:3975: assignment: Assigning: "result" = "((void)conn->data) , CURLE_OK".
 curl-7.60.0/lib/ftp.c:3977: const: At condition "result", the value of "result" must be equal to 0.
 curl-7.60.0/lib/ftp.c:3977: dead_error_condition: The condition "result" cannot be true.
@@ -278,7 +278,7 @@ 
List of Defects

 # 3979|   
 # 3980|     for(;;) {
 
-Error: CONSTANT_EXPRESSION_RESULT (CWE-398): [#def19] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CONSTANT_EXPRESSION_RESULT (CWE-398): [#def19] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/getinfo.c:159: result_independent_of_operands: "data->info.filetime > 9223372036854775807L" is always false regardless of the values of its operands. This occurs as the logical operand of "if".
 #  157|       break;
 #  158|     case CURLINFO_FILETIME:
@@ -286,7 +286,7 @@ 
List of Defects

 #  160|         *param_longp = LONG_MAX;
 #  161|       else if(data->info.filetime < LONG_MIN)
 
-Error: CONSTANT_EXPRESSION_RESULT (CWE-398): [#def20] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CONSTANT_EXPRESSION_RESULT (CWE-398): [#def20] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/getinfo.c:161: result_independent_of_operands: "data->info.filetime < -9223372036854775808L /* -9223372036854775807L - 1L */" is always false regardless of the values of its operands. This occurs as the logical operand of "if".
 #  159|       if(data->info.filetime > LONG_MAX)
 #  160|         *param_longp = LONG_MAX;
@@ -294,7 +294,7 @@ 
List of Defects

 #  162|         *param_longp = LONG_MIN;
 #  163|       else
 
-Error: DEADCODE (CWE-561): [#def21] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def21] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/http.c:1086: assignment: Assigning: "result" = "((void)conn->data) , CURLE_OK".
 curl-7.60.0/lib/http.c:1088: const: At condition "result", the value of "result" must be equal to 0.
 curl-7.60.0/lib/http.c:1088: dead_error_condition: The condition "result" cannot be true.
@@ -316,7 +316,7 @@ 
List of Defects

 # 3570|   
 # 3571|       /* Check for Content-Length: header lines to get size */
 
-Error: DEADCODE (CWE-561): [#def23] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def23] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/http_chunks.c:157: assignment: Assigning: "result" = "((void)conn->data) , CURLE_OK".
 curl-7.60.0/lib/http_chunks.c:159: const: At condition "result", the value of "result" must be equal to 0.
 curl-7.60.0/lib/http_chunks.c:159: dead_error_condition: The condition "result" cannot be true.
@@ -338,7 +338,7 @@ 
List of Defects

 #  243|   
 #  244|             if(!data->set.http_te_skip) {
 
-Error: DEADCODE (CWE-561): [#def25] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def25] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/http_proxy.c:413: assignment: Assigning: "result" = "((void)data) , CURLE_OK".
 curl-7.60.0/lib/http_proxy.c:416: const: At condition "result", the value of "result" must be equal to 0.
 curl-7.60.0/lib/http_proxy.c:416: dead_error_condition: The condition "result" cannot be true.
@@ -349,7 +349,7 @@ 
List of Defects

 #  418|   
 #  419|           /* output debug if that is requested */
 
-Error: CLANG_WARNING: [#def26] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CLANG_WARNING: [#def26] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/multi.c: internal warning: child 32119 timed out after 30s
 
 Error: FORWARD_NULL (CWE-476): [#def27]
@@ -698,7 +698,7 @@ 
List of Defects

 # 1057|       ufds[nfds].events = 0;
 # 1058|       if(extra_fds[i].events & CURL_WAIT_POLLIN)
 
-Error: DEADCODE (CWE-561): [#def30] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def30] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/sendf.c:441: assignment: Assigning: "nread" = "0L".
 curl-7.60.0/lib/sendf.c:442: const: At condition "nread > 0L", the value of "nread" must be equal to 0.
 curl-7.60.0/lib/sendf.c:442: dead_error_condition: The condition "nread > 0L" cannot be true.
@@ -709,7 +709,7 @@ 
List of Defects

 #  444|       return nread;
 #  445|     }
 
-Error: DEADCODE (CWE-561): [#def31] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def31] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/sendf.c:657: assignment: Assigning: "result" = "((void)data) , CURLE_OK".
 curl-7.60.0/lib/sendf.c:659: const: At condition "result", the value of "result" must be equal to 0.
 curl-7.60.0/lib/sendf.c:659: dead_error_condition: The condition "result" cannot be true.
@@ -720,7 +720,7 @@ 
List of Defects

 #  661|   
 #  662|   #ifdef CURL_DO_LINEEND_CONV
 
-Error: DEADCODE (CWE-561): [#def32] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def32] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/smb.c:734: assignment: Assigning: "next_state" = "SMB_DONE".
 curl-7.60.0/lib/smb.c:773: assignment: Assigning: "next_state" = "SMB_OPEN".
 curl-7.60.0/lib/smb.c:779: assignment: Assigning: "next_state" = "SMB_TREE_DISCONNECT".
@@ -768,7 +768,7 @@ 
List of Defects

 #   90|           gss_release_buffer(&min_stat, &status_string);
 #   91|           break;
 
-Error: CLANG_WARNING: [#def35] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CLANG_WARNING: [#def35] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/ssh-libssh.c:1116:15: warning: Null pointer passed as an argument to a 'nonnull' parameter
 #             (strlen(protop->path) > 1))) {
 #              ^      ~~~~~~~~~~~~
@@ -918,7 +918,7 @@ 
List of Defects

 # 1117|                  /* try to create the path remotely */
 # 1118|                  rc = 0;
 
-Error: CLANG_WARNING: [#def36] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CLANG_WARNING: [#def36] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/ssh-libssh.c:1208:10: warning: Null pointer passed as an argument to a 'nonnull' parameter
 #      if(strlen(protop->path) > 1) {
 #         ^      ~~~~~~~~~~~~
@@ -1037,7 +1037,7 @@ 
List of Defects

 # 1209|           sshc->slash_pos = protop->path + 1; /* ignore the leading '/' */
 # 1210|           state(conn, SSH_SFTP_CREATE_DIRS);
 
-Error: FORWARD_NULL (CWE-476): [#def37] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: FORWARD_NULL (CWE-476): [#def37] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/src/tool_getparam.c:2140: cond_true: Condition "i < argc", taking true branch.
 curl-7.60.0/src/tool_getparam.c:2140: cond_true: Condition "!result", taking true branch.
 curl-7.60.0/src/tool_getparam.c:2143: cond_true: Condition "stillflags", taking true branch.
@@ -1188,7 +1188,7 @@ 
List of Defects

 # 1159|                                        (const char *)state->rpacket.data + 2,
 # 1160|                                        state->rbytes-2);
 
-Error: NEGATIVE_RETURNS (CWE-394): [#def39] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: NEGATIVE_RETURNS (CWE-394): [#def39] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/transfer.c:131: cond_true: Condition "data->req.upload_chunky", taking true branch.
 curl-7.60.0/lib/transfer.c:144: cond_false: Condition "nread == 268435456", taking false branch.
 curl-7.60.0/lib/transfer.c:148: if_end: End of if statement.
@@ -1217,13 +1217,13 @@ 
List of Defects

 #  220|   
 #  221|       /* always append ASCII CRLF to the data */
 
-Error: CLANG_WARNING: [#def40] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CLANG_WARNING: [#def40] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/url.c: internal warning: child 19172 timed out after 30s
 
-Error: CLANG_WARNING: [#def41] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: CLANG_WARNING: [#def41] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/url.c: internal warning: child 31100 timed out after 30s
 
-Error: NEGATIVE_RETURNS (CWE-394): [#def42] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: NEGATIVE_RETURNS (CWE-394): [#def42] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/vauth/ntlm.c:541: cond_true: Condition "!user", taking true branch.
 curl-7.60.0/lib/vauth/ntlm.c:544: cond_false: Condition "user", taking false branch.
 curl-7.60.0/lib/vauth/ntlm.c:550: else_branch: Reached else branch.
@@ -1266,7 +1266,7 @@ 
List of Defects

 #  811|     else
 #  812|       memcpy(&ntlmbuf[size], domain, domlen);
 
-Error: DEADCODE (CWE-561): [#def43] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def43] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/vauth/ntlm.c:833: assignment: Assigning: "result" = "((void)data) , CURLE_OK".
 curl-7.60.0/lib/vauth/ntlm.c:835: const: At condition "result", the value of "result" must be equal to 0.
 curl-7.60.0/lib/vauth/ntlm.c:835: dead_error_condition: The condition "result" cannot be true.
@@ -1277,7 +1277,7 @@ 
List of Defects

 #  837|   
 #  838|     /* Return with binary blob encoded into base64 */
 
-Error: COMPILER_WARNING: [#def44] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: COMPILER_WARNING: [#def44] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/vtls/openssl.c: scope_hint: In function 'ossl_connect_step1'
 curl-7.60.0/lib/vtls/openssl.c:2217:5: warning[-Wdeprecated-declarations]: 'SSLv3_client_method' is deprecated
 #     req_method = SSLv3_client_method();
@@ -1295,7 +1295,7 @@ 
List of Defects

 # 2218|       use_sni(FALSE);
 # 2219|       break;
 
-Error: DEADCODE (CWE-561): [#def45] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def45] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/vtls/openssl.c:2214: cond_cannot_single: Condition "ssl_authtype == CURL_TLSAUTH_SRP", taking false branch. Now the value of "ssl_authtype" cannot be equal to 1.
 curl-7.60.0/lib/vtls/openssl.c:2309: cannot_single: At condition "ssl_authtype == CURL_TLSAUTH_SRP", the value of "ssl_authtype" cannot be equal to 1.
 curl-7.60.0/lib/vtls/openssl.c:2309: dead_error_condition: The condition "ssl_authtype == CURL_TLSAUTH_SRP" cannot be true.
@@ -1306,7 +1306,7 @@ 
List of Defects

 # 2311|       }
 # 2312|   #endif
 
-Error: DEADCODE (CWE-561): [#def46] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def46] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/vtls/openssl.c:2181: equality_cond: Jumping to case "CURL_SSLVERSION_DEFAULT".
 curl-7.60.0/lib/vtls/openssl.c:2182: equality_cond: Jumping to case "CURL_SSLVERSION_TLSv1".
 curl-7.60.0/lib/vtls/openssl.c:2183: equality_cond: Jumping to case "CURL_SSLVERSION_TLSv1_0".
@@ -1323,7 +1323,7 @@ 
List of Defects

 # 2340|   #ifndef OPENSSL_NO_SSL2
 # 2341|       ctx_options |= SSL_OP_NO_SSLv3;
 
-Error: DEADCODE (CWE-561): [#def47] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: DEADCODE (CWE-561): [#def47] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/lib/vtls/openssl.c:2181: equality_cond: Jumping to case "CURL_SSLVERSION_DEFAULT".
 curl-7.60.0/lib/vtls/openssl.c:2182: equality_cond: Jumping to case "CURL_SSLVERSION_TLSv1".
 curl-7.60.0/lib/vtls/openssl.c:2183: equality_cond: Jumping to case "CURL_SSLVERSION_TLSv1_0".
@@ -1359,7 +1359,7 @@ 
List of Defects

 #  144|             show_dir_errno(errors, dirbuildup);
 #  145|             result = CURLE_WRITE_ERROR;
 
-Error: COPY_PASTE_ERROR (CWE-398): [#def49] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: COPY_PASTE_ERROR (CWE-398): [#def49] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/tests/python_dependencies/impacket/ntlm.py:595: original: "user.decode" looks like the original copy.
 curl-7.60.0/tests/python_dependencies/impacket/ntlm.py:603: copy_paste_error: "user" in "user.decode" looks like a copy-paste error.
 curl-7.60.0/tests/python_dependencies/impacket/ntlm.py:603: remediation: Should it say "domain" instead?
@@ -1369,7 +1369,7 @@ 
List of Defects

 #  604|   
 #  605|       ntlmChallenge = NTLMAuthChallenge(type2)
 
-Error: FORWARD_NULL (CWE-476): [#def50] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: FORWARD_NULL (CWE-476): [#def50] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/tests/python_dependencies/impacket/smb.py:3504: assign_undefined: Assigning: "readAndX" = "undefined".
 curl-7.60.0/tests/python_dependencies/impacket/smb.py:3504: cond_true: Condition "!max_size", taking true branch.
 curl-7.60.0/tests/python_dependencies/impacket/smb.py:3505: cond_true: Condition "self._dialects_parameters["Capabilities"] & SMB.CAP_LARGE_READX", taking true branch.
@@ -1391,7 +1391,7 @@ 
List of Defects

 # 3543|           else:
 # 3544|               self.sendSMB(smb)
 
-Error: IDENTICAL_BRANCHES: [#def51] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: IDENTICAL_BRANCHES: [#def51] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/tests/python_dependencies/impacket/smb.py:3775: identical_branches: Ternary expression on condition "self.__flags2 & SMB.FLAGS2_UNICODE" has identical then and else expressions: """". Should one of the expressions be modified, or the entire ternary expression replaced?
 # 3773|               findFirstParameter['InformationLevel'] = SMB_FIND_FILE_BOTH_DIRECTORY_INFO
 # 3774|               findFirstParameter['SearchStorageType'] = 0
@@ -1399,7 +1399,7 @@ 
List of Defects

 # 3776|               self.send_trans2(tid, SMB.TRANS2_FIND_FIRST2, '\x00', findFirstParameter, '')
 # 3777|               files = [ ]
 
-Error: IDENTICAL_BRANCHES: [#def52] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: IDENTICAL_BRANCHES: [#def52] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/tests/python_dependencies/impacket/smb.py:3818: identical_branches: Ternary expression on condition "self.__flags2 & SMB.FLAGS2_UNICODE" has identical then and else expressions: """". Should one of the expressions be modified, or the entire ternary expression replaced?
 # 3816|                           findNextParameter['ResumeKey'] = 0
 # 3817|                           findNextParameter['Flags'] = SMB_FIND_RETURN_RESUME_KEYS | SMB_FIND_CLOSE_AT_EOS
@@ -1407,7 +1407,7 @@ 
List of Defects

 # 3819|                           self.send_trans2(tid, SMB.TRANS2_FIND_NEXT2, '\x00', findNextParameter, '')
 # 3820|                           findData = ''
 
-Error: FORWARD_NULL (CWE-476): [#def53] [warning: defect not occurring in curl-7.29.0-46.el7]
+Error: FORWARD_NULL (CWE-476): [#def53] [warning: finding not occurring in curl-7.29.0-46.el7]
 curl-7.60.0/tests/python_dependencies/impacket/smbserver.py:2066: assign_undefined: Assigning: "mode" = "undefined".
 curl-7.60.0/tests/python_dependencies/impacket/smbserver.py:2077: cond_false: Condition "connData["ConnectedShares"].has_key(recvPacket["Tid"])", taking false branch.
 curl-7.60.0/tests/python_dependencies/impacket/smbserver.py:2085: else_branch: Reached else branch.
diff --git a/tests/cshtml/0002-cwe-names/scan-results.html b/tests/cshtml/0002-cwe-names/scan-results.html
index ce33e69a..33936cf1 100644
--- a/tests/cshtml/0002-cwe-names/scan-results.html
+++ b/tests/cshtml/0002-cwe-names/scan-results.html
@@ -10,7 +10,7 @@
         .infoEvent { color:#808080; }
         .infoEventComment { color:#00C0C0; }
         .traceEvent { color: #C0C0C0; }
-        .newDefect { color: #00FF00; }
+        .newFinding { color: #00FF00; }
         .parseWarning { color: #FF0000; }
         .impFlag { color: #FF0000; font-weight: bold; }
         #scanProps { font-family: monospace; }
@@ -20,7 +20,7 @@
 
 
 
curl-7.60.0-1.el8+7

-
List of Defects

+
List of Findings

 
 Error: SHELLCHECK_WARNING: [#def1]
 /usr/bin/curl-config:25:1: warning[SC2034]: exec_prefix appears unused. Verify it or export it.