You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2014/01/04 14:27:31 UTC
[1/2] git commit: CAMEL-7052: Fixed pgp dataformat to be able to
enrypy with subkey. Thanks to Daniel Gredler for the patch.
Updated Branches:
refs/heads/camel-2.12.x 0e4b1458f -> b4cc59e9f
refs/heads/master 10a5f1b3a -> 65bd851f7
CAMEL-7052: Fixed pgp dataformat to be able to enrypy with subkey. Thanks to Daniel Gredler for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/65bd851f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/65bd851f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/65bd851f
Branch: refs/heads/master
Commit: 65bd851f74e8dd35e3b2fd1993bac8a94516c5d0
Parents: 10a5f1b
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jan 4 14:30:44 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jan 4 14:30:44 2014 +0100
----------------------------------------------------------------------
.../converter/crypto/PGPDataFormatUtil.java | 58 +++++++++++++-------
1 file changed, 39 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/65bd851f/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
index 2ea229b..0753957 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
@@ -23,7 +23,9 @@ import java.security.NoSuchProviderException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.util.IOHelper;
@@ -111,6 +113,7 @@ public final class PGPDataFormatUtil {
}
}
+ @SuppressWarnings("unchecked")
private static PGPPrivateKey findPrivateKeyWithKeyId(InputStream keyringInput, long keyid, String passphrase,
PGPPassphraseAccessor passphraseAccessor, String provider) throws IOException, PGPException {
PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(keyringInput));
@@ -118,23 +121,23 @@ public final class PGPDataFormatUtil {
Object data = i.next();
if (data instanceof PGPSecretKeyRing) {
PGPSecretKeyRing keyring = (PGPSecretKeyRing) data;
- PGPSecretKey secKey = keyring.getSecretKey();
- if (secKey != null && keyid == secKey.getKeyID()) {
- if (passphrase == null && passphraseAccessor != null) {
- // get passphrase from accessor
- @SuppressWarnings("unchecked")
- Iterator<String> userIDs = secKey.getUserIDs();
- while (passphrase == null && userIDs.hasNext()) {
- passphrase = passphraseAccessor.getPassphrase(userIDs.next());
+ for (Iterator<PGPSecretKey> secKeys = keyring.getSecretKeys(); secKeys.hasNext();) {
+ PGPSecretKey secKey = secKeys.next();
+ if (secKey != null && keyid == secKey.getKeyID()) {
+ if (passphrase == null && passphraseAccessor != null) {
+ // get passphrase from accessor
+ Iterator<String> userIDs = secKey.getUserIDs();
+ while (passphrase == null && userIDs.hasNext()) {
+ passphrase = passphraseAccessor.getPassphrase(userIDs.next());
+ }
+ }
+ if (passphrase != null) {
+ PGPPrivateKey privateKey = secKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider(provider).build(
+ passphrase.toCharArray()));
+ if (privateKey != null) {
+ return privateKey;
+ }
}
- }
- if (passphrase == null) {
- continue;
- }
- PGPPrivateKey privateKey = secKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider(provider).build(
- passphrase.toCharArray()));
- if (privateKey != null) {
- return privateKey;
}
}
}
@@ -190,11 +193,11 @@ public final class PGPDataFormatUtil {
for (Iterator<PGPPublicKeyRing> keyRingIter = pgpSec.getKeyRings(); keyRingIter.hasNext();) {
PGPPublicKeyRing keyRing = keyRingIter.next();
+ Set<String> keyUserIds = getUserIds(keyRing);
for (Iterator<PGPPublicKey> keyIter = keyRing.getPublicKeys(); keyIter.hasNext();) {
PGPPublicKey key = keyIter.next();
- for (Iterator<String> iterator = key.getUserIDs(); iterator.hasNext();) {
- String keyUserId = iterator.next();
- for (String userid : userids) {
+ for (String userid : userids) {
+ for (String keyUserId : keyUserIds) {
if (keyUserId != null && keyUserId.contains(userid)) {
if (forEncryption && key.isEncryptionKey()) {
result.add(key);
@@ -210,6 +213,23 @@ public final class PGPDataFormatUtil {
return result;
}
+ // Within a public keyring, the master / primary key has the user ID(s); the subkeys don't
+ // have user IDs associated directly to them, but the subkeys are implicitly associated with
+ // the user IDs of the master / primary key. The master / primary key is the first key in
+ // the keyring, and the rest of the keys are subkeys.
+ // http://bouncy-castle.1462172.n4.nabble.com/How-to-find-PGP-subkeys-td1465289.html
+ @SuppressWarnings("unchecked")
+ private static Set<String> getUserIds(PGPPublicKeyRing keyRing) {
+ Set<String> userIds = new LinkedHashSet<String>(3);
+ for (Iterator<PGPPublicKey> keyIter = keyRing.getPublicKeys(); keyIter.hasNext();) {
+ PGPPublicKey key = keyIter.next();
+ for (Iterator<String> iterator = key.getUserIDs(); iterator.hasNext();) {
+ userIds.add(iterator.next());
+ }
+ }
+ return userIds;
+ }
+
private static boolean isSignatureKey(PGPPublicKey key) {
int algorithm = key.getAlgorithm();
return algorithm == RSA_GENERAL || algorithm == RSA_SIGN || algorithm == DSA || algorithm == ECDSA || algorithm == ELGAMAL_GENERAL;
[2/2] git commit: CAMEL-7052: Fixed pgp dataformat to be able to
enrypy with subkey. Thanks to Daniel Gredler for the patch.
Posted by da...@apache.org.
CAMEL-7052: Fixed pgp dataformat to be able to enrypy with subkey. Thanks to Daniel Gredler for the patch.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b4cc59e9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b4cc59e9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b4cc59e9
Branch: refs/heads/camel-2.12.x
Commit: b4cc59e9f70396b0b85a7f5021eabf7d84d8eef6
Parents: 0e4b145
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Jan 4 14:30:44 2014 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Jan 4 14:31:08 2014 +0100
----------------------------------------------------------------------
.../converter/crypto/PGPDataFormatUtil.java | 58 +++++++++++++-------
1 file changed, 39 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b4cc59e9/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
index 2ea229b..0753957 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPDataFormatUtil.java
@@ -23,7 +23,9 @@ import java.security.NoSuchProviderException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
+import java.util.LinkedHashSet;
import java.util.List;
+import java.util.Set;
import org.apache.camel.CamelContext;
import org.apache.camel.util.IOHelper;
@@ -111,6 +113,7 @@ public final class PGPDataFormatUtil {
}
}
+ @SuppressWarnings("unchecked")
private static PGPPrivateKey findPrivateKeyWithKeyId(InputStream keyringInput, long keyid, String passphrase,
PGPPassphraseAccessor passphraseAccessor, String provider) throws IOException, PGPException {
PGPSecretKeyRingCollection pgpSec = new PGPSecretKeyRingCollection(PGPUtil.getDecoderStream(keyringInput));
@@ -118,23 +121,23 @@ public final class PGPDataFormatUtil {
Object data = i.next();
if (data instanceof PGPSecretKeyRing) {
PGPSecretKeyRing keyring = (PGPSecretKeyRing) data;
- PGPSecretKey secKey = keyring.getSecretKey();
- if (secKey != null && keyid == secKey.getKeyID()) {
- if (passphrase == null && passphraseAccessor != null) {
- // get passphrase from accessor
- @SuppressWarnings("unchecked")
- Iterator<String> userIDs = secKey.getUserIDs();
- while (passphrase == null && userIDs.hasNext()) {
- passphrase = passphraseAccessor.getPassphrase(userIDs.next());
+ for (Iterator<PGPSecretKey> secKeys = keyring.getSecretKeys(); secKeys.hasNext();) {
+ PGPSecretKey secKey = secKeys.next();
+ if (secKey != null && keyid == secKey.getKeyID()) {
+ if (passphrase == null && passphraseAccessor != null) {
+ // get passphrase from accessor
+ Iterator<String> userIDs = secKey.getUserIDs();
+ while (passphrase == null && userIDs.hasNext()) {
+ passphrase = passphraseAccessor.getPassphrase(userIDs.next());
+ }
+ }
+ if (passphrase != null) {
+ PGPPrivateKey privateKey = secKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider(provider).build(
+ passphrase.toCharArray()));
+ if (privateKey != null) {
+ return privateKey;
+ }
}
- }
- if (passphrase == null) {
- continue;
- }
- PGPPrivateKey privateKey = secKey.extractPrivateKey(new JcePBESecretKeyDecryptorBuilder().setProvider(provider).build(
- passphrase.toCharArray()));
- if (privateKey != null) {
- return privateKey;
}
}
}
@@ -190,11 +193,11 @@ public final class PGPDataFormatUtil {
for (Iterator<PGPPublicKeyRing> keyRingIter = pgpSec.getKeyRings(); keyRingIter.hasNext();) {
PGPPublicKeyRing keyRing = keyRingIter.next();
+ Set<String> keyUserIds = getUserIds(keyRing);
for (Iterator<PGPPublicKey> keyIter = keyRing.getPublicKeys(); keyIter.hasNext();) {
PGPPublicKey key = keyIter.next();
- for (Iterator<String> iterator = key.getUserIDs(); iterator.hasNext();) {
- String keyUserId = iterator.next();
- for (String userid : userids) {
+ for (String userid : userids) {
+ for (String keyUserId : keyUserIds) {
if (keyUserId != null && keyUserId.contains(userid)) {
if (forEncryption && key.isEncryptionKey()) {
result.add(key);
@@ -210,6 +213,23 @@ public final class PGPDataFormatUtil {
return result;
}
+ // Within a public keyring, the master / primary key has the user ID(s); the subkeys don't
+ // have user IDs associated directly to them, but the subkeys are implicitly associated with
+ // the user IDs of the master / primary key. The master / primary key is the first key in
+ // the keyring, and the rest of the keys are subkeys.
+ // http://bouncy-castle.1462172.n4.nabble.com/How-to-find-PGP-subkeys-td1465289.html
+ @SuppressWarnings("unchecked")
+ private static Set<String> getUserIds(PGPPublicKeyRing keyRing) {
+ Set<String> userIds = new LinkedHashSet<String>(3);
+ for (Iterator<PGPPublicKey> keyIter = keyRing.getPublicKeys(); keyIter.hasNext();) {
+ PGPPublicKey key = keyIter.next();
+ for (Iterator<String> iterator = key.getUserIDs(); iterator.hasNext();) {
+ userIds.add(iterator.next());
+ }
+ }
+ return userIds;
+ }
+
private static boolean isSignatureKey(PGPPublicKey key) {
int algorithm = key.getAlgorithm();
return algorithm == RSA_GENERAL || algorithm == RSA_SIGN || algorithm == DSA || algorithm == ECDSA || algorithm == ELGAMAL_GENERAL;