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

Attempt to fix change of key attributes during smartcard key creation

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-05-23 15:45:28 +02:00
parent 1e05b7999e
commit d00e27ad2e
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/operations/SecurityTokenChangeKeyTokenOp.java
View File

@@ -102,11 +102,10 @@ public class SecurityTokenChangeKeyTokenOp {
try { try {
secretKey.unlock(passphrase); secretKey.unlock(passphrase);
byte[] attributesForSecretKey = createAttributesForSecretKey(slot, secretKey);
setKeyAttributes(adminPin, slot, attributesForSecretKey);
OpenPgpCapabilities openPgpCapabilities = connection.getOpenPgpCapabilities(); OpenPgpCapabilities openPgpCapabilities = connection.getOpenPgpCapabilities();
setKeyAttributes(adminPin, slot, SecurityTokenUtils.attributesFromSecretKey(slot, secretKey,
openPgpCapabilities.getFormatForKeyType(slot)));
KeyFormat formatForKeyType = openPgpCapabilities.getFormatForKeyType(slot); KeyFormat formatForKeyType = openPgpCapabilities.getFormatForKeyType(slot);
switch (formatForKeyType.keyFormatType()) { switch (formatForKeyType.keyFormatType()) {
case RSAKeyFormatType: case RSAKeyFormatType:
@@ -152,6 +151,13 @@ public class SecurityTokenChangeKeyTokenOp {
} }
} }
private byte[] createAttributesForSecretKey(KeyType slot, CanonicalizedSecretKey secretKey) throws IOException {
OpenPgpCapabilities openPgpCapabilities = connection.getOpenPgpCapabilities();
KeyFormat formatForKeyType = openPgpCapabilities.getFormatForKeyType(slot);
return SecurityTokenUtils.attributesFromSecretKey(slot, secretKey, formatForKeyType);
}
private void setKeyAttributes(Passphrase adminPin, KeyType keyType, byte[] data) throws IOException { private void setKeyAttributes(Passphrase adminPin, KeyType keyType, byte[] data) throws IOException {
if (!connection.getOpenPgpCapabilities().isAttributesChangable()) { if (!connection.getOpenPgpCapabilities().isAttributesChangable()) {
return; return;