desu/konogonka
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

fixed title.keys key size

Browse source
This commit is contained in:
Dmitry Isaenko 2019-08-19 19:26:59 +03:00
parent 4e1bacd4fc
commit e8755fbe2f
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/main/java/konogonka/Settings/ListSelectorController.java
View file

@ -107,8 +107,7 @@ public class ListSelectorController implements Initializable {
} }
private void validateAndAdd(String addingItem){ private void validateAndAdd(String addingItem){
if (!observableList.contains(addingItem)) { if (!observableList.contains(addingItem))
observableList.add(addingItem); observableList.add(addingItem);
} }
}
} }

4
src/main/java/konogonka/Settings/SettingsController.java
View file

@ -163,8 +163,8 @@ public class SettingsController implements Initializable {
String[] keyValue; String[] keyValue;
LinkedHashMap<String, String> preparedPairsMap = new LinkedHashMap<>(); LinkedHashMap<String, String> preparedPairsMap = new LinkedHashMap<>();
while ((fileLine = br.readLine()) != null){ while ((fileLine = br.readLine()) != null){
keyValue = fileLine.trim().split("\\s+?=\\s+?", 2); keyValue = fileLine.trim().split("\\s*=\\s*", 2);
if (keyValue.length == 2 && keyValue[0].length() == 32 && keyValue[1].length() == 32){ if (keyValue.length == 2 && keyValue[0].length() > 16 && ! (keyValue[0].length() > 32) && keyValue[1].length() == 32){
preparedPairsMap.put(keyValue[0], keyValue[1]); preparedPairsMap.put(keyValue[0], keyValue[1]);
} }
} }

4
src/main/java/konogonka/Tools/NCA/NCAProvider.java
View file

@ -257,9 +257,9 @@ public class NCAProvider {
key = decryptedKey2; // TODO: Just remember this dumb hack key = decryptedKey2; // TODO: Just remember this dumb hack
} }
else { else {
byte[] rightsIDkey = hexStrToByteArray(keys.get(byteArrToHexString(rightsId)));
try { try {
byte[] rightsIDkey = hexStrToByteArray(keys.get(byteArrToHexString(rightsId))); // throws NullPointerException
SecretKeySpec skSpec = new SecretKeySpec( SecretKeySpec skSpec = new SecretKeySpec(
hexStrToByteArray(keys.get(String.format("titlekek_%02d", cryptoTypeReal)) hexStrToByteArray(keys.get(String.format("titlekek_%02d", cryptoTypeReal))
), "AES"); ), "AES");