From ec2895e4a0e935259e091baa2a2a6830c2cfebbb Mon Sep 17 00:00:00 2001 From: Maciej Laskowski Date: Mon, 17 Jun 2024 13:23:29 +0200 Subject: [PATCH 1/7] Added fingerprints for Cisco IOS XE and Cisco IOS XR --- xml/snmp_sysdescr.xml | 26 +++++++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml index fdb5b5a0..53e3f5c1 100644 --- a/xml/snmp_sysdescr.xml +++ b/xml/snmp_sysdescr.xml @@ -1861,6 +1861,30 @@ Copyright (c) 1995-2005 by Cisco Systems + + Cisco IOS XR Software + Cisco IOS XR Software (Cisco IOS XRv Series), Version 4.3.2[Default] + Cisco IOS XR Software (ASR9K), Version 7.4.1 Copyright (c) 2013-2021 by Cisco Systems, Inc. + + + + + + + + + + Cisco IOS XE Software + Cisco IOS Software [Everest], Virtual XE Software (X86_64_LINUX_IOSD-UNIVERSALK9-M), Version 16.6.8, RELEASE SOFTWARE (fc3) + Cisco IOS Software, IOS-XE Software (PPC_LINUX_IOSD-ADVENTERPRISEK9-M), Version 15.1(3)S2, RELEASE SOFTWARE (fc1) + + + + + + + + @@ -7637,4 +7661,4 @@ Copyright (c) 1995-2005 by Cisco Systems - \ No newline at end of file + From 9e8e0810e53ddacc485796d6be0bdcc6b4ae1258 Mon Sep 17 00:00:00 2001 From: Maciej Laskowski Date: Mon, 17 Jun 2024 13:46:32 +0200 Subject: [PATCH 2/7] recog_standardize ran --- identifiers/os_product.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/identifiers/os_product.txt b/identifiers/os_product.txt index d65e0532..cbb66729 100644 --- a/identifiers/os_product.txt +++ b/identifiers/os_product.txt @@ -117,6 +117,8 @@ IDP ILOM IMC IOS +IOS-XE +IOS-XR IPReach IPSO IPVPN Firmware From 66ffda11247cc8129e3511b04f8b5c6d5d72923e Mon Sep 17 00:00:00 2001 From: Maciej Laskowski Date: Mon, 17 Jun 2024 13:58:20 +0200 Subject: [PATCH 3/7] XE fingerprint pattern adjustment v1: Matched regex #121 ((?-mix:^Cisco (?:Internetwork Operating System|IOS) Software,? (?:\r|\n|.)+Version\s+([^,]+),)) rather than #133 ((?-mix:^Cisco IOS Software.*(?:Virtual XE|IOS-XE) Software.*Version ([\w.()]*))) --- xml/snmp_sysdescr.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml index 53e3f5c1..49fc3071 100644 --- a/xml/snmp_sysdescr.xml +++ b/xml/snmp_sysdescr.xml @@ -1873,7 +1873,7 @@ Copyright (c) 1995-2005 by Cisco Systems - + Cisco IOS XE Software Cisco IOS Software [Everest], Virtual XE Software (X86_64_LINUX_IOSD-UNIVERSALK9-M), Version 16.6.8, RELEASE SOFTWARE (fc3) Cisco IOS Software, IOS-XE Software (PPC_LINUX_IOSD-ADVENTERPRISEK9-M), Version 15.1(3)S2, RELEASE SOFTWARE (fc1) From 58dacc886974480b2c404c8d4924d0029712e82f Mon Sep 17 00:00:00 2001 From: Maciej Laskowski Date: Mon, 17 Jun 2024 14:02:34 +0200 Subject: [PATCH 4/7] Revert "XE fingerprint pattern adjustment v1:" This reverts commit 66ffda11247cc8129e3511b04f8b5c6d5d72923e. --- xml/snmp_sysdescr.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml index 49fc3071..53e3f5c1 100644 --- a/xml/snmp_sysdescr.xml +++ b/xml/snmp_sysdescr.xml @@ -1873,7 +1873,7 @@ Copyright (c) 1995-2005 by Cisco Systems - + Cisco IOS XE Software Cisco IOS Software [Everest], Virtual XE Software (X86_64_LINUX_IOSD-UNIVERSALK9-M), Version 16.6.8, RELEASE SOFTWARE (fc3) Cisco IOS Software, IOS-XE Software (PPC_LINUX_IOSD-ADVENTERPRISEK9-M), Version 15.1(3)S2, RELEASE SOFTWARE (fc1) From 62d3852dc876d5e27b7345a5621c5a9889a77618 Mon Sep 17 00:00:00 2001 From: Maciej Laskowski Date: Mon, 17 Jun 2024 14:03:52 +0200 Subject: [PATCH 5/7] Moved XR and XE fingerprints above IOS --- xml/snmp_sysdescr.xml | 47 ++++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 23 deletions(-) diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml index 53e3f5c1..854ad362 100644 --- a/xml/snmp_sysdescr.xml +++ b/xml/snmp_sysdescr.xml @@ -1677,6 +1677,30 @@ Copyright (c) 1999-2004 by cisco Systems, Inc. + + Cisco IOS XR Software + Cisco IOS XR Software (Cisco IOS XRv Series), Version 4.3.2[Default] + Cisco IOS XR Software (ASR9K), Version 7.4.1 Copyright (c) 2013-2021 by Cisco Systems, Inc. + + + + + + + + + + Cisco IOS XE Software + Cisco IOS Software [Everest], Virtual XE Software (X86_64_LINUX_IOSD-UNIVERSALK9-M), Version 16.6.8, RELEASE SOFTWARE (fc3) + Cisco IOS Software, IOS-XE Software (PPC_LINUX_IOSD-ADVENTERPRISEK9-M), Version 15.1(3)S2, RELEASE SOFTWARE (fc1) + + + + + + + + Cisco IOS @@ -1861,29 +1885,6 @@ Copyright (c) 1995-2005 by Cisco Systems - - Cisco IOS XR Software - Cisco IOS XR Software (Cisco IOS XRv Series), Version 4.3.2[Default] - Cisco IOS XR Software (ASR9K), Version 7.4.1 Copyright (c) 2013-2021 by Cisco Systems, Inc. - - - - - - - - - - Cisco IOS XE Software - Cisco IOS Software [Everest], Virtual XE Software (X86_64_LINUX_IOSD-UNIVERSALK9-M), Version 16.6.8, RELEASE SOFTWARE (fc3) - Cisco IOS Software, IOS-XE Software (PPC_LINUX_IOSD-ADVENTERPRISEK9-M), Version 15.1(3)S2, RELEASE SOFTWARE (fc1) - - - - - - - @@ -7662,4 +7661,4 @@ Copyright (c) 1995-2005 by Cisco Systems - + \ No newline at end of file From e0deeeea61e036e04c61615a1b8d08707d36ae6c Mon Sep 17 00:00:00 2001 From: Maciej Laskowski Date: Mon, 17 Jun 2024 14:50:38 +0200 Subject: [PATCH 7/7] Raised certainty to be higher than Cisco IOS. --- xml/snmp_sysdescr.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xml/snmp_sysdescr.xml b/xml/snmp_sysdescr.xml index a468a3ee..9e569b4f 100644 --- a/xml/snmp_sysdescr.xml +++ b/xml/snmp_sysdescr.xml @@ -1681,7 +1681,7 @@ Copyright (c) 1999-2004 by cisco Systems, Inc. Cisco IOS XR Software Cisco IOS XR Software (Cisco IOS XRv Series), Version 4.3.2[Default] Cisco IOS XR Software (ASR9K), Version 7.4.1 Copyright (c) 2013-2021 by Cisco Systems, Inc. - + @@ -1693,7 +1693,7 @@ Copyright (c) 1999-2004 by cisco Systems, Inc. Cisco IOS XE Software Cisco IOS Software [Everest], Virtual XE Software (X86_64_LINUX_IOSD-UNIVERSALK9-M), Version 16.6.8, RELEASE SOFTWARE (fc3) Cisco IOS Software, IOS-XE Software (PPC_LINUX_IOSD-ADVENTERPRISEK9-M), Version 15.1(3)S2, RELEASE SOFTWARE (fc1) - +