From 61798fc2042793e406188d66de6c59285eaf14dd Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine Date: Tue, 25 Oct 2016 16:36:34 +0200 Subject: [PATCH] Update and fix OpenKeychain pactches --- ....patch => 0001-Support-of-OpenPGP-card-v3.patch} | 13 ++++++------- ...0002-Support-of-SmartPGP-secure-messaging.patch} | 9 ++++----- 2 files changed, 10 insertions(+), 12 deletions(-) rename patches/open-keychain/{0001-Support-of-OpenPGP-card-3.patch => 0001-Support-of-OpenPGP-card-v3.patch} (99%) rename patches/open-keychain/{0002-Support-of-SmartPGP-secure-messaging-feature.patch => 0002-Support-of-SmartPGP-secure-messaging.patch} (99%) diff --git a/patches/open-keychain/0001-Support-of-OpenPGP-card-3.patch b/patches/open-keychain/0001-Support-of-OpenPGP-card-v3.patch similarity index 99% rename from patches/open-keychain/0001-Support-of-OpenPGP-card-3.patch rename to patches/open-keychain/0001-Support-of-OpenPGP-card-v3.patch index 65c3c1f..bbf0b32 100644 --- a/patches/open-keychain/0001-Support-of-OpenPGP-card-3.patch +++ b/patches/open-keychain/0001-Support-of-OpenPGP-card-v3.patch @@ -1,7 +1,7 @@ -From 2b1a2125d2bbed20c1e97eefae7c1665fb24bc75 Mon Sep 17 00:00:00 2001 +From d9952df66529b9dda611c4433ba09dfff3509633 Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine -Date: Sat, 22 Oct 2016 22:22:15 +0200 -Subject: [PATCH 1/2] Support of OpenPGP card 3 +Date: Tue, 25 Oct 2016 15:23:30 +0200 +Subject: [PATCH 1/3] Support of OpenPGP card v3 --- .../operations/results/OperationResult.java | 1 + @@ -2028,16 +2028,15 @@ index 0f0bf7a..241a21a 100644 Assert.assertArrayEquals( Hex.decode("4d820115" + // Header TL -@@ -160,7 +160,7 @@ public class SecurityTokenUtilsTest extends Mockito { +@@ -160,8 +160,7 @@ public class SecurityTokenUtilsTest extends Mockito { "1212121212121212121212121212121212121212121212121212121212121212" + "1212121212121212121212121212121212121212121212121212121212121212" ), - SecurityTokenUtils.createPrivKeyTemplate(key2048, KeyType.AUTH, format)); -+ SecurityTokenUtils.createRSAPrivKeyTemplate(key2048, KeyType.AUTH, new RSAKeyFormat(exp.bitCount(), 2048, RSAKeyFormat.RSAAlgorithmFormat.STANDARD))); ++ SecurityTokenUtils.createRSAPrivKeyTemplate(key2048, KeyType.AUTH, new RSAKeyFormat(2048, exp.bitLength(), RSAKeyFormat.RSAAlgorithmFormat.STANDARD))); } @Test -- -2.1.4 - +2.9.3 diff --git a/patches/open-keychain/0002-Support-of-SmartPGP-secure-messaging-feature.patch b/patches/open-keychain/0002-Support-of-SmartPGP-secure-messaging.patch similarity index 99% rename from patches/open-keychain/0002-Support-of-SmartPGP-secure-messaging-feature.patch rename to patches/open-keychain/0002-Support-of-SmartPGP-secure-messaging.patch index f858071..7cdd77e 100644 --- a/patches/open-keychain/0002-Support-of-SmartPGP-secure-messaging-feature.patch +++ b/patches/open-keychain/0002-Support-of-SmartPGP-secure-messaging.patch @@ -1,7 +1,7 @@ -From 220fc35de449e03a11d5d836af0de0909d691e16 Mon Sep 17 00:00:00 2001 +From 48f470b2c5bd58b6727031db8cbadf1ad8cd0650 Mon Sep 17 00:00:00 2001 From: Arnaud Fontaine -Date: Sat, 22 Oct 2016 22:42:22 +0200 -Subject: [PATCH 2/2] Support of SmartPGP secure messaging feature +Date: Tue, 25 Oct 2016 15:24:31 +0200 +Subject: [PATCH 2/3] Support of SmartPGP secure messaging --- OpenKeychain/src/main/AndroidManifest.xml | 5 + @@ -2128,6 +2128,5 @@ index 9312997..8544487 100644 + -- -2.1.4 - +2.9.3