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

Rename methods related only to security tokens

Browse Source
This commit is contained in:
Arnaud Fontaine
2017-01-05 11:01:14 +01:00
parent 3a20dee36f
commit 42b5e291ca
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedPublicKey.java
View File

@@ -203,7 +203,7 @@ public class CanonicalizedPublicKey extends UncachedPublicKey {
}
// For use only in card export; returns the public key.
public ECPublicKey getECPublicKey()
public ECPublicKey getSecurityTokenECPublicKey()
throws PgpGeneralException {
JcaPGPKeyConverter keyConverter = new JcaPGPKeyConverter();
PublicKey retVal;
@@ -216,7 +216,7 @@ public class CanonicalizedPublicKey extends UncachedPublicKey {
return (ECPublicKey) retVal;
}
public ASN1ObjectIdentifier getHashAlgorithm()
public ASN1ObjectIdentifier getSecurityTokenHashAlgorithm()
throws PGPException {
if (!isEC()) {
throw new PGPException("Key encryption OID is valid only for EC key!");
@@ -236,7 +236,7 @@ public class CanonicalizedPublicKey extends UncachedPublicKey {
}
}
public int getSymmetricKeySize()
public int getSecurityTokenSymmetricKeySize()
throws PGPException {
if (!isEC()) {
throw new PGPException("Key encryption OID is valid only for EC key!");

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/CanonicalizedSecretKey.java
View File

@@ -300,7 +300,7 @@ public class CanonicalizedSecretKey extends CanonicalizedPublicKey {
}
// For use only in card export; returns the secret key in Chinese Remainder Theorem format.
public RSAPrivateCrtKey getCrtSecretKey() throws PgpGeneralException {
public RSAPrivateCrtKey getSecurityTokenRSASecretKey() throws PgpGeneralException {
if (mPrivateKeyState == PRIVATE_KEY_STATE_LOCKED) {
throw new PgpGeneralException("Cannot get secret key attributes while key is locked.");
}
@@ -321,7 +321,7 @@ public class CanonicalizedSecretKey extends CanonicalizedPublicKey {
}
// For use only in card export; returns the secret key.
public ECPrivateKey getECSecretKey()
public ECPrivateKey getSecurityTokenECSecretKey()
throws PgpGeneralException {
if (mPrivateKeyState == PRIVATE_KEY_STATE_LOCKED) {
throw new PgpGeneralException("Cannot get secret key attributes while key is locked.");