This is an automated email from the ASF dual-hosted git repository.
remm pushed a commit to branch 10.1.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
The following commit(s) were added to refs/heads/10.1.x by this push:
new 42fac36278 Add size limit for OCSP responses
42fac36278 is described below
commit 42fac362783d93682baf5b6990165e7c4d822b98
Author: remm <[email protected]>
AuthorDate: Fri Feb 6 23:39:49 2026 +0100
Add size limit for OCSP responses
Based on code submitted by Chenjp.
---
java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java | 4 ++++
webapps/docs/changelog.xml | 4 ++++
2 files changed, 8 insertions(+)
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index bad194282f..5f236c1429 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -97,6 +97,7 @@ public final class OpenSSLEngine extends SSLEngine implements
SSLUtil.ProtocolIn
private static final int MAX_CIPHERTEXT_LENGTH = MAX_COMPRESSED_LENGTH +
1024;
// 15 minutes aligns with JSSE
private static final int OCSP_MAX_SKEW = 60 * 15;
+ private static final int OCSP_MAX_RESPONSE_SIZE = 64 * 1024;
// Header (5) + Data (2^14) + Compression (1024) + Encryption (1024) + MAC
(20) + Padding (256)
private static final int MAX_ENCRYPTED_PACKET_LENGTH =
MAX_CIPHERTEXT_LENGTH + 5 + 20 + 256;
@@ -1353,6 +1354,9 @@ public final class OpenSSLEngine extends SSLEngine
implements SSLUtil.ProtocolIn
int read;
byte[] responseBuf = new byte[1024];
while ((read = is.read(responseBuf)) > 0) {
+ if (baos.size() > OCSP_MAX_RESPONSE_SIZE) {
+ return V_OCSP_CERTSTATUS_UNKNOWN();
+ }
baos.write(responseBuf, 0, read);
}
byte[] responseData = baos.toByteArray();
diff --git a/webapps/docs/changelog.xml b/webapps/docs/changelog.xml
index 4ad4eacf28..0cdc9d2808 100644
--- a/webapps/docs/changelog.xml
+++ b/webapps/docs/changelog.xml
@@ -113,6 +113,10 @@
compressed when compression is enabled. Based on pull request
<pr>914</pr> by Long9725. (markt)
</add>
+ <fix>
+ Add size limit for OCSP responses. Based on code submitted by Chenjp.
+ (remm)
+ </fix>
</changelog>
</subsection>
<subsection name="Jasper">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
