Attachment #32115 for bug #53952

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

Lines 70-76 Link Here

(-)java/org/apache/tomcat/jni/SSL.java (-1 / +3 lines)
70	public static final int SSL_PROTOCOL_SSLV2 = (1<<0);	70	public static final int SSL_PROTOCOL_SSLV2 = (1<<0);
71	public static final int SSL_PROTOCOL_SSLV3 = (1<<1);	71	public static final int SSL_PROTOCOL_SSLV3 = (1<<1);
72	public static final int SSL_PROTOCOL_TLSV1 = (1<<2);	72	public static final int SSL_PROTOCOL_TLSV1 = (1<<2);
73	public static final int SSL_PROTOCOL_ALL = (SSL_PROTOCOL_SSLV3\|SSL_PROTOCOL_TLSV1);	73	public static final int SSL_PROTOCOL_TLS11 = (1<<3);
		74	public static final int SSL_PROTOCOL_TLS12 = (1<<4);
		75	public static final int SSL_PROTOCOL_ALL = (SSL_PROTOCOL_SSLV2\|SSL_PROTOCOL_SSLV3\|SSL_PROTOCOL_TLSV1\|SSL_PROTOCOL_TLS11\|SSL_PROTOCOL_TLS12);
74		76
75	/*	77	/*
76	* Define the SSL verify levels	78	* Define the SSL verify levels

Lines 506-511 Link Here

(-)java/org/apache/tomcat/util/net/AprEndpoint.java (+4 lines)
506	value \|= SSL.SSL_PROTOCOL_SSLV3;	506	value \|= SSL.SSL_PROTOCOL_SSLV3;
507	} else if ("TLSv1".equalsIgnoreCase(protocol)) {	507	} else if ("TLSv1".equalsIgnoreCase(protocol)) {
508	value \|= SSL.SSL_PROTOCOL_TLSV1;	508	value \|= SSL.SSL_PROTOCOL_TLSV1;
		509	} else if ("TLSv1.1".equalsIgnoreCase(protocol)) {
		510	value \|= SSL.SSL_PROTOCOL_TLS11;
		511	} else if ("TLSv1.2".equalsIgnoreCase(protocol)) {
		512	value \|= SSL.SSL_PROTOCOL_TLS12;
509	} else if ("all".equalsIgnoreCase(protocol)) {	513	} else if ("all".equalsIgnoreCase(protocol)) {
510	value \|= SSL.SSL_PROTOCOL_ALL;	514	value \|= SSL.SSL_PROTOCOL_ALL;
511	} else {	515	} else {

Return to bug 53952