Repository: camel Updated Branches: refs/heads/master 5a4d715a1 -> 955658b8d
Adding some encryption options to the PGP DataFormat component Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/955658b8 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/955658b8 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/955658b8 Branch: refs/heads/master Commit: 955658b8d7805460df6d5cf7804c92f9fe00c067 Parents: 5a4d715 Author: Colm O hEigeartaigh <cohei...@apache.org> Authored: Wed Jan 7 15:27:35 2015 +0000 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Wed Jan 7 15:27:35 2015 +0000 ---------------------------------------------------------------------- .../camel/model/dataformat/PGPDataFormat.java | 26 ++++++++++++++++++++ .../crypto/PGPKeyAccessDataFormat.java | 2 +- 2 files changed, 27 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/955658b8/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java index 86ef57f..1959b48 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/PGPDataFormat.java @@ -46,6 +46,10 @@ public class PGPDataFormat extends DataFormatDefinition { private Boolean integrity; @XmlAttribute private String provider; + @XmlAttribute + private Integer algorithm; + @XmlAttribute + private Integer compressionAlgorithm; public PGPDataFormat() { super("pgp"); @@ -71,6 +75,12 @@ public class PGPDataFormat extends DataFormatDefinition { if (provider != null) { setProperty(camelContext, dataFormat, "provider", provider); } + if (algorithm != null) { + setProperty(camelContext, dataFormat, "algorithm", algorithm); + } + if (compressionAlgorithm != null) { + setProperty(camelContext, dataFormat, "compressionAlgorithm", compressionAlgorithm); + } } public Boolean getArmored() { @@ -109,6 +119,22 @@ public class PGPDataFormat extends DataFormatDefinition { return password; } + public Integer getAlgorithm() { + return algorithm; + } + + public void setAlgorithm(Integer algorithm) { + this.algorithm = algorithm; + } + + public Integer getCompressionAlgorithm() { + return compressionAlgorithm; + } + + public void setCompressionAlgorithm(Integer compressionAlgorithm) { + this.compressionAlgorithm = compressionAlgorithm; + } + public void setPassword(String password) { this.password = password; } http://git-wip-us.apache.org/repos/asf/camel/blob/955658b8/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 8558ee9..1a3d8da 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 @@ -157,7 +157,7 @@ public class PGPKeyAccessDataFormat extends ServiceSupport implements DataFormat private boolean armored; // for encryption private boolean integrity = true; // for encryption - private int hashAlgorithm = HashAlgorithmTags.SHA1; // for encryption + private int hashAlgorithm = HashAlgorithmTags.SHA1; // for signature private int algorithm = SymmetricKeyAlgorithmTags.CAST5; // for encryption
