aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-13 22:02:11 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-13 22:02:11 +0200
commitbcbf96e61bed69588ef4542e0c282e12896e8ae7 (patch)
tree412ddc8a8eb18e1892cc806fe67d9b0eac24249c /OpenKeychain
parentbe199b844c106fd5247e511fdf9bc0a9e0b67839 (diff)
parent3b8c171ecb21e4cf842131777e560b3186021637 (diff)
downloadopen-keychain-bcbf96e61bed69588ef4542e0c282e12896e8ae7.tar.gz
open-keychain-bcbf96e61bed69588ef4542e0c282e12896e8ae7.tar.bz2
open-keychain-bcbf96e61bed69588ef4542e0c282e12896e8ae7.zip
Merge branch 'master' of github.com:open-keychain/open-keychain
Diffstat (limited to 'OpenKeychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java4
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResultParcel.java1
-rw-r--r--OpenKeychain/src/main/res/values/strings.xml1
3 files changed, 6 insertions, 0 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
index fe4e7ffa7..d64c3ea55 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -438,6 +438,10 @@ public class UncachedKeyRing {
badCerts += 1;
continue;
}
+ // warn user if the signature was made with bad encoding
+ if (!cert.verifySignature(masterKey, userId)) {
+ log.add(LogLevel.WARN, LogType.MSG_KC_UID_WARN_ENCODING, indent);
+ }
} catch (PgpGeneralException e) {
log.add(LogLevel.WARN, LogType.MSG_KC_UID_BAD_ERR,
indent, userId);
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResultParcel.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResultParcel.java
index 1a77d96d3..46823a24d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResultParcel.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/service/results/OperationResultParcel.java
@@ -339,6 +339,7 @@ public class OperationResultParcel implements Parcelable {
MSG_KC_UID_REVOKE_DUP (R.string.msg_kc_uid_revoke_dup),
MSG_KC_UID_REVOKE_OLD (R.string.msg_kc_uid_revoke_old),
MSG_KC_UID_REMOVE (R.string.msg_kc_uid_remove),
+ MSG_KC_UID_WARN_ENCODING (R.string.msg_kc_uid_warn_encoding),
// keyring consolidation
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 378d68c21..9e9b47c7c 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -661,6 +661,7 @@
<string name="msg_kc_uid_no_cert">"No valid self-certificate found for user id '%s', removing from ring"</string>
<string name="msg_kc_uid_remove">"Removing invalid user id '%s'"</string>
<string name="msg_kc_uid_dup">"Removing duplicate user id '%s'. The secret key contained two of them. This may result in missing certificates!"</string>
+ <string name="msg_kc_uid_warn_encoding">"User id does not verify as UTF-8!"</string>
<!-- Keyring merging log entries -->
<string name="msg_mg_error_secret_dummy">"New public subkey found, but secret subkey dummy generation is not supported!"</string>