From a61a6a5918fd37ed1c16dc4b80aba69bd7725ea4 Mon Sep 17 00:00:00 2001
From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
Date: Thu, 16 Aug 2012 03:00:00 +0000
Subject: [PATCH] Add @xmloutput nsedoc to ssh-hostkey, smb-os-discovery

---
 scripts/smb-os-discovery.nse | 13 +++++++++++-
 scripts/ssh-hostkey.nse      | 41 ++++++++++++++++++++++++++++++++++++
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/scripts/smb-os-discovery.nse b/scripts/smb-os-discovery.nse
index 643af572f..4f5fdfb23 100644
--- a/scripts/smb-os-discovery.nse
+++ b/scripts/smb-os-discovery.nse
@@ -56,7 +56,18 @@ will speed up the script on targets that do not allow guest access.
 -- |   NetBIOS computer name: SQL2008
 -- |   NetBIOS domain name: LAB
 -- |_  System time: 2011-04-20 13:34:06 UTC-5
------------------------------------------------------------------------
+--
+--@xmloutput
+-- <script id="smb-os-discovery" output="...">
+--   <elem key="OS">Windows Server (R) 2008 Standard 6001 Service Pack 1 (Windows Server (R) 2008 Standard 6.0)</elem>
+--   <elem key="Computer name">Sql2008</elem>
+--   <elem key="Domain name">lab.test.local</elem>
+--   <elem key="Forest name">test.local</elem>
+--   <elem key="FQDN">Sql2008.lab.test.local</elem>
+--   <elem key="NetBIOS computer name">SQL2008</elem>
+--   <elem key="NetBIOS domain name">LAB</elem>
+--   <elem key="System time">2011-04-20 13:34:06 UTC-5</elem>
+-- </script>
 
 author = "Ron Bowes"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
diff --git a/scripts/ssh-hostkey.nse b/scripts/ssh-hostkey.nse
index dfafb8e40..815e95540 100644
--- a/scripts/ssh-hostkey.nse
+++ b/scripts/ssh-hostkey.nse
@@ -59,6 +59,47 @@ The script also includes a postrule that check for duplicate hosts using the gat
 -- |   192.168.1.1
 -- |_  192.168.1.2
 --
+--@xmloutput
+-- <script id="ssh-hostkey" output="...">
+--   <table>
+--     <elem key="key">ssh-dss AAAAB3NzaC1kc3MAAACBANraqxAILTygMTgFu/0snrJck8BkhOpBbN61DAZENgeulLMaJdmNFWZpvhLOJVXSqHt2TCrspbMyvpBH4Fnv7Kb+QBAhXyzeCNnOQ7OVBfqNzkfezoFrQJgOQZSEenP6sCVDqcW2j0KVumnYdPU7FGa8SLfNqA+hUOR2HSSluynFAAAAFQDWKNq4PVbpDA7UExE8JSHnWxv4AwAAAIAWEDdNu5mWfTz52IdxELNjsmn5FvKRmnhPqq/PrTkYqAADL5WYazg7POQZ4yI2nqTq++47ONDK87Wke3qbeIhMrV13Mrgf2JuCUSNqrfEmvzZ2l9x3QyZrj+bJRPRuhwYq8rFup01qaANJ0p4WS/7voNbRhh+l57FkJF+XAJRRTAAAAIEAts1Se+u+hV9ZedXopzfXv1I5ZOSONxZanM10wjM2GRWygCYsHqDM315swBPkzhmB73oBesnhDW3bq0dmW3wvk4gzQZ2E2SHhzVGjlgDpjEahlQ+XGpDZsvqqFGGGx8lvKYFUxBR+UkqMRGmjkHw5sK5ydO1n4R3XJ4FfQFqmoyU=</elem>
+--     <elem key="bits">1024</elem>
+--     <elem key="fingerprint">18:78:2f:d3:be:71:78:a3:8e:58:4b:5a:83:bd:60:a8</elem>
+--     <elem key="algorithm">DSA</elem>
+--   </table>
+--   <table>
+--     <elem key="key">ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAQEAwVuv2gcr0maaKQ69VVIEv2ob4OxnuI64fkeOnCXD1lUx5tTA+vefXUWEMxgMuA7iX4irJHy2zer0NQ3Z3yJvr5scPgTYIaEOp5Uo/eGFG9Agpk5wE8CoF0e47iCAPHqzlmP2V7aNURLMODb3jVZuI07A2ZRrMGrD8d888E2ORVORv1rYeTYCqcMMoVFmX9l3gWEdk4yx3w5sD8v501Iuyd1v19mPfyhrI5E1E1nl/Xjp5N0/xP2GUBrdkDMxKaxqTPMie/f0dXBUPQQN697a5q+5lBRPhKYOtn6yQKCd9s1Q22nxn72Jmi1RzbMyYJ52FosDT755Qmb46GLrDMaZMQ==</elem>
+--     <elem key="bits">2048</elem>
+--     <elem key="fingerprint">f0:58:ce:f4:aa:a4:59:1c:8e:dd:4d:07:44:c8:25:11</elem>
+--     <elem key="algorithm">RSA</elem>
+--   </table>
+-- </script>
+--
+--@xmloutput
+-- <script id="ssh-hostkey" output="...">
+--   <table>
+--     <table key="hosts">
+--       <elem>192.168.1.1</elem>
+--       <elem>192.168.1.2</elem>
+--     </table>
+--     <table key="key">
+--       <elem key="fingerprint">2c:22:75:60:4b:c3:3b:18:a2:97:2c:96:7e:28:dc:dd</elem>
+--       <elem key="bits">2048</elem>
+--       <elem key="algorithm">RSA</elem>
+--     </table>
+--   </table>
+--   <table>
+--     <table key="hosts">
+--       <elem>192.168.1.1</elem>
+--       <elem>192.168.1.2</elem>
+--     </table>
+--     <table key="key">
+--       <elem key="fingerprint">60:ac:4d:51:b1:cd:85:09:12:16:92:76:1d:5d:27:6e</elem>
+--       <elem key="bits">1024</elem>
+--       <elem key="algorithm">DSA</elem>
+--     </table>
+--   </table>
+-- </script>
 
 author = "Sven Klemm"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"