From b7f05c9af28cdf79d5c5381171d23600649b9194 Mon Sep 17 00:00:00 2001
From: Michael Scire <SciresM@gmail.com>
Date: Wed, 7 Feb 2018 00:38:12 -0800
Subject: [PATCH] Bump version to 1.0 (Closes #10)

---
 KEYS.md   | 26 ++++++++++++++++++++++++++
 Makefile  |  6 +++---
 version.h |  3 +--
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 KEYS.md

diff --git a/KEYS.md b/KEYS.md
new file mode 100644
index 0000000..ce3462b
--- /dev/null
+++ b/KEYS.md
@@ -0,0 +1,26 @@
+hactool currently recognizes the following keys (## represents a hexadecimal number between 00 and 1F):
+
+```
+master_key_##                   : The ##th Firmware Master Key. Obtainable with TrustZone code execution.
+
+package1_key_##                 : The ##th Package1 key. Obtainable with Package1ldr code execution.
+
+package2_key_##                 : The ##th Package2 key. Derivable from master_key_## and package2_key_source.
+
+titlekek_##                     : The ##th Titlekek. Derivable from master_key_## and titlekek_source.
+
+package2_key_source             : Found in TrustZone .rodata.
+titlekek_source                 : Found in TrustZone .rodata.
+aes_kek_generation_source       : Found in TrustZone .rodata.
+aes_key_generation_source       : Found in TrustZone .rodata.
+key_area_key_application_source : Found in FS .rodata.
+key_area_key_ocean_source       : Found in FS .rodata.
+key_area_key_system_source      : Found in FS .rodata.
+header_kek_source               : Found in FS .rodata.
+header_key_source               : Found in FS .rodata.
+
+header_key                      : Derivable from master_key_##, header sources, and aes generation sources.
+key_area_key_application_##     : Derivable from master_key_##, key_area_key_application_source, and aes generation sources.
+key_area_key_ocean_##           : Derivable from master_key_##, key_area_key_ocean_source, and aes generation sources.
+key_area_key_system_##          : Derivable from master_key_##, key_area_key_system_source, and aes generation sources.
+```
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 1e709bc..3fc1612 100644
--- a/Makefile
+++ b/Makefile
@@ -59,11 +59,11 @@ clean_full:
 	rm -f *.o hactool hactool.exe
 	cd mbedtls && $(MAKE) clean
 
-dist:
+dist: clean_full
 	$(eval HACTOOLVER = $(shell grep '\bHACTOOL_VERSION\b' version.h \
-		| cut -d'	' -f2 \
+		| cut -d' ' -f3 \
 		| sed -e 's/"//g'))
 	mkdir hactool-$(HACTOOLVER)
-	cp *.c *.h config.mk.template Makefile README.md LICENSE hactool-$(HACTOOLVER)
+	cp -R *.c *.h config.mk.template Makefile README.md LICENSE mbedtls hactool-$(HACTOOLVER)
 	tar czf hactool-$(HACTOOLVER).tar.gz hactool-$(HACTOOLVER)
 	rm -r hactool-$(HACTOOLVER)
diff --git a/version.h b/version.h
index c659f7f..2839160 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,6 @@
 #ifndef HACTOOL_VERSION_H
 #define HACTOOL_VERSION_H
 
-/* Will become 1.0 when BKTR is implemented and I've done some refactoring... */
-#define HACTOOL_VERSION    "0.9"
+#define HACTOOL_VERSION "1.0"
 
 #endif