[PR] Added option to use custom SSLContext [tomcat]

2023-10-19 Thread via GitHub


Hakky54 opened a new pull request, #673:
URL: https://github.com/apache/tomcat/pull/673

   Tomcat supports configuring a custom SSLContext when configuring the 
`SSLHostConfigCertificate`. However the custom SSLContext gets ignored during 
the server startup and ssl initialization. A new SSLContext will be created and 
it will fail if not all properties are provided. A fix would be to use the 
custom SSLContext if it is present or fallback to the original behaviour of 
still creating it.
   
   I noticed this issue when I tried to configure the embedded tomcat server 
within Spring Boot. Although it is possible to configure it, it was just 
ignoring it which I found strange. I asked for help at stackoverflow here: 
https://stackoverflow.com/questions/77322685/configuring-ssl-programatically-of-a-spring-boot-server-with-tomcat-is-failing
   
   However after debugging the source code I found out the custom ssl is being 
ignored. I made the code adjustment and created local artificats to test with 
my project and it worked.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 67675] Tomcat and/or Java do not read encrypted private keys with DES-EDE3-CBC generated by openssl-req(1)

2023-10-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67675

--- Comment #13 from Remy Maucherat  ---
(In reply to Mark Thomas from comment #12)
> I think some refactoring will be required
> for the ASN.1 parser to make it more robust.

I managed to do OCSP using it (
https://github.com/apache/tomcat/blob/main/modules/openssl-foreign/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java#L1327
), but it really felt more like an accident !

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 67675] Tomcat and/or Java do not read encrypted private keys with DES-EDE3-CBC generated by openssl-req(1)

2023-10-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67675

--- Comment #12 from Mark Thomas  ---
My current assessment is that it is possible to handle this. We are going to
need to do a little more by hand. I think some refactoring will be required for
the ASN.1 parser to make it more robust.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 67675] Tomcat and/or Java do not read encrypted private keys with DES-EDE3-CBC generated by openssl-req(1)

2023-10-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67675

--- Comment #11 from Mark Thomas  ---
Yes. The steps to reproduce this worked perfectly. Thanks.

Currently working through the ASN.1 and relevant RFCs to see what we have and
if I can get Java to work with it.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 67793] FORM authenticator does not remember original max inactive interval in all use-cases

2023-10-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67793

Mircea Butmalai  changed:

   What|Removed |Added

  Component|Authentication  |Catalina

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 67675] Tomcat and/or Java do not read encrypted private keys with DES-EDE3-CBC generated by openssl-req(1)

2023-10-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67675

--- Comment #10 from Michael Osipov  ---
(In reply to Mark Thomas from comment #9)
> I'm working on this now. I don't think I am as far forward as you. It would
> be useful if I could see that code you have so far.
> 
> My current thinking is that the PKCS8 branch in PEMFile is going to need to
> parse the input and figure out of this is a format Java can handle and if
> not, handle it  somehow.

Mark, are my instructions sufficient to reproduce the issue on your end?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Buildbot failure in on tomcat-9.0.x

2023-10-19 Thread buildbot
Build status: BUILD FAILED: failed compile (failure)
Worker used: bb_worker2_ubuntu
URL: https://ci2.apache.org/#builders/37/builds/739
Blamelist: remm 
Build Text: failed compile (failure)
Status Detected: new failure
Build Source Stamp: [branch 9.0.x] 8c6525835eaca89010e6fe3a295d60312f0abc49


Steps:

  worker_preparation: 0

  git: 0

  shell: 0

  shell_1: 0

  shell_2: 0

  shell_3: 0

  shell_4: 0

  shell_5: 0

  compile: 1

  shell_6: 0

  shell_7: 0

  shell_8: 0

  shell_9: 0

  Rsync docs to nightlies.apache.org: 0

  shell_10: 0

  Rsync RAT to nightlies.apache.org: 0

  compile_1: 2

  shell_11: 0

  Rsync Logs to nightlies.apache.org: 0


-- ASF Buildbot


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 67675] Tomcat and/or Java do not read encrypted private keys with DES-EDE3-CBC generated by openssl-req(1)

2023-10-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67675

--- Comment #9 from Mark Thomas  ---
I'm working on this now. I don't think I am as far forward as you. It would be
useful if I could see that code you have so far.

My current thinking is that the PKCS8 branch in PEMFile is going to need to
parse the input and figure out of this is a format Java can handle and if not,
handle it  somehow.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 67793] FORM authenticator does not remember original max inactive interval in all use-cases

2023-10-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67793

Mircea Butmalai  changed:

   What|Removed |Added

  Component|Catalina|Authentication

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Add charset

2023-10-19 Thread Christopher Schultz

Michael,

On 10/19/23 08:30, Michael Osipov wrote:

On 2023/10/19 11:24:35 r...@apache.org wrote:

  java/org/apache/catalina/manager/StatusTransformer.java | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/manager/StatusTransformer.java 
b/java/org/apache/catalina/manager/StatusTransformer.java
index e4fbf52ca7..3aa7f3e922 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -53,7 +53,7 @@ public class StatusTransformer {
  } else if (mode == 1) {
  response.setContentType("text/xml;charset=" + Constants.CHARSET);
  } else if (mode == 2) {
-response.setContentType("application/json");
+response.setContentType("application/json;charset=" + 
Constants.CHARSET);


This is not much better. There is no charset parameter for JSON: 
https://www.iana.org/assignments/media-types/application/json


While you are technically right (charset is only a valid parameter for 
text/* MIME types), this does not hurt and in fact fixes a bunch of 
stupid clients.


We could use text/json;charset=utf8 if we wanted to, and we'd be in good 
company[1]... at least back in 2015 :)


-chris

[1] https://en.wikipedia.org/wiki/JSON#cite_ref-faraday-stack-pull-2_31-0

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Add charset

2023-10-19 Thread Rémy Maucherat
On Thu, Oct 19, 2023 at 2:30 PM Michael Osipov  wrote:
>
> On 2023/10/19 11:24:35 r...@apache.org wrote:
> >  java/org/apache/catalina/manager/StatusTransformer.java | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/java/org/apache/catalina/manager/StatusTransformer.java 
> > b/java/org/apache/catalina/manager/StatusTransformer.java
> > index e4fbf52ca7..3aa7f3e922 100644
> > --- a/java/org/apache/catalina/manager/StatusTransformer.java
> > +++ b/java/org/apache/catalina/manager/StatusTransformer.java
> > @@ -53,7 +53,7 @@ public class StatusTransformer {
> >  } else if (mode == 1) {
> >  response.setContentType("text/xml;charset=" + 
> > Constants.CHARSET);
> >  } else if (mode == 2) {
> > -response.setContentType("application/json");
> > +response.setContentType("application/json;charset=" + 
> > Constants.CHARSET);
>
> This is not much better. There is no charset parameter for JSON: 
> https://www.iana.org/assignments/media-types/application/json

If I use response.setCharacterEncoding(Constants.CHARSET) instead,
then it will do the same thing ultimately.

Rémy

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 10.1.x updated: Refactor decrement using a common method

2023-10-19 Thread remm
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 8d2ddd76ee Refactor decrement using a common method
8d2ddd76ee is described below

commit 8d2ddd76ee0b47c51cbae88d0d85de86a7daca4c
Author: remm 
AuthorDate: Thu Oct 19 14:50:05 2023 +0200

Refactor decrement using a common method
---
 .../org/apache/coyote/http2/Http2AsyncUpgradeHandler.java |  2 +-
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 15 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index d551bbc6ab..331c111428 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -157,7 +157,7 @@ public class Http2AsyncUpgradeHandler extends 
Http2UpgradeHandler {
 boolean active = state.isActive();
 state.sendReset();
 if (active) {
-activeRemoteStreamCount.decrementAndGet();
+decrementActiveRemoteStreamCount();
 }
 }
 
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index cfba750566..f6963e53cd 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -291,6 +291,11 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 }
 
 
+protected void decrementActiveRemoteStreamCount() {
+
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+}
+
+
 void processStreamOnContainerThread(StreamProcessor streamProcessor, 
SocketEvent event) {
 StreamRunnable streamRunnable = new StreamRunnable(streamProcessor, 
event);
 if (streamConcurrency == null) {
@@ -594,7 +599,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 boolean active = state.isActive();
 state.sendReset();
 if (active) {
-activeRemoteStreamCount.decrementAndGet();
+decrementActiveRemoteStreamCount();
 }
 }
 socketWrapper.write(true, rstFrame, 0, rstFrame.length);
@@ -839,7 +844,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 protected void sentEndOfStream(Stream stream) {
 stream.sentEndOfStream();
 if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 }
 }
 
@@ -1650,7 +1655,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 if (stream.receivedEndOfHeaders()) {
 
 if (localSettings.getMaxConcurrentStreams() < 
activeRemoteStreamCount.incrementAndGet()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 // Ignoring maxConcurrentStreams increases the 
overhead count
 increaseOverheadCount(FrameType.HEADERS);
 throw new StreamException(
@@ -1694,7 +1699,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 private void receivedEndOfStream(Stream stream) throws ConnectionException 
{
 stream.receivedEndOfStream();
 if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 }
 }
 
@@ -1720,7 +1725,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 boolean active = stream.isActive();
 stream.receiveReset(errorCode);
 if (active) {
-activeRemoteStreamCount.decrementAndGet();
+decrementActiveRemoteStreamCount();
 }
 }
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 8.5.x updated: Refactor decrement using a common method

2023-10-19 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new fa07aa1efe Refactor decrement using a common method
fa07aa1efe is described below

commit fa07aa1efe6c8c9ab56f05cf098a9a03b2906387
Author: remm 
AuthorDate: Thu Oct 19 14:50:05 2023 +0200

Refactor decrement using a common method
---
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 15 ++-
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 32298adb01..d449cced90 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -283,6 +283,11 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 }
 
 
+protected void decrementActiveRemoteStreamCount() {
+
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+}
+
+
 void processStreamOnContainerThread(StreamProcessor streamProcessor, 
SocketEvent event) {
 StreamRunnable streamRunnable = new StreamRunnable(streamProcessor, 
event);
 if (streamConcurrency == null) {
@@ -586,7 +591,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 boolean active = state.isActive();
 state.sendReset();
 if (active) {
-activeRemoteStreamCount.decrementAndGet();
+decrementActiveRemoteStreamCount();
 }
 }
 socketWrapper.write(true, rstFrame, 0, rstFrame.length);
@@ -830,7 +835,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 protected void sentEndOfStream(Stream stream) {
 stream.sentEndOfStream();
 if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 }
 }
 
@@ -1750,7 +1755,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 if (stream.receivedEndOfHeaders()) {
 
 if (localSettings.getMaxConcurrentStreams() < 
activeRemoteStreamCount.incrementAndGet()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 // Ignoring maxConcurrentStreams increases the 
overhead count
 increaseOverheadCount(FrameType.HEADERS);
 throw new StreamException(
@@ -1794,7 +1799,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 private void receivedEndOfStream(Stream stream) throws ConnectionException 
{
 stream.receivedEndOfStream();
 if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 }
 }
 
@@ -1820,7 +1825,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 boolean active = stream.isActive();
 stream.receiveReset(errorCode);
 if (active) {
-activeRemoteStreamCount.decrementAndGet();
+decrementActiveRemoteStreamCount();
 }
 }
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 9.0.x updated: Refactor decrement using a common method

2023-10-19 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 8c6525835e Refactor decrement using a common method
8c6525835e is described below

commit 8c6525835eaca89010e6fe3a295d60312f0abc49
Author: remm 
AuthorDate: Thu Oct 19 14:50:05 2023 +0200

Refactor decrement using a common method
---
 .../org/apache/coyote/http2/Http2AsyncUpgradeHandler.java |  2 +-
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 15 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 5c5c494357..0af0ce7ed7 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -156,7 +156,7 @@ public class Http2AsyncUpgradeHandler extends 
Http2UpgradeHandler {
 boolean active = state.isActive();
 state.sendReset();
 if (active) {
-activeRemoteStreamCount.decrementAndGet();
+decrementActiveRemoteStreamCount();
 }
 }
 
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index 5f92b983b4..85fca873f5 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -288,6 +288,11 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 }
 
 
+protected void decrementActiveRemoteStreamCount() {
+
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+}
+
+
 void processStreamOnContainerThread(StreamProcessor streamProcessor, 
SocketEvent event) {
 StreamRunnable streamRunnable = new StreamRunnable(streamProcessor, 
event);
 if (streamConcurrency == null) {
@@ -591,7 +596,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 boolean active = state.isActive();
 state.sendReset();
 if (active) {
-activeRemoteStreamCount.decrementAndGet();
+decrementActiveRemoteStreamCount();
 }
 }
 socketWrapper.write(true, rstFrame, 0, rstFrame.length);
@@ -834,7 +839,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 protected void sentEndOfStream(Stream stream) {
 stream.sentEndOfStream();
 if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 }
 }
 
@@ -1644,7 +1649,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 if (stream.receivedEndOfHeaders()) {
 
 if (localSettings.getMaxConcurrentStreams() < 
activeRemoteStreamCount.incrementAndGet()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 // Ignoring maxConcurrentStreams increases the 
overhead count
 increaseOverheadCount(FrameType.HEADERS);
 throw new StreamException(
@@ -1688,7 +1693,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 private void receivedEndOfStream(Stream stream) throws ConnectionException 
{
 stream.receivedEndOfStream();
 if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 }
 }
 
@@ -1714,7 +1719,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 boolean active = stream.isActive();
 stream.receiveReset(errorCode);
 if (active) {
-activeRemoteStreamCount.decrementAndGet();
+decrementActiveRemoteStreamCount();
 }
 }
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch main updated: Refactor decrement using a common method

2023-10-19 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new be535eefed Refactor decrement using a common method
be535eefed is described below

commit be535eefeda3754344092da6f30bb9bedacb582d
Author: remm 
AuthorDate: Thu Oct 19 14:50:05 2023 +0200

Refactor decrement using a common method
---
 .../org/apache/coyote/http2/Http2AsyncUpgradeHandler.java |  2 +-
 java/org/apache/coyote/http2/Http2UpgradeHandler.java | 15 ++-
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
index 138529c706..aeebade21b 100644
--- a/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2AsyncUpgradeHandler.java
@@ -157,7 +157,7 @@ public class Http2AsyncUpgradeHandler extends 
Http2UpgradeHandler {
 boolean active = state.isActive();
 state.sendReset();
 if (active) {
-activeRemoteStreamCount.decrementAndGet();
+decrementActiveRemoteStreamCount();
 }
 }
 
diff --git a/java/org/apache/coyote/http2/Http2UpgradeHandler.java 
b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
index af29ff3056..c38b3d9807 100644
--- a/java/org/apache/coyote/http2/Http2UpgradeHandler.java
+++ b/java/org/apache/coyote/http2/Http2UpgradeHandler.java
@@ -290,6 +290,11 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 }
 
 
+protected void decrementActiveRemoteStreamCount() {
+
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+}
+
+
 void processStreamOnContainerThread(StreamProcessor streamProcessor, 
SocketEvent event) {
 StreamRunnable streamRunnable = new StreamRunnable(streamProcessor, 
event);
 if (streamConcurrency == null) {
@@ -593,7 +598,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 boolean active = state.isActive();
 state.sendReset();
 if (active) {
-activeRemoteStreamCount.decrementAndGet();
+decrementActiveRemoteStreamCount();
 }
 }
 socketWrapper.write(true, rstFrame, 0, rstFrame.length);
@@ -820,7 +825,7 @@ class Http2UpgradeHandler extends AbstractStream implements 
InternalHttpUpgradeH
 protected void sentEndOfStream(Stream stream) {
 stream.sentEndOfStream();
 if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 }
 }
 
@@ -1573,7 +1578,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 if (stream.receivedEndOfHeaders()) {
 
 if (localSettings.getMaxConcurrentStreams() < 
activeRemoteStreamCount.incrementAndGet()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 // Ignoring maxConcurrentStreams increases the 
overhead count
 increaseOverheadCount(FrameType.HEADERS);
 throw new StreamException(
@@ -1617,7 +1622,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 private void receivedEndOfStream(Stream stream) throws ConnectionException 
{
 stream.receivedEndOfStream();
 if (!stream.isActive()) {
-
setConnectionTimeoutForStreamCount(activeRemoteStreamCount.decrementAndGet());
+decrementActiveRemoteStreamCount();
 }
 }
 
@@ -1643,7 +1648,7 @@ class Http2UpgradeHandler extends AbstractStream 
implements InternalHttpUpgradeH
 boolean active = stream.isActive();
 stream.receiveReset(errorCode);
 if (active) {
-activeRemoteStreamCount.decrementAndGet();
+decrementActiveRemoteStreamCount();
 }
 }
 }


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [tomcat] branch main updated: Add charset

2023-10-19 Thread Michael Osipov
On 2023/10/19 11:24:35 r...@apache.org wrote:
>  java/org/apache/catalina/manager/StatusTransformer.java | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/java/org/apache/catalina/manager/StatusTransformer.java 
> b/java/org/apache/catalina/manager/StatusTransformer.java
> index e4fbf52ca7..3aa7f3e922 100644
> --- a/java/org/apache/catalina/manager/StatusTransformer.java
> +++ b/java/org/apache/catalina/manager/StatusTransformer.java
> @@ -53,7 +53,7 @@ public class StatusTransformer {
>  } else if (mode == 1) {
>  response.setContentType("text/xml;charset=" + Constants.CHARSET);
>  } else if (mode == 2) {
> -response.setContentType("application/json");
> +response.setContentType("application/json;charset=" + 
> Constants.CHARSET);

This is not much better. There is no charset parameter for JSON: 
https://www.iana.org/assignments/media-types/application/json

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 67675] Tomcat and/or Java do not read encrypted private keys with DES-EDE3-CBC generated by openssl-req(1)

2023-10-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67675

--- Comment #8 from Christopher Schultz  ---
I have uncommitted work locally which can read the ASN.1 and perform the
decryption, which does not fail (i.e. no exception is thrown).

But when interpreting the decrypted data as an ASN.1 stream, the tags don't
make any sense. I haven't looked that hard at the outbound ASN.1 stream. My
immediate assumption was that it was complete garbage, but it's possible there
is a bug in the parser which is trying to interpret some byte as a tag-id when
it should be something else.

I'd be happy to look more into it.

The fun part with X9.52 is that it doesn't specify a padding method for the
cipher. Using PKCS5Padding results in a BadPaddingException from the Cipher,
and using Nopadding results in garbage ciphertext. :(

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 8.5.x updated: Add charset

2023-10-19 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/8.5.x by this push:
 new 925cb3a2d4 Add charset
925cb3a2d4 is described below

commit 925cb3a2d4be9d6d2c3a1ae844199fc67a673f36
Author: remm 
AuthorDate: Thu Oct 19 13:24:14 2023 +0200

Add charset
---
 java/org/apache/catalina/manager/StatusTransformer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/manager/StatusTransformer.java 
b/java/org/apache/catalina/manager/StatusTransformer.java
index 0d36a3e349..8c7805fbc8 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -54,7 +54,7 @@ public class StatusTransformer {
 } else if (mode == 1) {
 response.setContentType("text/xml;charset=" + Constants.CHARSET);
 } else if (mode == 2) {
-response.setContentType("application/json");
+response.setContentType("application/json;charset=" + 
Constants.CHARSET);
 }
 }
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 9.0.x updated: Add charset

2023-10-19 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch 9.0.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/9.0.x by this push:
 new 0e0a6adf10 Add charset
0e0a6adf10 is described below

commit 0e0a6adf10cc53cffd6f472f264877a5dd7cc87c
Author: remm 
AuthorDate: Thu Oct 19 13:24:14 2023 +0200

Add charset
---
 java/org/apache/catalina/manager/StatusTransformer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/manager/StatusTransformer.java 
b/java/org/apache/catalina/manager/StatusTransformer.java
index 54be3923fa..50761f0d1a 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -54,7 +54,7 @@ public class StatusTransformer {
 } else if (mode == 1) {
 response.setContentType("text/xml;charset=" + Constants.CHARSET);
 } else if (mode == 2) {
-response.setContentType("application/json");
+response.setContentType("application/json;charset=" + 
Constants.CHARSET);
 }
 }
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 10.1.x updated: Add charset

2023-10-19 Thread remm
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 33c3a5f8a0 Add charset
33c3a5f8a0 is described below

commit 33c3a5f8a04efd37ca72c326f75bb1ebe36902e7
Author: remm 
AuthorDate: Thu Oct 19 13:24:14 2023 +0200

Add charset
---
 java/org/apache/catalina/manager/StatusTransformer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/manager/StatusTransformer.java 
b/java/org/apache/catalina/manager/StatusTransformer.java
index e4fbf52ca7..3aa7f3e922 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -53,7 +53,7 @@ public class StatusTransformer {
 } else if (mode == 1) {
 response.setContentType("text/xml;charset=" + Constants.CHARSET);
 } else if (mode == 2) {
-response.setContentType("application/json");
+response.setContentType("application/json;charset=" + 
Constants.CHARSET);
 }
 }
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch main updated: Add charset

2023-10-19 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new c22b15fae5 Add charset
c22b15fae5 is described below

commit c22b15fae5a7b510fb624013f2008f7bbfafa986
Author: remm 
AuthorDate: Thu Oct 19 13:24:14 2023 +0200

Add charset
---
 java/org/apache/catalina/manager/StatusTransformer.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/java/org/apache/catalina/manager/StatusTransformer.java 
b/java/org/apache/catalina/manager/StatusTransformer.java
index e4fbf52ca7..3aa7f3e922 100644
--- a/java/org/apache/catalina/manager/StatusTransformer.java
+++ b/java/org/apache/catalina/manager/StatusTransformer.java
@@ -53,7 +53,7 @@ public class StatusTransformer {
 } else if (mode == 1) {
 response.setContentType("text/xml;charset=" + Constants.CHARSET);
 } else if (mode == 2) {
-response.setContentType("application/json");
+response.setContentType("application/json;charset=" + 
Constants.CHARSET);
 }
 }
 


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 67675] Tomcat and/or Java do not read encrypted private keys with DES-EDE3-CBC generated by openssl-req(1)

2023-10-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67675

--- Comment #7 from Mark Thomas  ---
Is that in your pem-utils project?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 66875] Handling async error after spring already handled error

2023-10-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=66875

--- Comment #7 from Mark Thomas  ---
The original bug report was for two JSON responses in a single HTTP response.
Is that still an issue?

Is the error message regarding the response already being committed in addition
to the multiple JSON bodies or instead of the mutliple JSON bodies?

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [PR] BZ 67818: SSL#setVerify()/SSLContext#setVerify() silently set undocum… [tomcat-native]

2023-10-19 Thread via GitHub


michael-o commented on PR #22:
URL: https://github.com/apache/tomcat-native/pull/22#issuecomment-1770439509

   > This comes from: 
[270c9ac](https://github.com/apache/tomcat-native/commit/270c9acf8651bb1cbb4fa884e12a9761c8293938)
 And in ssl.c it was added in one big commit. I don't know what the purpose was 
at that time.
   
   Maybe copied from mod_ssl back then or good will. We will never know...


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[tomcat] branch 10.1.x updated: Panama rename

2023-10-19 Thread remm
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 54c15e47e1 Panama rename
54c15e47e1 is described below

commit 54c15e47e118f730a24bdad867767d6919f7ac2e
Author: remm 
AuthorDate: Thu Oct 19 11:33:59 2023 +0200

Panama rename
---
 test/org/apache/coyote/http2/TestLargeUpload.java | 2 +-
 test/org/apache/tomcat/util/net/TestClientCert.java   | 2 +-
 test/org/apache/tomcat/util/net/TestClientCertTls13.java  | 2 +-
 test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java| 2 +-
 test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java  | 2 +-
 test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java | 2 +-
 test/org/apache/tomcat/util/net/TestSsl.java  | 2 +-
 test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java | 2 +-
 test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java 
b/test/org/apache/coyote/http2/TestLargeUpload.java
index ee921e90e1..1a8b48ffa0 100644
--- a/test/org/apache/coyote/http2/TestLargeUpload.java
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -58,7 +58,7 @@ public class TestLargeUpload extends Http2TestBase {
 "org.apache.tomcat.util.net.jsse.JSSEImplementation" });
 parameterSets.add(new Object[] { base[0], base[1], "OpenSSL", 
Boolean.TRUE,
 "org.apache.tomcat.util.net.openssl.OpenSSLImplementation" 
});
-parameterSets.add(new Object[] { base[0], base[1], 
"OpenSSL-Panama", Boolean.FALSE,
+parameterSets.add(new Object[] { base[0], base[1], "OpenSSL-FFM", 
Boolean.FALSE,
 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation" });
 }
 
diff --git a/test/org/apache/tomcat/util/net/TestClientCert.java 
b/test/org/apache/tomcat/util/net/TestClientCert.java
index 4a813307f8..38a9ef28c4 100644
--- a/test/org/apache/tomcat/util/net/TestClientCert.java
+++ b/test/org/apache/tomcat/util/net/TestClientCert.java
@@ -51,7 +51,7 @@ public class TestClientCert extends TomcatBaseTest {
 parameterSets.add(new Object[] {
 "OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
 parameterSets.add(new Object[] {
-"OpenSSL-Panama", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
+"OpenSSL-FFM", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
 
 return parameterSets;
 }
diff --git a/test/org/apache/tomcat/util/net/TestClientCertTls13.java 
b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
index 16c921cd88..a1c14a0c2d 100644
--- a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
+++ b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
@@ -56,7 +56,7 @@ public class TestClientCertTls13 extends TomcatBaseTest {
 parameterSets.add(new Object[] {
 "OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
 parameterSets.add(new Object[] {
-"OpenSSL-Panama", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
+"OpenSSL-FFM", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
 
 return parameterSets;
 }
diff --git a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java 
b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
index affee0dbd8..8ab28e4482 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
@@ -55,7 +55,7 @@ public class TestCustomSslTrustManager extends TomcatBaseTest 
{
 parameterSets.add(new Object[] {
 "OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
 parameterSets.add(new Object[] {
-"OpenSSL-Panama", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
+"OpenSSL-FFM", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
 
 return parameterSets;
 }
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java 
b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index 7b8e8373b1..d84c0b56a9 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -56,7 +56,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest {
 parameterSets.add(new Object[] {
 

[tomcat] branch main updated: Panama rename

2023-10-19 Thread remm
This is an automated email from the ASF dual-hosted git repository.

remm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/main by this push:
 new e555459cfa Panama rename
e555459cfa is described below

commit e555459cfab26d0d426921c5d655c45adeabf604
Author: remm 
AuthorDate: Thu Oct 19 11:33:59 2023 +0200

Panama rename
---
 test/org/apache/coyote/http2/TestLargeUpload.java | 2 +-
 test/org/apache/tomcat/util/net/TestClientCert.java   | 2 +-
 test/org/apache/tomcat/util/net/TestClientCertTls13.java  | 2 +-
 test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java| 2 +-
 test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java  | 2 +-
 test/org/apache/tomcat/util/net/TestSSLHostConfigIntegration.java | 2 +-
 test/org/apache/tomcat/util/net/TestSsl.java  | 2 +-
 test/org/apache/tomcat/websocket/TestWebSocketFrameClientSSL.java | 2 +-
 test/org/apache/tomcat/websocket/TestWsWebSocketContainerSSL.java | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/test/org/apache/coyote/http2/TestLargeUpload.java 
b/test/org/apache/coyote/http2/TestLargeUpload.java
index ee921e90e1..1a8b48ffa0 100644
--- a/test/org/apache/coyote/http2/TestLargeUpload.java
+++ b/test/org/apache/coyote/http2/TestLargeUpload.java
@@ -58,7 +58,7 @@ public class TestLargeUpload extends Http2TestBase {
 "org.apache.tomcat.util.net.jsse.JSSEImplementation" });
 parameterSets.add(new Object[] { base[0], base[1], "OpenSSL", 
Boolean.TRUE,
 "org.apache.tomcat.util.net.openssl.OpenSSLImplementation" 
});
-parameterSets.add(new Object[] { base[0], base[1], 
"OpenSSL-Panama", Boolean.FALSE,
+parameterSets.add(new Object[] { base[0], base[1], "OpenSSL-FFM", 
Boolean.FALSE,
 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation" });
 }
 
diff --git a/test/org/apache/tomcat/util/net/TestClientCert.java 
b/test/org/apache/tomcat/util/net/TestClientCert.java
index 4a813307f8..38a9ef28c4 100644
--- a/test/org/apache/tomcat/util/net/TestClientCert.java
+++ b/test/org/apache/tomcat/util/net/TestClientCert.java
@@ -51,7 +51,7 @@ public class TestClientCert extends TomcatBaseTest {
 parameterSets.add(new Object[] {
 "OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
 parameterSets.add(new Object[] {
-"OpenSSL-Panama", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
+"OpenSSL-FFM", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
 
 return parameterSets;
 }
diff --git a/test/org/apache/tomcat/util/net/TestClientCertTls13.java 
b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
index 16c921cd88..a1c14a0c2d 100644
--- a/test/org/apache/tomcat/util/net/TestClientCertTls13.java
+++ b/test/org/apache/tomcat/util/net/TestClientCertTls13.java
@@ -56,7 +56,7 @@ public class TestClientCertTls13 extends TomcatBaseTest {
 parameterSets.add(new Object[] {
 "OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
 parameterSets.add(new Object[] {
-"OpenSSL-Panama", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
+"OpenSSL-FFM", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
 
 return parameterSets;
 }
diff --git a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java 
b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
index c198af9891..6c6b929db6 100644
--- a/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
+++ b/test/org/apache/tomcat/util/net/TestCustomSslTrustManager.java
@@ -55,7 +55,7 @@ public class TestCustomSslTrustManager extends TomcatBaseTest 
{
 parameterSets.add(new Object[] {
 "OpenSSL", Boolean.TRUE, 
"org.apache.tomcat.util.net.openssl.OpenSSLImplementation"});
 parameterSets.add(new Object[] {
-"OpenSSL-Panama", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
+"OpenSSL-FFM", Boolean.FALSE, 
"org.apache.tomcat.util.net.openssl.panama.OpenSSLImplementation"});
 
 return parameterSets;
 }
diff --git a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java 
b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
index 7b8e8373b1..d84c0b56a9 100644
--- a/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
+++ b/test/org/apache/tomcat/util/net/TestSSLHostConfigCompat.java
@@ -56,7 +56,7 @@ public class TestSSLHostConfigCompat extends TomcatBaseTest {
 parameterSets.add(new Object[] {
 

Re: [PR] BZ 67818: SSL#setVerify()/SSLContext#setVerify() silently set undocum… [tomcat-native]

2023-10-19 Thread via GitHub


rmaucher commented on PR #22:
URL: https://github.com/apache/tomcat-native/pull/22#issuecomment-1770410908

   No testsuite failures from this change.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [PR] BZ 67818: SSL#setVerify()/SSLContext#setVerify() silently set undocum… [tomcat-native]

2023-10-19 Thread via GitHub


rmaucher commented on PR #22:
URL: https://github.com/apache/tomcat-native/pull/22#issuecomment-1770378729

   This comes from: 
https://github.com/apache/tomcat-native/commit/270c9acf8651bb1cbb4fa884e12a9761c8293938
   And in ssl.c it was added in one big commit.
   I don't know what the purpose was at that time.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [PR] BZ 66670: Add SSLHostConfig#certificateKeyPasswordFile and SSLHostConfig#certificateKeystorePasswordFile [tomcat]

2023-10-19 Thread via GitHub


rmaucher commented on PR #672:
URL: https://github.com/apache/tomcat/pull/672#issuecomment-1770353017

   The Java code is a lot simpler.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Which release artifact should we expect to be reproducible?

2023-10-19 Thread Mark Thomas

On 19/10/2023 03:17, Christopher Schultz wrote:



But Mark, if you missed my message from the 13th, you'll see that the 
problem is I'm running a slightly different version of Java than you 
are, and the exact spelling of the version string is causing the problem 
-- mostly in MANIFEST.MF files because the whole JRE's version string is 
present in there and not just the version number.


I did see that but filed it under the known issue that JARs that don't 
get passed through BND end up with the Ant and Java version numbers in 
the manifest. Fixing that is on my TODO list.


A recent commit of mine adds the release version number (only) to the 
build.properties.release file so it can be checked for a match in 
verify-release. I wonder if we should check the full version string to 
ensure the verifier and releaser are using the exact same versions. 
That's really the only way to prevent someone from attempting to verify 
a release and claiming it's not reproducible for not-relevant reasons.


With the current build process, I agree with you that we need to check 
the exact Java version used. I'm hopeful that with the manifest fix, we 
could create repeatable builds with different Java/Ant versions. How 
different I'm not sure. Hopefully within a major Java version. If we are 
lucky, across major Java versions.


And I'd very much like to make it next-to-trivial for anyone to verify a 
release build.


+1

Mark

-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



[Bug 67793] FORM authenticator does not remember original max inactive interval in all use-cases

2023-10-19 Thread bugzilla
https://bz.apache.org/bugzilla/show_bug.cgi?id=67793

Mircea Butmalai  changed:

   What|Removed |Added

 CC||mircea.butma...@radcom.ro

-- 
You are receiving this mail because:
You are the assignee for the bug.
-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [PR] Reinstantiate an updated patch for OpenSSL 1.1.1 on Windows [tomcat-native]

2023-10-19 Thread via GitHub


michael-o closed pull request #21: Reinstantiate an updated patch for OpenSSL 
1.1.1 on Windows
URL: https://github.com/apache/tomcat-native/pull/21


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: [PR] Reinstantiate an updated patch for OpenSSL 1.1.1 on Windows [tomcat-native]

2023-10-19 Thread via GitHub


michael-o commented on PR #21:
URL: https://github.com/apache/tomcat-native/pull/21#issuecomment-1770165905

   Closing this and will leave the branch for some time.


-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org

For queries about this service, please contact Infrastructure at:
us...@infra.apache.org


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org



Re: Which release artifact should we expect to be reproducible?

2023-10-19 Thread Emmanuel Bourg

Le 19/10/2023 à 04:17, Christopher Schultz a écrit :

But Mark, if you missed my message from the 13th, you'll see that the 
problem is I'm running a slightly different version of Java than you 
are, and the exact spelling of the version string is causing the problem 
-- mostly in MANIFEST.MF files because the whole JRE's version string is 
present in there and not just the version number.


I think the Created-By field should be removed. I've got a quick look at 
the 11.0.0-M13 release and the manifests in tomcat-*.jar don't have it. 
I've found it only in bootstrap.jar and in the external dependencies.


Emmanuel Bourg


-
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org