moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-12-25 00:18:51 -05:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:open-keychain/open-keychain

Browse Source
This commit is contained in:
Dominik Schürmann 2014-09-13 22:55:32 +02:00
commit efdfd2544d
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
View File

@ -375,11 +375,14 @@ public class PgpDecryptVerify {
while (it.hasNext()) { while (it.hasNext()) {
Object obj = it.next(); Object obj = it.next();
if (obj instanceof PGPPublicKeyEncryptedData) { if (obj instanceof PGPPublicKeyEncryptedData) {
log.add(LogLevel.WARN, LogType.MSG_DC_TRAIL_ASYM, 0); PGPPublicKeyEncryptedData encData = (PGPPublicKeyEncryptedData) obj;
long subKeyId = encData.getKeyID();
log.add(LogLevel.DEBUG, LogType.MSG_DC_TRAIL_ASYM, indent,
PgpKeyHelper.convertKeyIdToHex(subKeyId));
} else if (obj instanceof PGPPBEEncryptedData) { } else if (obj instanceof PGPPBEEncryptedData) {
log.add(LogLevel.WARN, LogType.MSG_DC_TRAIL_SYM, 0); log.add(LogLevel.WARN, LogType.MSG_DC_TRAIL_SYM, indent);
} else { } else {
log.add(LogLevel.WARN, LogType.MSG_DC_TRAIL_UNKNOWN, 0); log.add(LogLevel.WARN, LogType.MSG_DC_TRAIL_UNKNOWN, indent);
} }
} }

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
View File

@ -472,6 +472,10 @@ public class ProviderHelper {
// verify signatures from known private keys // verify signatures from known private keys
if (trustedKeys.indexOfKey(certId) >= 0) { if (trustedKeys.indexOfKey(certId) >= 0) {
CanonicalizedPublicKey trustedKey = trustedKeys.get(certId); CanonicalizedPublicKey trustedKey = trustedKeys.get(certId);
if (cert.isRevocation()) {
// skip for now
continue;
}
cert.init(trustedKey); cert.init(trustedKey);
if (cert.verifySignature(masterKey, rawUserId)) { if (cert.verifySignature(masterKey, rawUserId)) {
item.trustedCerts.add(cert); item.trustedCerts.add(cert);

2
OpenKeychain/src/main/res/values/strings.xml
View File

@ -798,7 +798,7 @@
<string name="msg_dc">"Starting decrypt operation…"</string> <string name="msg_dc">"Starting decrypt operation…"</string>
<string name="msg_dc_sym_skip">"Symmetric data not allowed, skipping…"</string> <string name="msg_dc_sym_skip">"Symmetric data not allowed, skipping…"</string>
<string name="msg_dc_sym">"Found block of symmetrically encrypted data"</string> <string name="msg_dc_sym">"Found block of symmetrically encrypted data"</string>
<string name="msg_dc_trail_asym">"Encountered trailing, asymmetrically encrypted data"</string> <string name="msg_dc_trail_asym">"Encountered trailing, asymmetrically encrypted data for key %s"</string>
<string name="msg_dc_trail_sym">"Encountered trailing, symmetrically encrypted data"</string> <string name="msg_dc_trail_sym">"Encountered trailing, symmetrically encrypted data"</string>
<string name="msg_dc_trail_unknown">"Encountered trailing data of unknown type"</string> <string name="msg_dc_trail_unknown">"Encountered trailing data of unknown type"</string>
<string name="msg_dc_unlocking">"Unlocking secret key"</string> <string name="msg_dc_unlocking">"Unlocking secret key"</string>