From 62f7bf62150b460ee2dfa14f2c45f6df40d55cc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 14 Aug 2014 15:58:26 +0200 Subject: move v3 key import prevention into canonicalization method --- .../sufficientlysecure/keychain/provider/ProviderHelper.java | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider') diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java index f8b2e549f..a13bb9c98 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java @@ -642,11 +642,6 @@ 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); @@ -739,11 +734,6 @@ 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); -- cgit v1.2.3