View | Details | Raw Unified | Return to bug 62748
Collapse All | Expand All

(-)java/org/apache/tomcat/jni/SSL.java (+1 lines)
Lines 73-78 Link Here
73
    public static final int SSL_PROTOCOL_TLSV1 = (1<<2);
73
    public static final int SSL_PROTOCOL_TLSV1 = (1<<2);
74
    public static final int SSL_PROTOCOL_TLSV1_1 = (1<<3);
74
    public static final int SSL_PROTOCOL_TLSV1_1 = (1<<3);
75
    public static final int SSL_PROTOCOL_TLSV1_2 = (1<<4);
75
    public static final int SSL_PROTOCOL_TLSV1_2 = (1<<4);
76
    public static final int SSL_PROTOCOL_TLSV1_3 = (1<<5);
76
    public static final int SSL_PROTOCOL_ALL   = (SSL_PROTOCOL_TLSV1 | SSL_PROTOCOL_TLSV1_1 | SSL_PROTOCOL_TLSV1_2);
77
    public static final int SSL_PROTOCOL_ALL   = (SSL_PROTOCOL_TLSV1 | SSL_PROTOCOL_TLSV1_1 | SSL_PROTOCOL_TLSV1_2);
77
78
78
    /*
79
    /*
(-)java/org/apache/tomcat/jni/SSLContext.java (+1 lines)
Lines 41-46 Link Here
41
     * {@link SSL#SSL_PROTOCOL_TLSV1}
41
     * {@link SSL#SSL_PROTOCOL_TLSV1}
42
     * {@link SSL#SSL_PROTOCOL_TLSV1_1}
42
     * {@link SSL#SSL_PROTOCOL_TLSV1_1}
43
     * {@link SSL#SSL_PROTOCOL_TLSV1_2}
43
     * {@link SSL#SSL_PROTOCOL_TLSV1_2}
44
     * {@link SSL#SSL_PROTOCOL_TLSV1_3}
44
     * {@link SSL#SSL_PROTOCOL_ALL} ( == all TLS versions, no SSL)
45
     * {@link SSL#SSL_PROTOCOL_ALL} ( == all TLS versions, no SSL)
45
     * </PRE>
46
     * </PRE>
46
     * @param mode SSL mode to use
47
     * @param mode SSL mode to use
(-)java/org/apache/tomcat/util/net/AprEndpoint.java (+2 lines)
Lines 439-444 Link Here
439
                    value |= SSL.SSL_PROTOCOL_TLSV1_1;
439
                    value |= SSL.SSL_PROTOCOL_TLSV1_1;
440
                } else if (Constants.SSL_PROTO_TLSv1_2.equalsIgnoreCase(protocol)) {
440
                } else if (Constants.SSL_PROTO_TLSv1_2.equalsIgnoreCase(protocol)) {
441
                    value |= SSL.SSL_PROTOCOL_TLSV1_2;
441
                    value |= SSL.SSL_PROTOCOL_TLSV1_2;
442
                } else if (Constants.SSL_PROTO_TLSv1_3.equalsIgnoreCase(protocol)) {
443
                    value |= SSL.SSL_PROTOCOL_TLSV1_3;
442
                } else {
444
                } else {
443
                    // Should not happen since filtering to build
445
                    // Should not happen since filtering to build
444
                    // enabled protocols removes invalid values.
446
                    // enabled protocols removes invalid values.
(-)java/org/apache/tomcat/util/net/openssl/OpenSSLContext.java (+2 lines)
Lines 153-158 Link Here
153
                    value |= SSL.SSL_PROTOCOL_TLSV1_1;
153
                    value |= SSL.SSL_PROTOCOL_TLSV1_1;
154
                } else if (Constants.SSL_PROTO_TLSv1_2.equalsIgnoreCase(protocol)) {
154
                } else if (Constants.SSL_PROTO_TLSv1_2.equalsIgnoreCase(protocol)) {
155
                    value |= SSL.SSL_PROTOCOL_TLSV1_2;
155
                    value |= SSL.SSL_PROTOCOL_TLSV1_2;
156
                } else if (Constants.SSL_PROTO_TLSv1_3.equalsIgnoreCase(protocol)) {
157
                    value |= SSL.SSL_PROTOCOL_TLSV1_3;
156
                } else if (Constants.SSL_PROTO_ALL.equalsIgnoreCase(protocol)) {
158
                } else if (Constants.SSL_PROTO_ALL.equalsIgnoreCase(protocol)) {
157
                    value |= SSL.SSL_PROTOCOL_ALL;
159
                    value |= SSL.SSL_PROTOCOL_ALL;
158
                } else {
160
                } else {
(-)java/org/apache/tomcat/util/net/openssl/OpenSSLEngine.java (-1 / +2 lines)
Lines 109-115 Link Here
109
        Constants.SSL_PROTO_SSLv3,
109
        Constants.SSL_PROTO_SSLv3,
110
        Constants.SSL_PROTO_TLSv1,
110
        Constants.SSL_PROTO_TLSv1,
111
        Constants.SSL_PROTO_TLSv1_1,
111
        Constants.SSL_PROTO_TLSv1_1,
112
        Constants.SSL_PROTO_TLSv1_2
112
        Constants.SSL_PROTO_TLSv1_2,
113
        Constants.SSL_PROTO_TLSv1_3
113
    };
114
    };
114
    public static final Set<String> IMPLEMENTED_PROTOCOLS_SET =
115
    public static final Set<String> IMPLEMENTED_PROTOCOLS_SET =
115
            Collections.unmodifiableSet(new HashSet<>(Arrays.asList(IMPLEMENTED_PROTOCOLS)));
116
            Collections.unmodifiableSet(new HashSet<>(Arrays.asList(IMPLEMENTED_PROTOCOLS)));

Return to bug 62748