Author: remm
Date: Wed Nov 7 16:45:48 2018
New Revision: 1846058
URL: http://svn.apache.org/viewvc?rev=1846058&view=rev
Log:
Storeconfig needs a get/set with a plain type and supports channel
interceptors, so keep a string value around.
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
tomcat/trunk/webapps/docs/changelog.xml
Modified:
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
URL:
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java?rev=1846058&r1=1846057&r2=1846058&view=diff
==============================================================================
---
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
(original)
+++
tomcat/trunk/java/org/apache/catalina/tribes/group/interceptors/EncryptInterceptor.java
Wed Nov 7 16:45:48 2018
@@ -58,6 +58,7 @@ public class EncryptInterceptor extends
private String providerName;
private String encryptionAlgorithm = DEFAULT_ENCRYPTION_ALGORITHM;
private byte[] encryptionKeyBytes;
+ private String encryptionKeyString;
private Cipher encryptionCipher;
private Cipher decryptionCipher;
@@ -196,6 +197,7 @@ public class EncryptInterceptor extends
* @param keyBytes The encryption key.
*/
public void setEncryptionKey(String keyBytes) {
+ this.encryptionKeyString = keyBytes;
if (null == keyBytes) {
setEncryptionKey((byte[])null);
} else {
@@ -222,6 +224,14 @@ public class EncryptInterceptor extends
return encryptionKeyBytes;
}
+ public String getEncryptionKeyString() {
+ return encryptionKeyString;
+ }
+
+ public void setEncryptionKeyString(String encryptionKeyString) {
+ setEncryptionKey(encryptionKeyString);
+ }
+
/**
* Sets the JCA provider name used for cryptographic activities.
*
Modified: tomcat/trunk/webapps/docs/changelog.xml
URL:
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1846058&r1=1846057&r2=1846058&view=diff
==============================================================================
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Wed Nov 7 16:45:48 2018
@@ -56,6 +56,10 @@
The default Servlet should not override a previously set content-type.
(remm)
</fix>
+ <fix>
+ Fix storeconfig for the cluster encryption interceptor key attribute.
+ (remm)
+ </fix>
</changelog>
</subsection>
</section>
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
