Skip to content

Commit

Permalink
Bump version to 1.0 (Closes #10)
Browse files Browse the repository at this point in the history
  • Loading branch information
SciresM committed Feb 7, 2018
1 parent 14471a8 commit b7f05c9
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 5 deletions.
26 changes: 26 additions & 0 deletions KEYS.md
Original file line number Diff line number Diff line change
@@ -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.
```
6 changes: 3 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
3 changes: 1 addition & 2 deletions version.h
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit b7f05c9

Please sign in to comment.