archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 07:14:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8286433: Cache certificates decoded from TLS session tickets

Browse source 
Reviewed-by: coffeys, xuelei
This commit is contained in:
Daniel Jeliński 2022-05-12 06:48:38 +00:00
parent 7567627f4a
commit 96d48f386b
2 changed files with 18 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/java.base/share/classes/sun/security/provider/X509Factory.java
View file

@ -98,15 +98,7 @@ public class X509Factory extends CertificateFactorySpi {
try {
byte[] encoding = readOneBlock(is);
if (encoding != null) {
X509CertImpl cert = getFromCache(certCache, encoding);
if (cert != null) {
return cert;
}
cert = new X509CertImpl(encoding);
addToCache(certCache, cert.getEncodedInternal(), cert);
// record cert details if necessary
commitEvent(cert);
return cert;
return cachedGetX509Cert(encoding);
} else {
throw new IOException("Empty input");
}
@ -116,6 +108,19 @@ public class X509Factory extends CertificateFactorySpi {
}
}
public static X509CertImpl cachedGetX509Cert(byte[] encoding)
throws CertificateException {
X509CertImpl cert = getFromCache(certCache, encoding);
if (cert != null) {
return cert;
}
cert = new X509CertImpl(encoding);
addToCache(certCache, cert.getEncodedInternal(), cert);
// record cert details if necessary
commitEvent(cert);
return cert;
}
/**
* Read from the stream until length bytes have been read or EOF has
* been reached. Return the number of bytes actually read.
@ -768,7 +773,7 @@ public class X509Factory extends CertificateFactorySpi {
return tag;
}
private void commitEvent(X509CertImpl info) {
private static void commitEvent(X509CertImpl info) {
X509CertificateEvent xce = new X509CertificateEvent();
if (xce.shouldCommit() || EventHelper.isLoggingSecurity()) {
PublicKey pKey = info.getPublicKey();

6
src/java.base/share/classes/sun/security/ssl/SSLSessionImpl.java
View file

@ -24,7 +24,7 @@
*/
package sun.security.ssl;
import sun.security.x509.X509CertImpl;
import sun.security.provider.X509Factory;
import java.io.IOException;
import java.math.BigInteger;
@ -459,7 +459,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
b = new byte[buf.getInt()];
buf.get(b);
try {
this.peerCerts[j] = new X509CertImpl(b);
this.peerCerts[j] = X509Factory.cachedGetX509Cert(b);
} catch (Exception e) {
throw new IOException(e);
}
@ -480,7 +480,7 @@ final class SSLSessionImpl extends ExtendedSSLSession {
b = new byte[buf.getInt()];
buf.get(b);
try {
this.localCerts[i] = new X509CertImpl(b);
this.localCerts[i] = X509Factory.cachedGetX509Cert(b);
} catch (Exception e) {
throw new IOException(e);
}