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 3e5104d3aa Cleanup comment as I believe this is good enough
3e5104d3aa is described below
commit 3e5104d3aa71981d920273b6c07984791dcb26e1
Author: remm <[email protected]>
AuthorDate: Mon Feb 19 16:50:13 2024 +0100
Cleanup comment as I believe this is good enough
---
.../tomcat/util/net/openssl/panama/OpenSSLContext.java | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
index e01e55da5b..f156f1951f 100644
--- a/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
+++ b/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLContext.java
@@ -1020,17 +1020,7 @@ public class OpenSSLContext implements
org.apache.tomcat.util.net.SSLContext {
pem_password_cb.allocate(new
PasswordCallback(keyPassToUse), contextArena),
MemorySegment.NULL);
if (MemorySegment.NULL.equals(cert) &&
- // Missing ERR_GET_REASON(ERR_peek_last_error())
- /*int ERR_GET_REASON(unsigned long errcode) {
- * if (ERR_SYSTEM_ERROR(errcode))
- * return errcode & ERR_SYSTEM_MASK;
- * return errcode & ERR_REASON_MASK;
- *}
- *# define ERR_SYSTEM_ERROR(errcode)
(((errcode) & ERR_SYSTEM_FLAG) != 0)
- *# define ERR_SYSTEM_FLAG
((unsigned int)INT_MAX + 1)
- *# define ERR_SYSTEM_MASK
((unsigned int)INT_MAX)
- *# define ERR_REASON_MASK 0X7FFFFF
- */
+ // EOF is accepted, then try again
((ERR_peek_last_error() & ERR_REASON_MASK()) ==
PEM_R_NO_START_LINE())) {
ERR_clear_error();
BIO_reset(certificateBIO);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
