[GR-33942] JDK17 fixes

PullRequest: graalpython/1972

Author: timfel

graalpython/com.oracle.graal.python.shell/src/com/oracle/graal/python/shell/GraalPythonMain.java

@@ -388,13 +388,13 @@ private static String getLauncherExecName() {
      * <dt><b>Program name is an absolute path</b></dt>
      * <dd>Just return {@code program}.</dd>
      * <dt><b>Program name is a relative path</b></dt>
-     * <dd>it will resolve it to an absolute path. E.g. {@code "./python3"} will become {@code 
+     * <dd>it will resolve it to an absolute path. E.g. {@code "./python3"} will become {@code
      * "<current_working_dir>/python3"}/dd>
      * <dt><b>Program name is neither an absolute nor a relative path</b></dt>
      * <dd>It will resolve the program name wrt. to the {@code PATH} env variable. Since it may be
      * that the {@code PATH} variable is not available, this method will return {@code null}</dd>
      * </dl>
-     * 
+     *
      * @param program The program name as passed in the process' argument vector (position 0).
      * @return The absolute path to the program or {@code null}.
      */
@@ -1027,11 +1027,9 @@ static List<String> getCmdline(List<String> args, List<String> subProcessDefs) {
             switch (System.getProperty("java.vm.name")) {
                 case "Java HotSpot(TM) 64-Bit Server VM":
                     cmd.add("-server");
-                    cmd.add("-d64");
                     break;
                 case "Java HotSpot(TM) 64-Bit Client VM":
                     cmd.add("-client");
-                    cmd.add("-d64");
                     break;
                 default:
                     break;

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

@@ -68,8 +68,8 @@ public class ASN1Helper {
     static final String ASN1_EMAIL = "EMAIL";
 
     static final String OID_CRL_DISTRIBUTION_POINTS = "2.5.29.31";
-    static final String OID_OCSP = "1.3.6.1.5.5.7.48.1";
-    static final String OID_CA_ISSUERS = "1.3.6.1.5.5.7.48.2";
+    static final byte[] OID_OCSP = new byte[]{/* 1, 3, 6, */ 1, 5, 5, 7, 48, 1};
+    static final byte[] OID_CA_ISSUERS = new byte[]{/* 1, 3, 6, */ 1, 5, 5, 7, 48, 2};
     static final String OID_AUTHORITY_INFO_ACCESS = "1.3.6.1.5.5.7.1.1";
 
     private static final Map<String, String> javaToName = new HashMap<>();

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

@@ -982,7 +982,7 @@ Object getCerts(PSSLContext self, @SuppressWarnings("unused") boolean binary_for
                     }
                 }
                 return factory().createList(result.toArray(new Object[result.size()]));
-            } catch (KeyStoreException | NoSuchAlgorithmException | IOException | CertificateParsingException ex) {
+            } catch (KeyStoreException | NoSuchAlgorithmException | CertificateParsingException ex) {
                 throw PRaiseSSLErrorNode.raiseUncached(this, SSLErrorCode.ERROR_SSL, ex);
             }
         }

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

@@ -41,10 +41,8 @@
 package com.oracle.graal.python.builtins.objects.ssl;
 
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.NotImplementedError;
-import static com.oracle.graal.python.builtins.PythonBuiltinClassType.SSLError;
 import static com.oracle.graal.python.builtins.PythonBuiltinClassType.ValueError;
 
-import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.security.cert.Certificate;
 import java.security.cert.CertificateEncodingException;
@@ -320,8 +318,6 @@ PDict getPeerCertDict(PSSLSocket self, @SuppressWarnings("unused") boolean der)
                     return CertUtils.decodeCertificate(this, (X509Certificate) certificate);
                 } catch (CertificateParsingException e) {
                     return factory().createDict();
-                } catch (IOException ex) {
-                    throw raise(SSLError, ex);
                 }
             }
             return factory().createDict();

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

@@ -0,0 +1,6 @@
+DISABLE_INSTALLABLES=true
+DYNAMIC_IMPORTS=/substratevm
+COMPONENTS=LibGraal,Graal.Python
+FORCE_BASH_LAUNCHERS=true
+SKIP_LIBRARIES=
+NO_LICENSES=true

mx.graalpython/graalpython-bash-launcher

@@ -0,0 +1,6 @@
+DISABLE_INSTALLABLES=true
+DYNAMIC_IMPORTS=/substratevm
+COMPONENTS=LibGraal,Graal.Python
+FORCE_BASH_LAUNCHERS=graalvm-native-clang,graalvm-native-clang++,graalvm-native-ld,graalvm-native-binutil
+SKIP_LIBRARIES=
+NO_LICENSES=true

mx.graalpython/graalpython-launcher

@@ -0,0 +1,56 @@
+# Copyright (c) 2021, Oracle and/or its affiliates. All rights reserved.
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+#
+# The Universal Permissive License (UPL), Version 1.0
+#
+# Subject to the condition set forth below, permission is hereby granted to any
+# person obtaining a copy of this software, associated documentation and/or
+# data (collectively the "Software"), free of charge and under any and all
+# copyright rights in the Software, and any and all patent rights owned or
+# freely licensable by each licensor hereunder covering either (i) the
+# unmodified Software as contributed to or provided by such licensor, or (ii)
+# the Larger Works (as defined below), to deal in both
+#
+# (a) the Software, and
+#
+# (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
+# one is included with the Software each a "Larger Work" to which the Software
+# is contributed by such licensors),
+#
+# without restriction, including without limitation the rights to copy, create
+# derivative works of, display, perform, and distribute the Software and make,
+# use, sell, offer for sale, import, export, have made, and have sold the
+# Software and the Larger Work(s), and to sublicense the foregoing rights on
+# either these or other terms.
+#
+# This license is subject to the following condition:
+#
+# The above copyright notice and either this complete permission notice or at a
+# minimum a reference to the UPL must be included in all copies or substantial
+# portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+#!/bin/sh
+set -ex
+
+venv="$1"
+
+if [ ! -e "$venv" ]; then
+    echo "Usage: $0 PATH-TO-VENV"
+    exit
+fi
+
+rm -rf "$venv"/bin
+rm -rf "$venv"/lib/python*/site-packages/pip*
+rm -rf "$venv"/lib/python*/site-packages/setuptools*
+rm -rf "$venv"/lib/python*/site-packages/pkg_resources*
+rm -rf "$venv"/lib/python*/site-packages/easy_install.py
+find "$venv" -name "__pycache__" -exec rm -rf "{}" ";"
+echo "include-system-site-packages = false\n" > "$venv"/pyvenv.cfg