From 3164ea7a20ee6f764129ec16965b6f877e0cb6f0 Mon Sep 17 00:00:00 2001 From: bmenrigh Date: Tue, 14 Apr 2009 22:06:31 +0000 Subject: [PATCH] I ran into a case where Hummingbird Exceed X11 reported slightly different bytes in a few X11 fields. I've made the match more generic. I have a feeling that the X11 fields might contain useful information that we could include in i// but I don't know enough about X11 to do that myself. --- nmap-service-probes | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/nmap-service-probes b/nmap-service-probes index 6b23c7d81..b3a80d293 100644 --- a/nmap-service-probes +++ b/nmap-service-probes @@ -6721,7 +6721,12 @@ match X11 m|^\x01\0\x0b\0\0\0.\0..\0\0\0\0..\xff\xff\?\0\x01\0\0\0.\0\xff\xff\x0 match X11 m|^\x01\0\x0b\0\0.....\0\0\0\0..\xff\xff\?\0\x01\0\0\0.\0\xff\xff\x01.\x01\x01\x08 \x08\xfe...\0Hummingbird Communications Ltd\..\x01\x01|s p/Hummingbird Exceed X server/ v/6.X/ o/Windows/ # General catch-alls match X11 m|^\x01\0\x0b\0\0.....\0\0\0\0..\xff\xff.\0\x01\0\0..\0\xff\xff......\x08\xfe...\0Hummingbird Communications Ltd\.|s p/Hummingbird Exceed X server/ o/Windows/ -match X11 m|^\x01\0\x0b\0\0.....\0\0\0\0..\xff\xff.*Hummingbird Ltd\.|s p/Hummingbird Exceed X server/ o/Windows/ +# This Hummingbird match isn't quite generic enough in some casses. +# I'm not sure what all of the X11 flags are though so rather than +# just make it more generic, I'll comment it out and include a more generic +# one below. [Brandon] +#match X11 m|^\x01\0\x0b\0\0.....\0\0\0\0..\xff\xff.*Hummingbird Ltd\.|s p/Hummingbird Exceed X server/ o/Windows/ +match X11 m|^\x01\0\x0b\0\0......?\0\0\0...?\xff\xff.*Hummingbird Ltd\.|s p/Hummingbird Exceed X server/ o/Windows/ match X11 m|^\x01\0\x0b\0\0.....\0\0\0\0..\xff\xff\?\0.\0\0..\0\xff\xff......\x08....\0DECWINDOWS compatibility\. Hummingbird|s p/Hummingbird Exceed X server/ i/DECWINDOWS compatibility/ o/Windows/ match X11 m|^\x01\0\x0b\0\0.....\0\0\0\0..\xff\xff\?\0.\0\0..\0\xff\xff......\x08....\0DECWINDOWS DigitalEquipmentCorporation, eXcursion|s p/DEC eXcursion X server/ o/Windows/ match X11 m|^\x01\0\x0b\0\0......\0\0\0..\xff\xff\?\0.\0\0..\0\xff\xff.*Hewlett-Packard Company\0|s p/Hewlett-Packard X server/ o/HP-UX/