You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2014/03/23 13:56:41 UTC
git commit: CAMEL-7320 Fixed the EOF issue in PGP Data Format with
thanks to Franz
Repository: camel
Updated Branches:
refs/heads/master aef0426c9 -> da06c0115
CAMEL-7320 Fixed the EOF issue in PGP Data Format with thanks to Franz
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/da06c011
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/da06c011
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/da06c011
Branch: refs/heads/master
Commit: da06c01151ed0f21b60ee53d7399ea46e0f94233
Parents: aef0426
Author: Willem Jiang <wi...@gmail.com>
Authored: Sun Mar 23 20:40:31 2014 +0800
Committer: Willem Jiang <wi...@gmail.com>
Committed: Sun Mar 23 20:40:31 2014 +0800
----------------------------------------------------------------------
.../apache/camel/converter/crypto/PGPKeyAccessDataFormat.java | 5 ++---
.../org/apache/camel/converter/crypto/PGPDataFormatTest.java | 1 +
2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/da06c011/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
index 179a4d1..db05c1c 100644
--- a/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
+++ b/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPKeyAccessDataFormat.java
@@ -398,12 +398,11 @@ public class PGPKeyAccessDataFormat extends ServiceSupport implements DataFormat
}
os.flush();
}
+ verifySignature(pgpFactory, signature);
} finally {
IOHelper.close(os, litData, encData, in);
}
-
- verifySignature(pgpFactory, signature);
-
+
if (cos != null) {
return cos.newStreamCache();
} else {
http://git-wip-us.apache.org/repos/asf/camel/blob/da06c011/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
index 98f9121..713e7b8 100644
--- a/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
+++ b/components/camel-crypto/src/test/java/org/apache/camel/converter/crypto/PGPDataFormatTest.java
@@ -85,6 +85,7 @@ public class PGPDataFormatTest extends AbstractPGPDataFormatTest {
encryptor.setSignaturePassword("Abcd1234");
encryptor.setKeyUserid("keyflag");
encryptor.setSignatureKeyUserid("keyflag");
+ encryptor.setIntegrity(false);
// the following keyring contains a primary key with KeyFlag "Certify" and a subkey for signing and a subkey for encryption
decryptor.setKeyFileName("org/apache/camel/component/crypto/secringSubKeys.gpg");