Skip to content

Commit d2045fe

Browse files
committed
Remove ALPNHelper, we don't support JDK 8 anymore
1 parent a53ebab commit d2045fe

File tree

4 files changed

+4
-101
lines changed

4 files changed

+4
-101
lines changed

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/SSLModuleBuiltins.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
import com.oracle.graal.python.builtins.PythonBuiltins;
7171
import com.oracle.graal.python.builtins.objects.exception.OSErrorEnum;
7272
import com.oracle.graal.python.builtins.objects.module.PythonModule;
73-
import com.oracle.graal.python.builtins.objects.ssl.ALPNHelper;
7473
import com.oracle.graal.python.builtins.objects.ssl.CertUtils;
7574
import com.oracle.graal.python.builtins.objects.ssl.SSLCipher;
7675
import com.oracle.graal.python.builtins.objects.ssl.SSLCipherSelector;
@@ -222,7 +221,7 @@ public void postInitialize(Python3Core core) {
222221
// We have ECDH ciphers, but we don't yet expose the methods that let you pick the curve
223222
module.setAttribute("HAS_ECDH", false);
224223
module.setAttribute("HAS_NPN", false);
225-
module.setAttribute("HAS_ALPN", ALPNHelper.hasAlpn());
224+
module.setAttribute("HAS_ALPN", true);
226225
module.setAttribute("HAS_SSLv2", false);
227226
boolean hasSSLv3 = supportedProtocols.contains(SSLProtocol.SSLv3);
228227
module.setAttribute("HAS_SSLv3", hasSSLv3);

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/ALPNHelper.java

Lines changed: 0 additions & 90 deletions
This file was deleted.

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/SSLContextBuiltins.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -222,8 +222,8 @@ static SSLEngine createSSLEngine(Frame frame, PConstructAndRaiseNode constructAn
222222
}
223223
parameters.setCipherSuites(enabledCipherNames);
224224

225-
if (ALPNHelper.hasAlpn() && context.getAlpnProtocols() != null) {
226-
ALPNHelper.setApplicationProtocols(parameters, context.getAlpnProtocols());
225+
if (context.getAlpnProtocols() != null) {
226+
parameters.setApplicationProtocols(context.getAlpnProtocols());
227227
}
228228
if (serverMode) {
229229
switch (context.getVerifyMode()) {
@@ -922,9 +922,6 @@ abstract static class SetAlpnProtocols extends PythonBinaryClinicBuiltinNode {
922922
Object setFromBuffer(VirtualFrame frame, PSSLContext self, Object buffer,
923923
@CachedLibrary("buffer") PythonBufferAccessLibrary bufferLib) {
924924
try {
925-
if (!ALPNHelper.hasAlpn()) {
926-
throw raise(NotImplementedError, "The ALPN extension requires JDK 8u252 or later");
927-
}
928925
byte[] bytes = bufferLib.getInternalOrCopiedByteArray(buffer);
929926
int len = bufferLib.getBufferLength(buffer);
930927
self.setAlpnProtocols(parseProtocols(bytes, len));

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/SSLSocketBuiltins.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -414,10 +414,7 @@ Object get(PSSLSocket socket) {
414414
abstract static class SelectedAlpnProtocol extends PythonUnaryBuiltinNode {
415415
@Specialization
416416
static Object get(PSSLSocket socket) {
417-
String protocol = null;
418-
if (ALPNHelper.hasAlpn()) {
419-
protocol = ALPNHelper.getApplicationProtocol(socket.getEngine());
420-
}
417+
String protocol = socket.getEngine().getApplicationProtocol();
421418
return protocol != null ? protocol : PNone.NONE;
422419
}
423420
}

0 commit comments

Comments
 (0)