1
0
mirror of https://github.com/nmap/nmap.git synced 2026-01-18 20:29:02 +00:00

Change CPE from cpe:/o:linux:kernel to cpe:/o:linux:linux_kernel.

This reflects a deprecation in the official CPE dictionary, which seems
to have happened on 2012-03-08.

  <cpe-item deprecation_date="2012-03-08T20:00:15.120Z" deprecated_by="cpe:/o:linux:linux_kernel:2.6.0" deprecated="true" name="cpe:/o:linux:kernel:2.6.0">
    <title xml:lang="en-US">Linux Kernel 2.6.0</title>
    <meta:item-metadata modification-date="2012-03-08T20:00:15.120Z" status="DRAFT" deprecated-by-nvd-id="35565" nvd-id="91585" />
  </cpe-item>
This commit is contained in:
david
2012-10-11 06:46:28 +00:00
parent 53b4fdcf0a
commit cd90838c2e
6 changed files with 938 additions and 934 deletions

View File

@@ -1,5 +1,9 @@
# Nmap Changelog ($Id$); -*-text-*-
o Changed the CPE for Linux from cpe:/o:linux:kernel to
cpe:/o:linux:linux_kernel to reflect deprecation in the official CPE
dictionary.
o Fixed a bug that caused an incorrect source address to be set when
scanning certain addresses (apparently those ending in .0) on
Windows XP. The symptom of this bug was the messages

View File

@@ -2248,12 +2248,12 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Linux 2.6.38 - 3.2.0";
{
OS_Classification osclass = {"Linux", "Linux", "2.6.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6");
match.OS_class.push_back(osclass);
}
{
OS_Classification osclass = {"Linux", "Linux", "3.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:3");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:3");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2264,7 +2264,7 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Linux 2.6.39";
{
OS_Classification osclass = {"Linux", "Linux", "2.6.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6.39");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6.39");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2308,7 +2308,7 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Vyatta Core 6.3 (Linux 2.6.37)";
{
OS_Classification osclass = {"Vyatta", "Linux", "2.6.X", "router"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6.37");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6.37");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2330,7 +2330,7 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Linux 2.6.11 - 2.6.15";
{
OS_Classification osclass = {"Linux", "Linux", "2.6.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2385,7 +2385,7 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Linux 2.4.21";
{
OS_Classification osclass = {"Linux", "Linux", "2.4.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.4.21");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.4.21");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2460,7 +2460,7 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "OpenWrt (Linux 2.6.32)";
{
OS_Classification osclass = {"Linux", "Linux", "2.6.X", "broadband router"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6.32");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6.32");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2604,7 +2604,7 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Linux 2.6.23 - 2.6.33 (embedded)";
{
OS_Classification osclass = {"Linux", "Linux", "2.6.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2616,7 +2616,7 @@ std::vector<FingerMatch> load_fp_matches() {
{
OS_Classification osclass = {"Thecus", "Linux", "2.6.X", "storage-misc"};
osclass.cpe.push_back("cpe:/h:thecus:n4100pro");
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6.33");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6.33");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2752,7 +2752,7 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Linux 2.6.18 - 2.6.34";
{
OS_Classification osclass = {"Linux", "Linux", "2.6.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2763,7 +2763,7 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Linux 2.6.23 - 2.6.32";
{
OS_Classification osclass = {"Linux", "Linux", "2.6.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2829,7 +2829,7 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Linux 2.6.32 - 2.6.36";
{
OS_Classification osclass = {"Linux", "Linux", "2.6.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2840,12 +2840,12 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Linux 2.6.16 - 3.2.0";
{
OS_Classification osclass = {"Linux", "Linux", "2.6.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6");
match.OS_class.push_back(osclass);
}
{
OS_Classification osclass = {"Linux", "Linux", "3.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:3");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:3");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2856,12 +2856,12 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Linux 2.6.32 - 3.2.0";
{
OS_Classification osclass = {"Linux", "Linux", "2.6.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6");
match.OS_class.push_back(osclass);
}
{
OS_Classification osclass = {"Linux", "Linux", "3.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:3");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:3");
match.OS_class.push_back(osclass);
}
matches.push_back(match);
@@ -2872,12 +2872,12 @@ std::vector<FingerMatch> load_fp_matches() {
match.OS_name = (char *) "Linux 2.6.32 - 3.0.0";
{
OS_Classification osclass = {"Linux", "Linux", "2.6.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:2.6");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:2.6");
match.OS_class.push_back(osclass);
}
{
OS_Classification osclass = {"Linux", "Linux", "3.X", "general purpose"};
osclass.cpe.push_back("cpe:/o:linux:kernel:3");
osclass.cpe.push_back("cpe:/o:linux:linux_kernel:3");
match.OS_class.push_back(osclass);
}
matches.push_back(match);

View File

@@ -113,7 +113,7 @@ PORT STATE SERVICE VERSION
9929/tcp open nping-echo Nping echo
Device type: general purpose
Running: Linux 2.6.X
OS CPE: cpe:/o:linux:kernel:2.6.39
OS CPE: cpe:/o:linux:linux_kernel:2.6.39
OS details: Linux 2.6.39
Network Distance: 11 hops
Service Info: OS: Linux; CPE: cpe:/o:linux:kernel
@@ -2065,7 +2065,7 @@ way.</para>
etc). Most fingerprints also have a Common Platform Enumeration
(CPE)<indexterm><primary>Common Platform Enumeration</primary><secondary>operating system</secondary></indexterm>
representation, like
<literal>cpe:/o:linux:kernel:2.6</literal>.</para>
<literal>cpe:/o:linux:linux_kernel:2.6</literal>.</para>
<para>If Nmap is unable to guess the OS of a machine, and
conditions are good (e.g. at least one open port and one closed

View File

@@ -1701,9 +1701,9 @@ host.os = {
<programlisting>
Fingerprint Linux 2.6.32 - 3.2
Class Linux | Linux | 2.6.X | general purpose
CPE cpe:/o:linux:kernel:2.6
CPE cpe:/o:linux:linux_kernel:2.6
Class Linux | Linux | 3.X | general purpose
CPE cpe:/o:linux:kernel:3
CPE cpe:/o:linux:linux_kernel:3
</programlisting>
<para>
@@ -1720,14 +1720,14 @@ host.os = {
osfamily = "Linux",
osgen = "2.6.X",
type = "general purpose",
cpe = { "cpe:/o:linux:kernel:2.6" }
cpe = { "cpe:/o:linux:linux_kernel:2.6" }
},
{
vendor = "Linux",
osfamily = "Linux",
osgen = "3.X",
type = "general purpose",
cpe = { "cpe:/o:linux:kernel:3" }
cpe = { "cpe:/o:linux:linux_kernel:3" }
}
},
}

1338
nmap-os-db

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff