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 e28fdd3 Remove duplicate parser
e28fdd3 is described below
commit e28fdd3e611ac7c057eda906570ee0cb61542e56
Author: remm <[email protected]>
AuthorDate: Mon Nov 15 20:28:54 2021 +0100
Remove duplicate parser
---
modules/openssl-java17/pom.xml | 2 +-
.../tomcat/util/net/openssl/panama/Asn1Parser.java | 105 ---------------------
.../util/net/openssl/panama/OpenSSLEngine.java | 1 +
3 files changed, 2 insertions(+), 106 deletions(-)
diff --git a/modules/openssl-java17/pom.xml b/modules/openssl-java17/pom.xml
index d9180b1..b4affb6 100644
--- a/modules/openssl-java17/pom.xml
+++ b/modules/openssl-java17/pom.xml
@@ -32,7 +32,7 @@
<packaging>jar</packaging>
<properties>
- <tomcat.version>10.0.12</tomcat.version>
+ <tomcat.version>10.0.13</tomcat.version>
</properties>
<dependencies>
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/Asn1Parser.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/Asn1Parser.java
deleted file mode 100644
index ec32d48..0000000
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/Asn1Parser.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.tomcat.util.net.openssl.panama;
-
-import java.math.BigInteger;
-
-import org.apache.tomcat.util.res.StringManager;
-
-/**
- * This is a very basic ASN.1 parser that provides the limited functionality
- * required by Tomcat. It is a long way from a complete parser.
- *
- * TODO: Consider extending this parser and refactoring the SpnegoTokenFixer to
- * use it.
- */
-public class Asn1Parser {
-
- private static final StringManager sm =
StringManager.getManager(Asn1Parser.class);
-
- private final byte[] source;
-
- private int pos = 0;
-
-
- public Asn1Parser(byte[] source) {
- this.source = source;
- }
-
-
- public boolean eof() {
- return pos == source.length;
- }
-
-
- public int peekTag() {
- return source[pos] & 0xFF;
- }
-
-
- public void parseTag(int tag) {
- int value = next();
- if (value != tag) {
- throw new
IllegalArgumentException(sm.getString("asn1Parser.tagMismatch",
- Integer.valueOf(tag), Integer.valueOf(value)));
- }
- }
-
-
- public void parseFullLength() {
- int len = parseLength();
- if (len + pos != source.length) {
- throw new
IllegalArgumentException(sm.getString("asn1Parser.lengthInvalid",
- Integer.valueOf(len), Integer.valueOf(source.length -
pos)));
- }
- }
-
-
- public int parseLength() {
- int len = next();
- if (len > 127) {
- int bytes = len - 128;
- len = 0;
- for (int i = 0; i < bytes; i++) {
- len = len << 8;
- len = len + next();
- }
- }
- return len;
- }
-
-
- public BigInteger parseInt() {
- parseTag(0x02);
- int len = parseLength();
- byte[] val = new byte[len];
- System.arraycopy(source, pos, val, 0, len);
- pos += len;
- return new BigInteger(val);
- }
-
-
- public void parseBytes(byte[] dest) {
- System.arraycopy(source, pos, dest, 0, dest.length);
- pos += dest.length;
- }
-
-
- private int next() {
- return source[pos++] & 0xFF;
- }
-}
diff --git
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
index 62ff9f2..eb9f074 100644
---
a/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
+++
b/modules/openssl-java17/src/main/java/org/apache/tomcat/util/net/openssl/panama/OpenSSLEngine.java
@@ -61,6 +61,7 @@ import static org.apache.tomcat.util.openssl.openssl_h.*;
import org.apache.juli.logging.Log;
import org.apache.juli.logging.LogFactory;
+import org.apache.tomcat.util.buf.Asn1Parser;
import org.apache.tomcat.util.buf.ByteBufferUtils;
import org.apache.tomcat.util.net.Constants;
import org.apache.tomcat.util.net.SSLUtil;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
