Author: remm
Date: Mon Mar 14 11:03:18 2016
New Revision: 1734916
URL: http://svn.apache.org/viewvc?rev=1734916&view=rev
Log:
The Base64 encoder used here adds an extra \n, causing an error loading the
key. OpenSSL support is still broken however.
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Modified:
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
URL:
http://svn.apache.org/viewvc/tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java?rev=1734916&r1=1734915&r2=1734916&view=diff
==============================================================================
---
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
(original)
+++
tomcat/tc8.5.x/trunk/java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java
Mon Mar 14 11:03:18 2016
@@ -327,7 +327,11 @@ public class OpenSSLContext implements o
X509Certificate certificate =
keyManager.getCertificateChain(alias)[0];
PrivateKey key = keyManager.getPrivateKey(alias);
StringBuilder sb = new StringBuilder(BEGIN_KEY);
- sb.append(BASE64_ENCODER.encodeToString(key.getEncoded()));
+ String encoded =
BASE64_ENCODER.encodeToString(key.getEncoded());
+ if (encoded.endsWith("\n")) {
+ encoded = encoded.substring(0, encoded.length() - 1);
+ }
+ sb.append(encoded);
sb.append(END_KEY);
SSLContext.setCertificateRaw(ctx, certificate.getEncoded(),
sb.toString().getBytes(StandardCharsets.US_ASCII), SSL.SSL_AIDX_RSA);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
