From eea991a45a49ad502a38fe51348de021680efd7a Mon Sep 17 00:00:00 2001
From: ncameron-r7 <nathan_cameron@rapid7.com>
Date: Mon, 25 Jun 2018 17:13:32 +0100
Subject: [PATCH 1/2] Amazon Linux AMI fingerprinting via ftp banner

---
 xml/ftp_banners.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/xml/ftp_banners.xml b/xml/ftp_banners.xml
index 32409349..36f3e3e6 100644
--- a/xml/ftp_banners.xml
+++ b/xml/ftp_banners.xml
@@ -1317,4 +1317,12 @@ more text</example>
     <param pos="2" name="service.version"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
+  <fingerprint pattern="^Amazon Linux AMI release (.*)">
+    <description>Amazon Linux AMI</description>
+    <example os.version="2016.09">Amazon Linux AMI release 2016.09</example>
+    <param pos="0" name="os.vendor" value="Amazon"/>
+    <param pos="0" name="os.family" value="Linux"/>
+    <param pos="0" name="os.product" value="Linux AMI"/>
+    <param pos="1" name="os.version"/> 
+  </fingerprint>
 </fingerprints>

From 34401c544a2e24b4a2a04ee43a4a915c91884ffe Mon Sep 17 00:00:00 2001
From: ncameron-r7 <nathan_cameron@rapid7.com>
Date: Wed, 27 Jun 2018 11:24:11 +0100
Subject: [PATCH 2/2] FTP banner for Amazon Linux

---
 xml/ftp_banners.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/xml/ftp_banners.xml b/xml/ftp_banners.xml
index 36f3e3e6..320b266f 100644
--- a/xml/ftp_banners.xml
+++ b/xml/ftp_banners.xml
@@ -1317,7 +1317,7 @@ more text</example>
     <param pos="2" name="service.version"/>
     <param pos="1" name="host.name"/>
   </fingerprint>
-  <fingerprint pattern="^Amazon Linux AMI release (.*)">
+  <fingerprint pattern="Amazon\sLinux\sAMI\srelease\s(\d+\.\d+)">
     <description>Amazon Linux AMI</description>
     <example os.version="2016.09">Amazon Linux AMI release 2016.09</example>
     <param pos="0" name="os.vendor" value="Amazon"/>