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

rename methods that do io to "read*" instead of "get*"

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-01-12 20:43:00 +01:00
parent abf5e5d170
commit 0d2cbd0654
6 changed files with 18 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,7 +20,6 @@ package org.sufficientlysecure.keychain.securitytoken;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.IOException; import java.io.IOException;
import java.nio.ByteBuffer;
import java.util.List; import java.util.List;
import android.content.Context; import android.content.Context;
@@ -153,7 +152,7 @@ public class SecurityTokenConnection {
} }
public void refreshConnectionCapabilities() throws IOException { public void refreshConnectionCapabilities() throws IOException {
byte[] rawOpenPgpCapabilities = getData(0x00, 0x6E); byte[] rawOpenPgpCapabilities = readData(0x00, 0x6E);
OpenPgpCapabilities openPgpCapabilities = OpenPgpCapabilities.fromBytes(rawOpenPgpCapabilities); OpenPgpCapabilities openPgpCapabilities = OpenPgpCapabilities.fromBytes(rawOpenPgpCapabilities);
setConnectionCapabilities(openPgpCapabilities); setConnectionCapabilities(openPgpCapabilities);
@@ -360,7 +359,7 @@ public class SecurityTokenConnection {
// endregion // endregion
private byte[] getData(int p1, int p2) throws IOException { private byte[] readData(int p1, int p2) throws IOException {
ResponseApdu response = communicate(commandFactory.createGetDataCommand(p1, p2)); ResponseApdu response = communicate(commandFactory.createGetDataCommand(p1, p2));
if (!response.isSuccess()) { if (!response.isSuccess()) {
throw new CardException("Failed to get pw status bytes", response.getSw()); throw new CardException("Failed to get pw status bytes", response.getSw());
@@ -369,32 +368,31 @@ public class SecurityTokenConnection {
} }
public String getUrl() throws IOException { private String readUrl() throws IOException {
byte[] data = getData(0x5F, 0x50); byte[] data = readData(0x5F, 0x50);
return new String(data).trim(); return new String(data).trim();
} }
public byte[] getUserId() throws IOException { private byte[] readUserId() throws IOException {
return getData(0x00, 0x65); return readData(0x00, 0x65);
} }
public SecurityTokenInfo getTokenInfo() throws IOException { public SecurityTokenInfo readTokenInfo() throws IOException {
byte[][] fingerprints = new byte[3][]; byte[][] fingerprints = new byte[3][];
fingerprints[0] = openPgpCapabilities.getFingerprintSign(); fingerprints[0] = openPgpCapabilities.getFingerprintSign();
fingerprints[1] = openPgpCapabilities.getFingerprintEncrypt(); fingerprints[1] = openPgpCapabilities.getFingerprintEncrypt();
fingerprints[2] = openPgpCapabilities.getFingerprintAuth(); fingerprints[2] = openPgpCapabilities.getFingerprintAuth();
byte[] aid = openPgpCapabilities.getAid(); byte[] aid = openPgpCapabilities.getAid();
String userId = parseHolderName(getUserId()); String userId = parseHolderName(readUserId());
String url = getUrl(); String url = readUrl();
byte[] pwInfo = openPgpCapabilities.getPwStatusBytes(); byte[] pwInfo = openPgpCapabilities.getPwStatusBytes();
boolean hasLifeCycleManagement = cardCapabilities.hasLifeCycleManagement(); boolean hasLifeCycleManagement = cardCapabilities.hasLifeCycleManagement();
TransportType transportType = transport.getTransportType(); TransportType transportType = transport.getTransportType();
return SecurityTokenInfo return SecurityTokenInfo.create(transportType, tokenType, fingerprints, aid, userId, url, pwInfo[4], pwInfo[6],
.create(transportType, tokenType, fingerprints, aid, userId, url, pwInfo[4], pwInfo[6], hasLifeCycleManagement);
hasLifeCycleManagement);
} }

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateKeyActivity.java
View File

@@ -140,7 +140,7 @@ public class CreateKeyActivity extends BaseSecurityTokenActivity {
return; return;
} }
tokenInfo = stConnection.getTokenInfo(); tokenInfo = stConnection.readTokenInfo();
} }
@Override @Override

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenChangePinOperationActivity.java
View File

@@ -144,7 +144,7 @@ public class SecurityTokenChangePinOperationActivity extends BaseSecurityTokenAc
Passphrase adminPin = new Passphrase(changePinInput.getAdminPin()); Passphrase adminPin = new Passphrase(changePinInput.getAdminPin());
ModifyPinTokenOp.create(stConnection, adminPin).modifyPw1Pin(changePinInput.getNewPin().getBytes()); ModifyPinTokenOp.create(stConnection, adminPin).modifyPw1Pin(changePinInput.getNewPin().getBytes());
resultTokenInfo = stConnection.getTokenInfo(); resultTokenInfo = stConnection.readTokenInfo();
} }
@Override @Override

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/SecurityTokenOperationActivity.java
View File

@@ -39,7 +39,6 @@ import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey;
import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing; import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
import org.sufficientlysecure.keychain.provider.KeyRepository; import org.sufficientlysecure.keychain.provider.KeyRepository;
import org.sufficientlysecure.keychain.provider.KeychainContract; import org.sufficientlysecure.keychain.provider.KeychainContract;
import org.sufficientlysecure.keychain.securitytoken.KeyType;
import org.sufficientlysecure.keychain.securitytoken.operations.ModifyPinTokenOp; import org.sufficientlysecure.keychain.securitytoken.operations.ModifyPinTokenOp;
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenConnection; import org.sufficientlysecure.keychain.securitytoken.SecurityTokenConnection;
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo; import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo;
@@ -305,7 +304,7 @@ public class SecurityTokenOperationActivity extends BaseSecurityTokenActivity {
} }
case SECURITY_TOKEN_RESET_CARD: { case SECURITY_TOKEN_RESET_CARD: {
ResetAndWipeTokenOp.create(stConnection).resetAndWipeToken(); ResetAndWipeTokenOp.create(stConnection).resetAndWipeToken();
mResultTokenInfo = stConnection.getTokenInfo(); mResultTokenInfo = stConnection.readTokenInfo();
break; break;
} }

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/base/BaseSecurityTokenActivity.java
View File

@@ -82,7 +82,7 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity
* Override to implement SecurityToken operations (background thread) * Override to implement SecurityToken operations (background thread)
*/ */
protected void doSecurityTokenInBackground(SecurityTokenConnection stConnection) throws IOException { protected void doSecurityTokenInBackground(SecurityTokenConnection stConnection) throws IOException {
tokenInfo = stConnection.getTokenInfo(); tokenInfo = stConnection.readTokenInfo();
Log.d(Constants.TAG, "Security Token: " + tokenInfo); Log.d(Constants.TAG, "Security Token: " + tokenInfo);
} }
@@ -260,7 +260,7 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity
SecurityTokenInfo tokeninfo = null; SecurityTokenInfo tokeninfo = null;
try { try {
tokeninfo = stConnection.getTokenInfo(); tokeninfo = stConnection.readTokenInfo();
} catch (IOException e2) { } catch (IOException e2) {
// don't care // don't care
} }
@@ -278,7 +278,7 @@ public abstract class BaseSecurityTokenActivity extends BaseActivity
case 0x6982: { case 0x6982: {
SecurityTokenInfo tokeninfo = null; SecurityTokenInfo tokeninfo = null;
try { try {
tokeninfo = stConnection.getTokenInfo(); tokeninfo = stConnection.readTokenInfo();
} catch (IOException e2) { } catch (IOException e2) {
// don't care // don't care
} }

7
OpenKeychain/src/test/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenConnectionTest.java
View File

@@ -1,7 +1,6 @@
package org.sufficientlysecure.keychain.securitytoken; package org.sufficientlysecure.keychain.securitytoken;
import java.io.IOException;
import java.util.LinkedList; import java.util.LinkedList;
import org.bouncycastle.util.encoders.Hex; import org.bouncycastle.util.encoders.Hex;
@@ -13,10 +12,6 @@ import org.mockito.stubbing.Answer;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.shadows.ShadowLog; import org.robolectric.shadows.ShadowLog;
import org.sufficientlysecure.keychain.KeychainTestRunner; import org.sufficientlysecure.keychain.KeychainTestRunner;
import org.sufficientlysecure.keychain.operations.results.OperationResult.OperationLog;
import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKey;
import org.sufficientlysecure.keychain.pgp.CanonicalizedSecretKeyRing;
import org.sufficientlysecure.keychain.pgp.UncachedKeyRing;
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TokenType; import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TokenType;
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TransportType; import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo.TransportType;
import org.sufficientlysecure.keychain.util.Passphrase; import org.sufficientlysecure.keychain.util.Passphrase;
@@ -106,7 +101,7 @@ public class SecurityTokenConnectionTest {
expect("00ca5f5000", "9000"); expect("00ca5f5000", "9000");
securityTokenConnection.getTokenInfo(); securityTokenConnection.readTokenInfo();
verifyDialog(); verifyDialog();
} }