From 2c86ea62e7cb191cd2634c4f4a1fa846dcf29f21 Mon Sep 17 00:00:00 2001
From: Diederik de Groot <ddegroot@talon.nl>
Date: Sun, 15 Mar 2020 10:42:26 +0100
Subject: [PATCH] Update TLV Handling. Update index.php error output when no
 filename is provided. Update gitignore

Signed-off-by: Diederik de Groot <ddegroot@talon.nl>
---
 .gitignore                  | 10 +++++++++-
 tftpboot/index.php          |  4 ++--
 tools/certutils/TLV/Tags.pm |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 3aa3b4b..ba5d398 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,14 @@
 env/
 *~
 *.bak
+*.enc
+*.sgn
+.requirements_satisfied
 etc/nginx/site-available/nginx.rules
 etc/tftpd-hpa/tftpd.rules
-.requirements_satisfied
+etc/certs/*.pem
+tftpboot/settings/*.cnf.xml
+tftpboot/settings/*.tlv
+tftpboot/settings/authorized_keys
+tftpboot/settings/*.jar
+tftpboot/settings/*.json
diff --git a/tftpboot/index.php b/tftpboot/index.php
index c7024b3..6358261 100644
--- a/tftpboot/index.php
+++ b/tftpboot/index.php
@@ -51,7 +51,7 @@ function sendfile($file) {
 	}
 }
 if (!$request || empty($request) || !array_key_exists('filename',$request) || empty($request['filename'])) {
-	send_fallback_html("Empty request sent");
+	send_fallback_html("Empty 'filename' request sent");
 	exit();
 }
 try {
@@ -64,4 +64,4 @@ try {
 } catch(Exception $e) {
 	send_fallback_html($e->getMessage());
 }
-?>
\ No newline at end of file
+?>
diff --git a/tools/certutils/TLV/Tags.pm b/tools/certutils/TLV/Tags.pm
index ad87db9..a064e2d 100644
--- a/tools/certutils/TLV/Tags.pm
+++ b/tools/certutils/TLV/Tags.pm
@@ -15,7 +15,7 @@ our %EXPORT_TAGS = (header   => [qw/HEADER_VERSION HEADER_LENGTH HEADER_SIGNER_I
                                     RECORD_SERIAL_NUMBER RECORD_PUBLIC_KEY RECORD_SIGNATURE RECORD_CERTIFICATE
                                     RECORD_IP_ADDRESS RECORD_CERTIFICATE_HASH RECORD_HASH_ALGORITHM/],
                     digest   => [qw/DIGEST_SHA1 DIGEST_SHA256 DIGEST_SHA384 DIGEST_SHA512/],
-                    function => [qw/FUNCTION_SAST FUNCTION_CCM FUNCTION_CCM_TFTP FUNCTION_TFTP FUNCTION_HTTPS/]);
+                    function => [qw/FUNCTION_SAST FUNCTION_CCM FUNCTION_CCM_TFTP FUNCTION_TFTP FUNCTION_CAPF FUNCTION_SRST FUNCTION_HTTPS FUNCTION_TVS/]);
 
 our @EXPORT_OK = (@{$EXPORT_TAGS{header}}, @{$EXPORT_TAGS{record}}, @{$EXPORT_TAGS{digest}}, @{$EXPORT_TAGS{function}});