c0de/SmartPGP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update and fix OpenKeychain pactches

Browse Source
This commit is contained in:
Arnaud Fontaine 2016-10-25 16:36:34 +02:00
parent 4ebe36811d
commit 61798fc204
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
patches/open-keychain/0001-Support-of-OpenPGP-card-3.patch → patches/open-keychain/0001-Support-of-OpenPGP-card-v3.patch
View File

@ -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 <arnaud.fontaine@ssi.gouv.fr> From: Arnaud Fontaine <arnaud.fontaine@ssi.gouv.fr>
Date: Sat, 22 Oct 2016 22:22:15 +0200 Date: Tue, 25 Oct 2016 15:23:30 +0200
Subject: [PATCH 1/2] Support of OpenPGP card 3 Subject: [PATCH 1/3] Support of OpenPGP card v3
--- ---
.../operations/results/OperationResult.java | 1 + .../operations/results/OperationResult.java | 1 +
@ -2028,16 +2028,15 @@ index 0f0bf7a..241a21a 100644
Assert.assertArrayEquals( Assert.assertArrayEquals(
Hex.decode("4d820115" + // Header TL 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" +
"1212121212121212121212121212121212121212121212121212121212121212" "1212121212121212121212121212121212121212121212121212121212121212"
), ),
- SecurityTokenUtils.createPrivKeyTemplate(key2048, KeyType.AUTH, format)); - 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 @Test
-- --
2.1.4 2.9.3

9
patches/open-keychain/0002-Support-of-SmartPGP-secure-messaging-feature.patch → patches/open-keychain/0002-Support-of-SmartPGP-secure-messaging.patch
View File

@ -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 <arnaud.fontaine@ssi.gouv.fr> From: Arnaud Fontaine <arnaud.fontaine@ssi.gouv.fr>
Date: Sat, 22 Oct 2016 22:42:22 +0200 Date: Tue, 25 Oct 2016 15:24:31 +0200
Subject: [PATCH 2/2] Support of SmartPGP secure messaging feature Subject: [PATCH 2/3] Support of SmartPGP secure messaging
--- ---
OpenKeychain/src/main/AndroidManifest.xml | 5 + OpenKeychain/src/main/AndroidManifest.xml | 5 +
@ -2128,6 +2128,5 @@ index 9312997..8544487 100644
+ +
</PreferenceScreen> </PreferenceScreen>
-- --
2.1.4 2.9.3