camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From build...@apache.org
Subject svn commit: r887784 - in /websites/production/camel/content: book-dataformat-appendix.html book-in-one-page.html cache/main.pageCache crypto.html
Date Sat, 23 Nov 2013 10:19:52 GMT
Author: buildbot
Date: Sat Nov 23 10:19:52 2013
New Revision: 887784

Log:
Production update by buildbot for camel

Modified:
    websites/production/camel/content/book-dataformat-appendix.html
    websites/production/camel/content/book-in-one-page.html
    websites/production/camel/content/cache/main.pageCache
    websites/production/camel/content/crypto.html

Modified: websites/production/camel/content/book-dataformat-appendix.html
==============================================================================
--- websites/production/camel/content/book-dataformat-appendix.html (original)
+++ websites/production/camel/content/book-dataformat-appendix.html Sat Nov 23 10:19:52 2013
@@ -3784,8 +3784,9 @@ from("direct:key-in-header-decrypt").unm
 
 <h3><a shape="rect" name="BookDataFormatAppendix-PGPDataFormatOptions"></a>PGPDataFormat Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The userid of the key in the PGP keyring. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Password used when opening the private key (not used for encryption). </td></tr><tr><td colspan="1" rowspan="1" c
 lass="confluenceTd"> <tt>keyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Filename of the keyring; must be accessible as a classpath resource (but you can specify a location in the file system by using the "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>encryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; encryption keyring; you can not set the keyFileName and encryptionKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="con
 fluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional userid of the key in the PGP keyring to use for signing (during encryption) or signature verification (during decryption) .</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signaturePassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional password used when opening the private key used for signing (during encryption). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional filename of the keyring to us
 e for signing (during encryption) or for signature verification (during decryption); must be accessible as a classpath resource (but you can specify a location in the file system by using the "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; signature keyring; you can not set the signatureKeyFileName and signatureKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>algorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>SymmetricKeyAlgorithmTags.CAST5</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>; symmetric key encryption algorithm; possible val
 ues are defined in <tt>org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags</tt>; for example 2 (= TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128). Only relevant for encrypting. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>hashAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>HashAlgorithmTags.SHA1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: signature hash algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.HashAlgorithmTags</tt>; for example 2 (= SHA1), 8 (= SHA256), 9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant for signing. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>armored</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="con
 fluenceTd"> This option will cause PGP to base64 encode the encrypted text, making it available for copy/paste, etc. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>integrity</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Adds an integrity check/sign into the encryption file. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>passphraseAccessor</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; provides passphrase
 s corresponding to user Ids.  If no passpharase can be found from the option <tt>password</tt> or <tt>signaturePassword</tt> and from the headers <tt>CamelPGPDataFormatKeyPassword</tt> or <tt>CamelPGPDataFormatSignatureKeyPassword</tt> then the passphrase is feteched from the passphrase accessor. You provide a bean which implements the interface <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a>. A default implementation is given by <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessorDefault.java" rel="nofollow">PGPPassphraseAccessorDefault</a>.  The passphrase accessor is especially useful in the decrypt case; see chapter 'PGP Decrypting/Verifying of Messages Encrypted/Signed by D
 ifferent Private/Public Keys'  below. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The userid of the key in the PGP keyring used during encryption. See also option <tt>keyUserids</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyUserids</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>List&lt;String&gt;</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: PGP allows t
 o encrypt the symmetric key by several asymmetric public receiver keys. You can specify here the User IDs of several public keys contained in the PGP keyring.  If you just have one User ID, then you can also use the option <tt>keyUserid</tt>. The User ID specified in <tt>keyUserid</tt> and the User IDs in <tt>keyUserids</tt> will be merged together and the corresponding public keys will be used for the encryption. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Password used when opening the private key (not used for encryption). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><t
 d colspan="1" rowspan="1" class="confluenceTd"> Filename of the keyring; must be accessible as a classpath resource (but you can specify a location in the file system by using the "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>encryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; encryption keyring; you can not set the keyFileName and encryptionKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional userid of the key in the PGP keyring to use for signing (during encrypti
 on) or signature verification (during decryption) .</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signaturePassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional password used when opening the private key used for signing (during encryption). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional filename of the keyring to use for signing (during encryption) or for signature verification (during decryption); must be accessible as a classpath resource (but you can specify a location in the file system by using t
 he "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; signature keyring; you can not set the signatureKeyFileName and signatureKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>algorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>SymmetricKeyAlgorithmTags.CAST5</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>; symmetric key encryption algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags</tt>; for example 2 (= TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128). Only relevant for encryptin
 g. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>compressionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CompressionAlgorithmTags.ZIP</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>; compression algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.CompressionAlgorithmTags</tt>; for example 0 (= UNCOMPRESSED), 1 (= ZIP), 2 (= ZLIB), 3 (= BZIP2). Only relevant for encrypting. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>hashAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>HashAlgorithmTags.SHA1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: signature hash algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.HashAlgorithmTags</tt>; for example 2 (= 
 SHA1), 8 (= SHA256), 9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant for signing. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>armored</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> This option will cause PGP to base64 encode the encrypted text, making it available for copy/paste, etc. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>integrity</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Adds an integrity check/sign into the encryption file. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>passphraseAccessor</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href
 ="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; provides passphrases corresponding to user Ids.  If no passpharase can be found from the option <tt>password</tt> or <tt>signaturePassword</tt> and from the headers <tt>CamelPGPDataFormatKeyPassword</tt> or <tt>CamelPGPDataFormatSignatureKeyPassword</tt> then the passphrase is feteched from the passphrase accessor. You provide a bean which implements the interface <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a>. A default implementation is given by <a shape="rect" class="ex
 ternal-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessorDefault.java" rel="nofollow">PGPPassphraseAccessorDefault</a>.  The passphrase accessor is especially useful in the decrypt case; see chapter 'PGP Decrypting/Verifying of Messages Encrypted/Signed by Different Private/Public Keys'  below. </td></tr></tbody></table>
 </div>
+
 </div>
 
 <h3><a shape="rect" name="BookDataFormatAppendix-PGPDataFormatMessageHeaders"></a>PGPDataFormat Message Headers</h3>
@@ -3793,7 +3794,7 @@ from("direct:key-in-header-decrypt").unm
 
 <div class="confluenceTableSmall"></div>
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the encryption keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFo
 rmatKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the userid of the key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; password used when opening the private key; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the signature keyring; will override existing setting directly on the PGPDataForma
 t. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the signature keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the userid of the signature key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; passwo
 rd used when opening the signature private key; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; symmetric key encryption algorithm; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureHashAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; signature hash algorithm; will override existing setting directly on the PGPDataFormat. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the encryption keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFo
 rmatKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the User ID of the key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyUserids</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">  <tt>List&lt;String&gt;</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: the User IDs of the key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; password used when opening the private key; will override existing setting directly on the
  PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the signature keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the signature keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the userid
  of the signature key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; password used when opening the signature private key; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; symmetric key encryption algorithm; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureHashAlgorithm</tt> </td><td colspan="1" rowspan="1" class=
 "confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; signature hash algorithm; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatCompressionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; compression algorithm; will override existing setting directly on the PGPDataFormat. </td></tr></tbody></table>
 </div>
 
 

Modified: websites/production/camel/content/book-in-one-page.html
==============================================================================
--- websites/production/camel/content/book-in-one-page.html (original)
+++ websites/production/camel/content/book-in-one-page.html Sat Nov 23 10:19:52 2013
@@ -14969,8 +14969,9 @@ from("direct:key-in-header-decrypt").unm
 
 <h3><a shape="rect" name="BookInOnePage-PGPDataFormatOptions"></a>PGPDataFormat Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The userid of the key in the PGP keyring. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Password used when opening the private key (not used for encryption). </td></tr><tr><td colspan="1" rowspan="1" c
 lass="confluenceTd"> <tt>keyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Filename of the keyring; must be accessible as a classpath resource (but you can specify a location in the file system by using the "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>encryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; encryption keyring; you can not set the keyFileName and encryptionKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="con
 fluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional userid of the key in the PGP keyring to use for signing (during encryption) or signature verification (during decryption) .</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signaturePassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional password used when opening the private key used for signing (during encryption). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional filename of the keyring to us
 e for signing (during encryption) or for signature verification (during decryption); must be accessible as a classpath resource (but you can specify a location in the file system by using the "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; signature keyring; you can not set the signatureKeyFileName and signatureKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>algorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>SymmetricKeyAlgorithmTags.CAST5</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>; symmetric key encryption algorithm; possible val
 ues are defined in <tt>org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags</tt>; for example 2 (= TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128). Only relevant for encrypting. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>hashAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>HashAlgorithmTags.SHA1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: signature hash algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.HashAlgorithmTags</tt>; for example 2 (= SHA1), 8 (= SHA256), 9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant for signing. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>armored</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="con
 fluenceTd"> This option will cause PGP to base64 encode the encrypted text, making it available for copy/paste, etc. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>integrity</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Adds an integrity check/sign into the encryption file. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>passphraseAccessor</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; provides passphrase
 s corresponding to user Ids.  If no passpharase can be found from the option <tt>password</tt> or <tt>signaturePassword</tt> and from the headers <tt>CamelPGPDataFormatKeyPassword</tt> or <tt>CamelPGPDataFormatSignatureKeyPassword</tt> then the passphrase is feteched from the passphrase accessor. You provide a bean which implements the interface <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a>. A default implementation is given by <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessorDefault.java" rel="nofollow">PGPPassphraseAccessorDefault</a>.  The passphrase accessor is especially useful in the decrypt case; see chapter 'PGP Decrypting/Verifying of Messages Encrypted/Signed by D
 ifferent Private/Public Keys'  below. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The userid of the key in the PGP keyring used during encryption. See also option <tt>keyUserids</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyUserids</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>List&lt;String&gt;</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: PGP allows t
 o encrypt the symmetric key by several asymmetric public receiver keys. You can specify here the User IDs of several public keys contained in the PGP keyring.  If you just have one User ID, then you can also use the option <tt>keyUserid</tt>. The User ID specified in <tt>keyUserid</tt> and the User IDs in <tt>keyUserids</tt> will be merged together and the corresponding public keys will be used for the encryption. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Password used when opening the private key (not used for encryption). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><t
 d colspan="1" rowspan="1" class="confluenceTd"> Filename of the keyring; must be accessible as a classpath resource (but you can specify a location in the file system by using the "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>encryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; encryption keyring; you can not set the keyFileName and encryptionKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional userid of the key in the PGP keyring to use for signing (during encrypti
 on) or signature verification (during decryption) .</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signaturePassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional password used when opening the private key used for signing (during encryption). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional filename of the keyring to use for signing (during encryption) or for signature verification (during decryption); must be accessible as a classpath resource (but you can specify a location in the file system by using t
 he "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; signature keyring; you can not set the signatureKeyFileName and signatureKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>algorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>SymmetricKeyAlgorithmTags.CAST5</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>; symmetric key encryption algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags</tt>; for example 2 (= TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128). Only relevant for encryptin
 g. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>compressionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CompressionAlgorithmTags.ZIP</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>; compression algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.CompressionAlgorithmTags</tt>; for example 0 (= UNCOMPRESSED), 1 (= ZIP), 2 (= ZLIB), 3 (= BZIP2). Only relevant for encrypting. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>hashAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>HashAlgorithmTags.SHA1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: signature hash algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.HashAlgorithmTags</tt>; for example 2 (= 
 SHA1), 8 (= SHA256), 9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant for signing. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>armored</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> This option will cause PGP to base64 encode the encrypted text, making it available for copy/paste, etc. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>integrity</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Adds an integrity check/sign into the encryption file. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>passphraseAccessor</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href
 ="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; provides passphrases corresponding to user Ids.  If no passpharase can be found from the option <tt>password</tt> or <tt>signaturePassword</tt> and from the headers <tt>CamelPGPDataFormatKeyPassword</tt> or <tt>CamelPGPDataFormatSignatureKeyPassword</tt> then the passphrase is feteched from the passphrase accessor. You provide a bean which implements the interface <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a>. A default implementation is given by <a shape="rect" class="ex
 ternal-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessorDefault.java" rel="nofollow">PGPPassphraseAccessorDefault</a>.  The passphrase accessor is especially useful in the decrypt case; see chapter 'PGP Decrypting/Verifying of Messages Encrypted/Signed by Different Private/Public Keys'  below. </td></tr></tbody></table>
 </div>
+
 </div>
 
 <h3><a shape="rect" name="BookInOnePage-PGPDataFormatMessageHeaders"></a>PGPDataFormat Message Headers</h3>
@@ -14978,7 +14979,7 @@ from("direct:key-in-header-decrypt").unm
 
 <div class="confluenceTableSmall"></div>
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the encryption keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFo
 rmatKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the userid of the key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; password used when opening the private key; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the signature keyring; will override existing setting directly on the PGPDataForma
 t. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the signature keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the userid of the signature key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; passwo
 rd used when opening the signature private key; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; symmetric key encryption algorithm; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureHashAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; signature hash algorithm; will override existing setting directly on the PGPDataFormat. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the encryption keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFo
 rmatKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the User ID of the key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyUserids</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">  <tt>List&lt;String&gt;</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: the User IDs of the key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; password used when opening the private key; will override existing setting directly on the
  PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the signature keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the signature keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the userid
  of the signature key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; password used when opening the signature private key; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; symmetric key encryption algorithm; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureHashAlgorithm</tt> </td><td colspan="1" rowspan="1" class=
 "confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; signature hash algorithm; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatCompressionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; compression algorithm; will override existing setting directly on the PGPDataFormat. </td></tr></tbody></table>
 </div>
 
 

Modified: websites/production/camel/content/cache/main.pageCache
==============================================================================
Binary files - no diff available.

Modified: websites/production/camel/content/crypto.html
==============================================================================
--- websites/production/camel/content/crypto.html (original)
+++ websites/production/camel/content/crypto.html Sat Nov 23 10:19:52 2013
@@ -315,8 +315,9 @@ from("direct:key-in-header-decrypt").unm
 
 <h3><a shape="rect" name="Crypto-PGPDataFormatOptions"></a>PGPDataFormat Options</h3>
 <div class="confluenceTableSmall"><div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The userid of the key in the PGP keyring. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Password used when opening the private key (not used for encryption). </td></tr><tr><td colspan="1" rowspan="1" c
 lass="confluenceTd"> <tt>keyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Filename of the keyring; must be accessible as a classpath resource (but you can specify a location in the file system by using the "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>encryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; encryption keyring; you can not set the keyFileName and encryptionKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="con
 fluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional userid of the key in the PGP keyring to use for signing (during encryption) or signature verification (during decryption) .</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signaturePassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional password used when opening the private key used for signing (during encryption). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional filename of the keyring to us
 e for signing (during encryption) or for signature verification (during decryption); must be accessible as a classpath resource (but you can specify a location in the file system by using the "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; signature keyring; you can not set the signatureKeyFileName and signatureKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>algorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>SymmetricKeyAlgorithmTags.CAST5</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>; symmetric key encryption algorithm; possible val
 ues are defined in <tt>org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags</tt>; for example 2 (= TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128). Only relevant for encrypting. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>hashAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>HashAlgorithmTags.SHA1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: signature hash algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.HashAlgorithmTags</tt>; for example 2 (= SHA1), 8 (= SHA256), 9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant for signing. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>armored</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="con
 fluenceTd"> This option will cause PGP to base64 encode the encrypted text, making it available for copy/paste, etc. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>integrity</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Adds an integrity check/sign into the encryption file. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>passphraseAccessor</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; provides passphrase
 s corresponding to user Ids.  If no passpharase can be found from the option <tt>password</tt> or <tt>signaturePassword</tt> and from the headers <tt>CamelPGPDataFormatKeyPassword</tt> or <tt>CamelPGPDataFormatSignatureKeyPassword</tt> then the passphrase is feteched from the passphrase accessor. You provide a bean which implements the interface <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a>. A default implementation is given by <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessorDefault.java" rel="nofollow">PGPPassphraseAccessorDefault</a>.  The passphrase accessor is especially useful in the decrypt case; see chapter 'PGP Decrypting/Verifying of Messages Encrypted/Signed by D
 ifferent Private/Public Keys'  below. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Default </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> The userid of the key in the PGP keyring used during encryption. See also option <tt>keyUserids</tt>. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyUserids</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>List&lt;String&gt;</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: PGP allows t
 o encrypt the symmetric key by several asymmetric public receiver keys. You can specify here the User IDs of several public keys contained in the PGP keyring.  If you just have one User ID, then you can also use the option <tt>keyUserid</tt>. The User ID specified in <tt>keyUserid</tt> and the User IDs in <tt>keyUserids</tt> will be merged together and the corresponding public keys will be used for the encryption. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>password</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Password used when opening the private key (not used for encryption). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>keyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><t
 d colspan="1" rowspan="1" class="confluenceTd"> Filename of the keyring; must be accessible as a classpath resource (but you can specify a location in the file system by using the "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>encryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; encryption keyring; you can not set the keyFileName and encryptionKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional userid of the key in the PGP keyring to use for signing (during encrypti
 on) or signature verification (during decryption) .</td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signaturePassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional password used when opening the private key used for signing (during encryption). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; optional filename of the keyring to use for signing (during encryption) or for signature verification (during decryption); must be accessible as a classpath resource (but you can specify a location in the file system by using t
 he "file:" prefix). </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>signatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.1</b>; signature keyring; you can not set the signatureKeyFileName and signatureKeyRing at the same time. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>algorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>SymmetricKeyAlgorithmTags.CAST5</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>; symmetric key encryption algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags</tt>; for example 2 (= TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128). Only relevant for encryptin
 g. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>compressionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CompressionAlgorithmTags.ZIP</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>; compression algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.CompressionAlgorithmTags</tt>; for example 0 (= UNCOMPRESSED), 1 (= ZIP), 2 (= ZLIB), 3 (= BZIP2). Only relevant for encrypting. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>hashAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>HashAlgorithmTags.SHA1</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: signature hash algorithm; possible values are defined in <tt>org.bouncycastle.bcpg.HashAlgorithmTags</tt>; for example 2 (= 
 SHA1), 8 (= SHA256), 9 (= SHA384), 10 (= SHA512), 11 (=SHA224). Only relevant for signing. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>armored</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>false</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> This option will cause PGP to base64 encode the encrypted text, making it available for copy/paste, etc. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>integrity</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>boolean</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>true</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> Adds an integrity check/sign into the encryption file. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>passphraseAccessor</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <a shape="rect" class="external-link" href
 ="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>null</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; provides passphrases corresponding to user Ids.  If no passpharase can be found from the option <tt>password</tt> or <tt>signaturePassword</tt> and from the headers <tt>CamelPGPDataFormatKeyPassword</tt> or <tt>CamelPGPDataFormatSignatureKeyPassword</tt> then the passphrase is feteched from the passphrase accessor. You provide a bean which implements the interface <a shape="rect" class="external-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessor.java" rel="nofollow">PGPPassphraseAccessor</a>. A default implementation is given by <a shape="rect" class="ex
 ternal-link" href="https://github.com/apache/camel/blob/master/components/camel-crypto/src/main/java/org/apache/camel/converter/crypto/PGPPassphraseAccessorDefault.java" rel="nofollow">PGPPassphraseAccessorDefault</a>.  The passphrase accessor is especially useful in the decrypt case; see chapter 'PGP Decrypting/Verifying of Messages Encrypted/Signed by Different Private/Public Keys'  below. </td></tr></tbody></table>
 </div>
+
 </div>
 
 <h3><a shape="rect" name="Crypto-PGPDataFormatMessageHeaders"></a>PGPDataFormat Message Headers</h3>
@@ -324,7 +325,7 @@ from("direct:key-in-header-decrypt").unm
 
 <div class="confluenceTableSmall"></div>
 <div class="table-wrap">
-<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the encryption keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFo
 rmatKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the userid of the key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; password used when opening the private key; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the signature keyring; will override existing setting directly on the PGPDataForma
 t. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the signature keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the userid of the signature key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; passwo
 rd used when opening the signature private key; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; symmetric key encryption algorithm; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureHashAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; signature hash algorithm; will override existing setting directly on the PGPDataFormat. </td></tr></tbody></table>
+<table class="confluenceTable"><tbody><tr><th colspan="1" rowspan="1" class="confluenceTh"> Name </th><th colspan="1" rowspan="1" class="confluenceTh"> Type </th><th colspan="1" rowspan="1" class="confluenceTh"> Description </th></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the encryption keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFo
 rmatKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the User ID of the key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyUserids</tt> </td><td colspan="1" rowspan="1" class="confluenceTd">  <tt>List&lt;String&gt;</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since camel 2.12.2</b>: the User IDs of the key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; password used when opening the private key; will override existing setting directly on the
  PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyFileName</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; filename of the signature keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyRing</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>byte[]</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.1</b>; the signature keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyUserid</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; the userid
  of the signature key in the PGP keyring; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureKeyPassword</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>String</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.11.0</b>; password used when opening the signature private key; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatEncryptionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; symmetric key encryption algorithm; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatSignatureHashAlgorithm</tt> </td><td colspan="1" rowspan="1" class=
 "confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; signature hash algorithm; will override existing setting directly on the PGPDataFormat. </td></tr><tr><td colspan="1" rowspan="1" class="confluenceTd"> <tt>CamelPGPDataFormatCompressionAlgorithm</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <tt>int</tt> </td><td colspan="1" rowspan="1" class="confluenceTd"> <b>Since Camel 2.12.2</b>; compression algorithm; will override existing setting directly on the PGPDataFormat. </td></tr></tbody></table>
 </div>
 
 



Mime
View raw message