From f5224dc0b8523868026f12d7d0842fab893002d9 Mon Sep 17 00:00:00 2001
From: sfacchini-quantavis <simone.facchini@quantavis.com>
Date: Wed, 19 Jul 2023 10:53:25 +0200
Subject: [PATCH 1/2] added osxvers=22 and model=MacBookPro18,3 fingerprints

---
 xml/mdns_device-info_txt.xml | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/xml/mdns_device-info_txt.xml b/xml/mdns_device-info_txt.xml
index 91d3a715..d7616531 100644
--- a/xml/mdns_device-info_txt.xml
+++ b/xml/mdns_device-info_txt.xml
@@ -14,6 +14,16 @@
      version of OS X plus 4. E.g. osxvers=13 means OS X 10.9
    -->
 
+  <fingerprint pattern="^osxvers=22">
+    <description>OS X 13.0 (Ventura)</description>
+    <example>osxvers=22</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <param pos="0" name="os.family" value="Mac OS X"/>
+    <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.version" value="13.0"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:13.0"/>
+  </fingerprint> 
+
   <fingerprint pattern="^osxvers=21">
     <description>OS X 12.0 (Monterey)</description>
     <example>osxvers=21</example>
@@ -258,6 +268,20 @@
 
   <!-- MacBookPro - Reference for the following: https://support.apple.com/en-us/HT201300 -->
 
+  <fingerprint pattern="^model=MacBookPro18,3$">
+    <description>Apple MacBook Pro (14-Inch, M1, 2021)</description>
+    <example>model=MacBookPro18,3</example>
+    <param pos="0" name="os.vendor" value="Apple"/>
+    <param pos="0" name="os.family" value="Mac OS X"/>
+    <param pos="0" name="os.product" value="Mac OS X"/>
+    <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
+    <param pos="0" name="hw.vendor" value="Apple"/>
+    <param pos="0" name="hw.family" value="MacBook Pro"/>
+    <param pos="0" name="hw.product" value="Apple MacBook Pro (14-Inch, M1, 2021)"/>
+    <param pos="0" name="hw.device" value="Laptop"/>
+    <param pos="0" name="hw.cpe23" value="cpe:/h:apple:macbook_pro:-"/>
+  </fingerprint>
+
   <fingerprint pattern="^model=MacBookPro17,1$">
     <description>MacBook Pro (13-inch, M1, 2020)</description>
     <example>model=MacBookPro17,1</example>

From 32ef528d77dc667bf08c35e89cfacf8c442464c7 Mon Sep 17 00:00:00 2001
From: Simone Facchini <simone.facchini@quantavis.com>
Date: Mon, 21 Aug 2023 15:48:22 +0200
Subject: [PATCH 2/2] added "MacBook Pro (14-Inch, M1, 2021)" to identifiers,
 removed "Apple" from value

---
 identifiers/hw_product.txt   | 1 +
 xml/mdns_device-info_txt.xml | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/identifiers/hw_product.txt b/identifiers/hw_product.txt
index a0a0cc49..7e3839f1 100644
--- a/identifiers/hw_product.txt
+++ b/identifiers/hw_product.txt
@@ -196,6 +196,7 @@ MacBook Pro (13-inch, Mid 2009)
 MacBook Pro (13-inch, Mid 2010)
 MacBook Pro (13-inch, Mid 2012)
 MacBook Pro (14-inch, 2021)
+MacBook Pro (14-Inch, M1, 2021)
 MacBook Pro (15-inch, 2016)
 MacBook Pro (15-inch, 2017)
 MacBook Pro (15-inch, 2018)
diff --git a/xml/mdns_device-info_txt.xml b/xml/mdns_device-info_txt.xml
index d7616531..4499b9c7 100644
--- a/xml/mdns_device-info_txt.xml
+++ b/xml/mdns_device-info_txt.xml
@@ -269,7 +269,7 @@
   <!-- MacBookPro - Reference for the following: https://support.apple.com/en-us/HT201300 -->
 
   <fingerprint pattern="^model=MacBookPro18,3$">
-    <description>Apple MacBook Pro (14-Inch, M1, 2021)</description>
+    <description>MacBook Pro (14-Inch, M1, 2021)</description>
     <example>model=MacBookPro18,3</example>
     <param pos="0" name="os.vendor" value="Apple"/>
     <param pos="0" name="os.family" value="Mac OS X"/>
@@ -277,7 +277,7 @@
     <param pos="0" name="os.cpe23" value="cpe:/o:apple:mac_os_x:-"/>
     <param pos="0" name="hw.vendor" value="Apple"/>
     <param pos="0" name="hw.family" value="MacBook Pro"/>
-    <param pos="0" name="hw.product" value="Apple MacBook Pro (14-Inch, M1, 2021)"/>
+    <param pos="0" name="hw.product" value="MacBook Pro (14-Inch, M1, 2021)"/>
     <param pos="0" name="hw.device" value="Laptop"/>
     <param pos="0" name="hw.cpe23" value="cpe:/h:apple:macbook_pro:-"/>
   </fingerprint>