arti/Estonian-ID-card-mobile-authenticator-POC
1
0
Fork 0
mirror of https://github.com/TanelOrumaa/Estonian-ID-card-mobile-authenticator-POC.git synced 2024-11-05 05:20:59 +02:00
Code Packages Releases Wiki Activity

auth cert bug fix progress

Browse Source
This commit is contained in:
Lemmo Lavonen 2021-10-12 03:04:00 +03:00
parent 1c8a606376
commit 25c01803cb
1 changed files with 1 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
MobileAuthApp/app/src/main/java/com/tarkvaraprojekt/mobileauthapp/NFC/Comms.java
View File

@ -380,38 +380,7 @@ public class Comms {
*/
public byte[] getAuthenticationCertificate() throws NoSuchPaddingException, InvalidAlgorithmParameterException, NoSuchAlgorithmException, IllegalBlockSizeException, BadPaddingException, InvalidKeyException, IOException {
selectIASECCApplication();
byte[] APDU = createSecureAPDU(new byte[]{-83, -15}, selectFile);
byte[] response = idCard.transceive(APDU);
Log.i("Select AWP Application", Hex.toHexString(response));
APDU = createSecureAPDU(new byte[]{52, 1}, selectFile);
response = idCard.transceive(APDU);
Log.i("Select certificate", Hex.toHexString(response));
byte[] responses = new byte[0];
byte[] readCert = Arrays.copyOf(read, read.length);
for (int i = 0; i < 5; i++) {
readCert[2] = (byte) i;
APDU = createSecureAPDU(new byte[0], readCert);
response = idCard.transceive(APDU);
Log.i("Read certificate", Hex.toHexString(response));
if (!Hex.toHexString(response).substring(response.length * 2 - 4).equals("6b00")) {
byte[] decrypted = encryptDecryptData(Arrays.copyOfRange(response, 4, 244), Cipher.DECRYPT_MODE);
responses = Arrays.copyOf(responses, responses.length + decrypted.length);
System.arraycopy(decrypted, 0, responses, responses.length - decrypted.length, decrypted.length);
} else {
break;
}
}
Log.i("Certificate", new String(responses, StandardCharsets.UTF_8));
return responses;
return new byte[0];
}
}