Skip to content

Commit b7f05c9

Browse files
committed
Bump version to 1.0 (Closes #10)
1 parent 14471a8 commit b7f05c9

File tree

3 files changed

+30
-5
lines changed

3 files changed

+30
-5
lines changed

KEYS.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
hactool currently recognizes the following keys (## represents a hexadecimal number between 00 and 1F):
2+
3+
```
4+
master_key_## : The ##th Firmware Master Key. Obtainable with TrustZone code execution.
5+
6+
package1_key_## : The ##th Package1 key. Obtainable with Package1ldr code execution.
7+
8+
package2_key_## : The ##th Package2 key. Derivable from master_key_## and package2_key_source.
9+
10+
titlekek_## : The ##th Titlekek. Derivable from master_key_## and titlekek_source.
11+
12+
package2_key_source : Found in TrustZone .rodata.
13+
titlekek_source : Found in TrustZone .rodata.
14+
aes_kek_generation_source : Found in TrustZone .rodata.
15+
aes_key_generation_source : Found in TrustZone .rodata.
16+
key_area_key_application_source : Found in FS .rodata.
17+
key_area_key_ocean_source : Found in FS .rodata.
18+
key_area_key_system_source : Found in FS .rodata.
19+
header_kek_source : Found in FS .rodata.
20+
header_key_source : Found in FS .rodata.
21+
22+
header_key : Derivable from master_key_##, header sources, and aes generation sources.
23+
key_area_key_application_## : Derivable from master_key_##, key_area_key_application_source, and aes generation sources.
24+
key_area_key_ocean_## : Derivable from master_key_##, key_area_key_ocean_source, and aes generation sources.
25+
key_area_key_system_## : Derivable from master_key_##, key_area_key_system_source, and aes generation sources.
26+
```

Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,11 +59,11 @@ clean_full:
5959
rm -f *.o hactool hactool.exe
6060
cd mbedtls && $(MAKE) clean
6161

62-
dist:
62+
dist: clean_full
6363
$(eval HACTOOLVER = $(shell grep '\bHACTOOL_VERSION\b' version.h \
64-
| cut -d' ' -f2 \
64+
| cut -d' ' -f3 \
6565
| sed -e 's/"//g'))
6666
mkdir hactool-$(HACTOOLVER)
67-
cp *.c *.h config.mk.template Makefile README.md LICENSE hactool-$(HACTOOLVER)
67+
cp -R *.c *.h config.mk.template Makefile README.md LICENSE mbedtls hactool-$(HACTOOLVER)
6868
tar czf hactool-$(HACTOOLVER).tar.gz hactool-$(HACTOOLVER)
6969
rm -r hactool-$(HACTOOLVER)

version.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#ifndef HACTOOL_VERSION_H
22
#define HACTOOL_VERSION_H
33

4-
/* Will become 1.0 when BKTR is implemented and I've done some refactoring... */
5-
#define HACTOOL_VERSION "0.9"
4+
#define HACTOOL_VERSION "1.0"
65

76
#endif

0 commit comments

Comments
 (0)