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

password cache introduced, not cleared yet.

Browse Source
This commit is contained in:
Thialfihar
2010-05-15 15:19:56 +00:00
parent cab78bf4c1
commit 363dcb62b8
10 changed files with 129 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/org/thialfihar/android/apg/Apg.java
View File

@@ -155,7 +155,8 @@ public class Apg {
PublicKeys.KEY_DATA,
PublicKeys.WHO_ID, };
private static String mPassPhrase = null;
private static HashMap<Long, CachedPassPhrase> mPassPhraseCache =
new HashMap<Long, CachedPassPhrase>();
public static class GeneralException extends Exception {
static final long serialVersionUID = 0xf812773342L;
@@ -271,12 +272,28 @@ public class Apg {
}
}
public static void setPassPhrase(String passPhrase) {
mPassPhrase = passPhrase;
public static void setCachedPassPhrase(long keyId, String passPhrase) {
mPassPhraseCache.put(keyId, new CachedPassPhrase(new Date().getTime(), passPhrase));
}
public static String getPassPhrase() {
return mPassPhrase;
public static String getCachedPassPhrase(long keyId) {
long realId = keyId;
if (realId != Id.key.symmetric) {
PGPSecretKeyRing keyRing = findSecretKeyRing(keyId);
if (keyRing == null) {
return null;
}
PGPSecretKey masterKey = getMasterKey(keyRing);
if (masterKey == null) {
return null;
}
realId = masterKey.getKeyID();
}
CachedPassPhrase cpp = mPassPhraseCache.get(realId);
if (cpp == null) {
return null;
}
return cpp.passPhrase;
}
public static PGPSecretKey createKey(Context context,
@@ -1440,7 +1457,7 @@ public class Apg {
}
if (secretKey == null) {
return 0;
return Id.key.none;
}
return secretKey.getKeyID();