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

Do not import v3 keys, they are insecure!

Browse Source
This commit is contained in:
Dominik Schürmann
2014-08-14 15:42:02 +02:00
parent 225e248293
commit 0a1de8deea
4 changed files with 17 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -642,6 +642,11 @@ public class ProviderHelper {
log(LogLevel.START, LogType.MSG_IP, PgpKeyHelper.convertKeyIdToHex(masterKeyId));
mIndent += 1;
if (publicRing.getVersion() <= 3) {
log(LogLevel.ERROR, LogType.MSG_IP_V3_KEY);
return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog);
}
if (publicRing.isSecret()) {
log(LogLevel.ERROR, LogType.MSG_IP_BAD_TYPE_SECRET);
return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog);
@@ -734,6 +739,11 @@ public class ProviderHelper {
log(LogLevel.START, LogType.MSG_IS, PgpKeyHelper.convertKeyIdToHex(masterKeyId));
mIndent += 1;
if (secretRing.getVersion() <= 3) {
log(LogLevel.ERROR, LogType.MSG_IP_V3_KEY);
return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog);
}
if ( ! secretRing.isSecret()) {
log(LogLevel.ERROR, LogType.MSG_IS_BAD_TYPE_PUBLIC);
return new SaveKeyringResult(SaveKeyringResult.RESULT_ERROR, mLog);