[tomcat] 02/02: Remove NPN support

[markt]

This is an automated email from the ASF dual-hosted git repository.

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

commit ca0a1b2f9d3bf773b5c28a0457bd1d9e78785728
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Wed May 25 15:56:00 2022 +0100

    Remove NPN support
---
 java/org/apache/tomcat/jni/SSL.java        | 10 ----------
 java/org/apache/tomcat/jni/SSLContext.java | 24 ------------------------
 2 files changed, 34 deletions(-)

diff --git a/java/org/apache/tomcat/jni/SSL.java 
b/java/org/apache/tomcat/jni/SSL.java
index 652921bf6f..a66789bb6d 100644
--- a/java/org/apache/tomcat/jni/SSL.java
+++ b/java/org/apache/tomcat/jni/SSL.java
@@ -630,16 +630,6 @@ public final class SSL {
      */
     public static native int isInInit(long ssl);
 
-    /**
-     * SSL_get0_next_proto_negotiated
-     * @param ssl the SSL instance (SSL *)
-     * @return the NPN protocol negotiated
-     *
-     * @deprecated Unused. Will be removed in Tomcat 10.1.x
-     */
-    @Deprecated
-    public static native String getNextProtoNegotiated(long ssl);
-
     /*
      * End Twitter API Additions
      */
diff --git a/java/org/apache/tomcat/jni/SSLContext.java 
b/java/org/apache/tomcat/jni/SSLContext.java
index 1363aeaf4b..58e45897e7 100644
--- a/java/org/apache/tomcat/jni/SSLContext.java
+++ b/java/org/apache/tomcat/jni/SSLContext.java
@@ -514,30 +514,6 @@ public final class SSLContext {
      */
     public static native void setCertVerifyCallback(long ctx, 
CertificateVerifier verifier);
 
-    /**
-     * Set next protocol for next protocol negotiation extension
-     * @param ctx Server context to use.
-     * @param nextProtos comma delimited list of protocols in priority order
-     *
-     * @deprecated use {@link #setNpnProtos(long, String[], int)}
-     */
-    @Deprecated
-    public static void setNextProtos(long ctx, String nextProtos) {
-        setNpnProtos(ctx, nextProtos.split(","), 
SSL.SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL);
-    }
-
-    /**
-     * Set next protocol for next protocol negotiation extension
-     * @param ctx Server context to use.
-     * @param nextProtos protocols in priority order
-     * @param selectorFailureBehavior see {@link 
SSL#SSL_SELECTOR_FAILURE_NO_ADVERTISE}
-     *                                and {@link 
SSL#SSL_SELECTOR_FAILURE_CHOOSE_MY_LAST_PROTOCOL}
-     *
-     * @deprecated Unused. Will be removed in Tomcat 10.1.x
-     */
-    @Deprecated
-    public static native void setNpnProtos(long ctx, String[] nextProtos, int 
selectorFailureBehavior);
-
     /**
      * Set application layer protocol for application layer protocol 
negotiation extension
      * @param ctx Server context to use.


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