rebase on master, fix merge conflict

This commit is contained in:
tcprst 2020-10-06 09:03:24 -04:00
commit fbc7f05ad1
No known key found for this signature in database
GPG key ID: 9145EAF5121AED25
4 changed files with 35 additions and 72 deletions

View file

@ -46,9 +46,10 @@ Reverse permute iCLASS master key
```
Options
---
r reverse permuted key
-r --reverse : reverse permuted key
--key <bytes> : input key
pm3 --> hf iclass permute r 3F90EBF0910F7B6F
pm3 --> hf iclass permute --reverse --key 3F90EBF0910F7B6F
```
iCLASS Reader