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

[bu...@apache.org]

Author: buildbot
Date: Tue Oct 15 05:25:54 2013
New Revision: 882668

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 Tue Oct 15 05:25:54 2013
@@ -3784,7 +3784,7 @@ 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="conf
 luenceTd"> <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 use fo
 r 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>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></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. </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="conf
 luenceTd"> <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 use fo
 r 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 values ar
 e defined in <tt>org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags</tt>; for example 2 (= TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128) </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) </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 encryp
 ted 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></tbody></table>
 </div>
 </div>
 
@@ -3793,7 +3793,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>CamelPGPDataForm
 atKeyUserid</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 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></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>CamelPGPDataForm
 atKeyUserid</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 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></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 Tue Oct 15 05:25:54 2013
@@ -14900,7 +14900,7 @@ 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="conf
 luenceTd"> <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 use fo
 r 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>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></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. </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="conf
 luenceTd"> <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 use fo
 r 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 values ar
 e defined in <tt>org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags</tt>; for example 2 (= TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128) </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) </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 encryp
 ted 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></tbody></table>
 </div>
 </div>
 
@@ -14909,7 +14909,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>CamelPGPDataForm
 atKeyUserid</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 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></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>CamelPGPDataForm
 atKeyUserid</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 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></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 Tue Oct 15 05:25:54 2013
@@ -315,7 +315,7 @@ 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="conf
 luenceTd"> <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 use fo
 r 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>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></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. </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="conf
 luenceTd"> <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 use fo
 r 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 values ar
 e defined in <tt>org.bouncycastle.bcpg.SymmetricKeyAlgorithmTags</tt>; for example 2 (= TRIPLE DES), 3 (= CAST5), 4 (= BLOWFISH), 6 (= DES), 7 (= AES_128) </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) </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 encryp
 ted 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></tbody></table>
 </div>
 </div>
 
@@ -324,7 +324,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>CamelPGPDataForm
 atKeyUserid</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 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></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>CamelPGPDataForm
 atKeyUserid</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 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></tbody></table>
 </div>