PeterCxy/open-keychain
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases 1 Wiki Activity

Merge pull request #2122 from af-anssi/fix-secure-messaging

Browse source 
fix issue #2049
This commit is contained in:
Dominik Schürmann 2017-06-13 12:08:21 +02:00 committed by GitHub
parent 258ba1fa1f 745d2a0988
commit 3057eaa813
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/OpenPgpCapabilities.java
View file

@ -108,7 +108,16 @@ public class OpenPgpCapabilities {
mHasKeyImport = (v[0] & MASK_KEY_IMPORT) != 0;
mAttriburesChangable = (v[0] & MASK_ATTRIBUTES_CHANGABLE) != 0;
mSMAESKeySize = (v[1] == 1) ? 16 : 32;
mSMAESKeySize = 0;
switch(v[1]) {
case 1:
mSMAESKeySize = 16;
break;
case 2:
mSMAESKeySize = 32;
break;
}
mMaxCmdLen = (v[6] << 8) + v[7];
mMaxRspLen = (v[8] << 8) + v[9];
@ -142,6 +151,10 @@ public class OpenPgpCapabilities {
return mSMAESKeySize;
}
public boolean isHasAESSM() {
return isHasSM() && ((mSMAESKeySize == 16) || (mSMAESKeySize == 32));
}
public int getMaxCmdLen() {
return mMaxCmdLen;
}

2
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/securitytoken/SecurityTokenHelper.java
View file

@ -206,7 +206,7 @@ public class SecurityTokenHelper {
mPw1ValidatedForDecrypt = false;
mPw3Validated = false;
if (mOpenPgpCapabilities.isHasSM()) {
if (mOpenPgpCapabilities.isHasAESSM()) {
try {
SCP11bSecureMessaging.establish(this, ctx);
} catch (SecureMessagingException e) {