From c6ea5a3c65288af8feafae581b424e7a5aaa17c2 Mon Sep 17 00:00:00 2001 From: Nikita Mikhailov Date: Sun, 22 May 2016 23:28:48 +0600 Subject: [PATCH] Rename OpenPGPCapabilities according to styleguide --- ...enPGPCapabilities.java => OpenPgpCapabilities.java} | 4 ++-- .../keychain/securitytoken/SecurityTokenHelper.java | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) rename OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/{OpenPGPCapabilities.java => OpenPgpCapabilities.java} (97%) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPGPCapabilities.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCapabilities.java similarity index 97% rename from OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPGPCapabilities.java rename to OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCapabilities.java index 8aa86db02..7a87a0a97 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPGPCapabilities.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCapabilities.java @@ -23,7 +23,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -public class OpenPGPCapabilities { +public class OpenPgpCapabilities { private final static int MASK_SM = 1 << 7; private final static int MASK_KEY_IMPORT = 1 << 5; private final static int MASK_ATTRIBUTES_CHANGABLE = 1 << 2; @@ -42,7 +42,7 @@ public class OpenPGPCapabilities { private Map mKeyFormats; - public OpenPGPCapabilities(byte[] data) throws IOException { + public OpenPgpCapabilities(byte[] data) throws IOException { Iso7816TLV[] tlvs = Iso7816TLV.readList(data, true); mKeyFormats = new HashMap<>(); if (tlvs.length == 1 && tlvs[0].mT == 0x6E) { diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java index 7ab81d908..43ac3866a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java @@ -65,7 +65,7 @@ public class SecurityTokenHelper { private static final byte[] BLANK_FINGERPRINT = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; private Transport mTransport; private CardCapabilities mCardCapabilities; - private OpenPGPCapabilities mOpenPGPCapabilities; + private OpenPgpCapabilities mOpenPgpCapabilities; private Passphrase mPin; private Passphrase mAdminPin; @@ -164,8 +164,8 @@ public class SecurityTokenHelper { throw new CardException("Initialization failed!", response.getSW()); } - mOpenPGPCapabilities = new OpenPGPCapabilities(getData(0x00, 0x6E)); - mCardCapabilities = new CardCapabilities(mOpenPGPCapabilities.getHistoricalBytes()); + mOpenPgpCapabilities = new OpenPgpCapabilities(getData(0x00, 0x6E)); + mCardCapabilities = new CardCapabilities(mOpenPgpCapabilities.getHistoricalBytes()); mPw1ValidatedForSignature = false; mPw1ValidatedForDecrypt = false; @@ -334,7 +334,7 @@ public class SecurityTokenHelper { // Now we're ready to communicate with the token. byte[] bytes = SecurityTokenUtils.createPrivKeyTemplate(crtSecretKey, slot, - mOpenPGPCapabilities.getFormatForKeyType(slot)); + mOpenPgpCapabilities.getFormatForKeyType(slot)); CommandAPDU apdu = new CommandAPDU(0x00, 0xDB, 0x3F, 0xFF, bytes); ResponseAPDU response = communicate(apdu); @@ -469,7 +469,7 @@ public class SecurityTokenHelper { throw new CardException("Failed to sign", response.getSW()); } - if (!mOpenPGPCapabilities.isPw1ValidForMultipleSignatures()) { + if (!mOpenPgpCapabilities.isPw1ValidForMultipleSignatures()) { mPw1ValidatedForSignature = false; }