cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extract GenerateKeyUseCase

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-01-12 16:00:52 +01:00
parent 4cbdad7cb8
commit 47319d22b9
2 changed files with 50 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/GenerateKeyUseCase.java Normal file
View File

@@ -0,0 +1,50 @@
package org.sufficientlysecure.keychain.securitytoken;
import java.io.IOException;
import org.sufficientlysecure.keychain.util.Passphrase;
public class GenerateKeyUseCase {
private final SecurityTokenConnection connection;
public static GenerateKeyUseCase create(SecurityTokenConnection connection) {
return new GenerateKeyUseCase(connection);
}
private GenerateKeyUseCase(SecurityTokenConnection connection) {
this.connection = connection;
}
/**
* Generates a key on the card in the given slot. If the slot is 0xB6 (the signature key),
* this command also has the effect of resetting the digital signature counter.
* NOTE: This does not set the key fingerprint data object! After calling this command, you
* must construct a public key packet using the returned public key data objects, compute the
* key fingerprint, and store it on the card using: putData(0xC8, key.getFingerprint())
*
* @param slot The slot on the card where the key should be generated:
* 0xB6: Signature Key
* 0xB8: Decipherment Key
* 0xA4: Authentication Key
* @return the public key data objects, in TLV format. For RSA this will be the public modulus
* (0x81) and exponent (0x82). These may come out of order; proper TLV parsing is required.
*/
public byte[] generateKey(Passphrase adminPin, int slot) throws IOException {
if (slot != 0xB6 && slot != 0xB8 && slot != 0xA4) {
throw new IOException("Invalid key slot");
}
connection.verifyAdminPin(adminPin);
CommandApdu apdu = connection.getCommandFactory().createGenerateKeyCommand(slot);
ResponseApdu response = connection.communicate(apdu);
if (!response.isSuccess()) {
throw new IOException("On-card key generation failed");
}
return response.getData();
}
}

33
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnection.java
View File

@@ -415,39 +415,6 @@ public class SecurityTokenConnection {
return lastResponse;
}
/**
* Generates a key on the card in the given slot. If the slot is 0xB6 (the signature key),
* this command also has the effect of resetting the digital signature counter.
* NOTE: This does not set the key fingerprint data object! After calling this command, you
* must construct a public key packet using the returned public key data objects, compute the
* key fingerprint, and store it on the card using: putData(0xC8, key.getFingerprint())
*
* @param slot The slot on the card where the key should be generated:
* 0xB6: Signature Key
* 0xB8: Decipherment Key
* 0xA4: Authentication Key
* @return the public key data objects, in TLV format. For RSA this will be the public modulus
* (0x81) and exponent (0x82). These may come out of order; proper TLV parsing is required.
*/
public byte[] generateKey(Passphrase adminPin, int slot) throws IOException {
if (slot != 0xB6 && slot != 0xB8 && slot != 0xA4) {
throw new IOException("Invalid key slot");
}
if (!isPw3Validated) {
verifyAdminPin(adminPin);
}
CommandApdu apdu = commandFactory.createGenerateKeyCommand(slot);
ResponseApdu response = communicate(apdu);
if (!response.isSuccess()) {
throw new IOException("On-card key generation failed");
}
return response.getData();
}
/**
* Return the fingerprint from application specific data stored on tag, or
* null if it doesn't exist.