Skip to content

[GR-74994] Update Bouncy Castle to 1.84 and make standalone packaging optional #764

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
graalvmbot wants to merge 5 commits into from
Closed

[GR-74994] Update Bouncy Castle to 1.84 and make standalone packaging optional #764

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bc912d0
[GR-74994] Update Bouncy Castle artifacts to 1.84
timfel Apr 22, 2026
d3c2525
Make it easy to exclude standalone Bouncy Castle packaging
timfel Apr 22, 2026
bcff705
Use substitution for standalone BouncyCastle flags
timfel Apr 23, 2026
e0d0615
Skip transient on macos
timfel Apr 23, 2026
8dbb048
[GR-74994] Restore JDK 21 compatibility in CertUtils
timfel Apr 23, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions THIRD_PARTY_LICENSE.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,9 @@ SOFTWARE.

================================================================================

Bouncy Castle Crypto API 1.68
Bouncy Castle Crypto API 1.84

Copyright (c) 2000-2021 The Legion of the Bouncy Castle Inc.
Copyright (c) 2000-2023 The Legion of the Bouncy Castle Inc.
(https://www.bouncycastle.org)
Permission is hereby granted, free of charge, to any person obtaining a copy of
this software
Expand Down
2 changes: 2 additions & 0 deletions graalpython/com.oracle.graal.python.test/src/tests/unittest_tags/test_strptime.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ test.test_strptime.StrptimeTests.test_strptime_exception_context @ darwin-arm64,
test.test_strptime.StrptimeTests.test_time_locale @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
# Seems to be dependent on the actual time/date/timezone of the machine, at least on GraalPy. Needs investigation
!test.test_strptime.StrptimeTests.test_timezone
# Transiently fails with trying to look up "gmt+1:00" instead of "gmt" for unknown reasons
!test.test_strptime.LocaleTime_Tests.test_timezone @ darwin-arm64
test.test_strptime.StrptimeTests.test_unconverteddata @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_strptime.StrptimeTests.test_weekday @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
test.test_strptime.StrptimeTests.test_weekday_locale @ darwin-arm64,linux-aarch64,linux-aarch64-github,linux-x86_64,linux-x86_64-github,win32-AMD64,win32-AMD64-github
Expand Down
12 changes: 11 additions & 1 deletion ...n/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/ssl/CertUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,7 @@ static PrivateKey getPrivateKey(PythonContext context, Node inliningTarget, PCon
PrivateKey privateKey = null;
String algorithm = cert.getPublicKey().getAlgorithm();
try {
String pemText = reader.readAllAsString();
String pemText = readAll(reader);
int fromIndex = 0;
PemBlockWithContent rawBlock;
while ((rawBlock = findNextPemBlock(pemText, fromIndex)) != null) {
Expand Down Expand Up @@ -773,6 +773,16 @@ static PrivateKey getPrivateKey(PythonContext context, Node inliningTarget, PCon
return privateKey;
}

private static String readAll(BufferedReader reader) throws IOException {
StringBuilder sb = new StringBuilder();
char[] buf = new char[8192];
int n;
while ((n = reader.read(buf)) != -1) {
sb.append(buf, 0, n);
}
return sb.toString();
}

private static PemBlockWithContent findNextPemBlock(String data, int fromIndex) throws IOException {
int begin = data.indexOf("-----BEGIN ", fromIndex);
if (begin < 0) {
Expand Down
26 changes: 25 additions & 1 deletion mx.graalpython/mx_graalpython.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ def get_boolean_env(name, default=False):
WIN32 = sys.platform == "win32"
BUILD_NATIVE_IMAGE_WITH_ASSERTIONS = get_boolean_env('BUILD_WITH_ASSERTIONS', CI)
BYTECODE_DSL_INTERPRETER = get_boolean_env('BYTECODE_DSL_INTERPRETER', True)
GRAALPY_WITH_BOUNCYCASTLE = get_boolean_env("GRAALPY_WITH_BOUNCYCASTLE", True)

mx_gate.add_jacoco_excludes([
"com.oracle.graal.python.pegparser.sst",
Expand Down Expand Up @@ -160,6 +161,20 @@ def wants_debug_build(flags=os.environ.get("CFLAGS", "")):
))


def _is_graalos_build():
return "musl" in mx_subst.path_substitutions.substitute("<multitarget_libc_selection>")


def _with_bouncycastle():
return GRAALPY_WITH_BOUNCYCASTLE and not _is_graalos_build()


def bcflags():
if _with_bouncycastle():
return '--vm.-add-modules=graalpython.bouncycastle,org.bouncycastle.provider,org.bouncycastle.pkix,org.bouncycastle.util'
return ''


if WIN32:
# let's check if VS compilers are on the PATH
if not os.environ.get("LIB"):
Expand Down Expand Up @@ -246,6 +261,14 @@ def get_jdk():
def graalpy_standalone_deps():
include_truffle_runtime = not mx.env_var_to_bool("EXCLUDE_TRUFFLE_RUNTIME")
deps = mx_truffle.resolve_truffle_dist_names(use_optimized_runtime=include_truffle_runtime)
if _with_bouncycastle():
mx.log("Including bouncycastle with GraalPy standalone")
deps += [
"graalpython:GRAALPYTHON_BOUNCYCASTLE",
"graalpython:BOUNCYCASTLE-PROVIDER",
"graalpython:BOUNCYCASTLE-PKIX",
"graalpython:BOUNCYCASTLE-UTIL",
]
return deps


Expand Down Expand Up @@ -289,7 +312,7 @@ def libpythonvm_build_args():
if os.environ.get("GITHUB_CI"):
build_args += github_ci_build_args()

if graalos := ("musl" in mx_subst.path_substitutions.substitute("<multitarget_libc_selection>")):
if graalos := _is_graalos_build():
build_args += ['-H:+GraalOS']
else:
build_args += [
Expand Down Expand Up @@ -1987,6 +2010,7 @@ def abi_version():
mx_subst.results_substitutions.register_no_arg('graalpy_ext', graalpy_ext)

mx_subst.results_substitutions.register_no_arg('graalpy_cmake_build_type', graalpy_cmake_build_type)
mx_subst.string_substitutions.register_no_arg('bcflags', bcflags)


def update_import(name, suite_py: Path, args):
Expand Down
28 changes: 12 additions & 16 deletions mx.graalpython/suite.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,15 +53,15 @@
},
{
"name": "tools",
"version": "dbc733f99ceebfd8bd02911b8e7313787affd49a",
"version": "d98d0663dc5d103bc3a142266befac796b52cdb3",
"subdir": True,
"urls": [
{"url": "https://github.com/oracle/graal", "kind": "git"},
],
},
{
"name": "regex",
"version": "dbc733f99ceebfd8bd02911b8e7313787affd49a",
"version": "d98d0663dc5d103bc3a142266befac796b52cdb3",
"subdir": True,
"urls": [
{"url": "https://github.com/oracle/graal", "kind": "git"},
Expand Down Expand Up @@ -110,32 +110,32 @@
"digest": "sha512:bd77164795b5cbfbe864f64021e67e37f39cb9aba9abdd894d53fbb6857abe074923808918d1dc3bb0706253e726b2b9704cd0c3bc744d70e220c7356fa4995e",
},
"BOUNCYCASTLE-PROVIDER": {
"digest": "sha512:e51cc843ca130ad4a15ff667360063bbb583af3f22e14193840a734da6665b470ba1855ce975f88a94ddd6419aa020d3a9966980bc1deb7514f92a7215d6e229",
"sourceDigest": "sha512:a2fe72266afcffce846dde5735d0fa28935942177375dd1c29bac819c1163f2da967e0b893d33d43868b6cdb8aa469e05fa460543d5448fa1e34155dcf86b0b7",
"digest": "sha512:4b7e5696830023bad1594d9f9766898f78018ec7d6ec34de23f2a6683b02803b92ffe8ab5d21f1a717eb4fafa8e22dcf3a4b6dd275bd86c7cb02609987fe92f5",
"sourceDigest": "sha512:2d266985014d38f701ac4c8e5482d767488e6fdd48d16973703ef2268138baf71b53ac283c969004bad709e1664b2f2446a1f56102af876d35ccceb03e44fbb9",
"maven": {
"groupId": "org.bouncycastle",
"artifactId": "bcprov-jdk18on",
"version": "1.83",
"version": "1.84",
},
"moduleName": "org.bouncycastle.provider",
},
"BOUNCYCASTLE-PKIX": {
"digest": "sha512:9c67d990a56a5c448f9bb9edbb8b99dc15971e16de7e6f10c3eab129a1389eef4882c5a5d910ac4ddc27d44f7bc9fa4054c7f56dc031154c131bccc50ebd67b9",
"sourceDigest": "sha512:f24ad816393ed53d737db3c976ef37e4e009c2a366a1b97f80dace063320336ed1463b526eb6913cd1d462c2be18debd43ac1cab415639f900706e8e4fc13fe1",
"digest": "sha512:01644d7e0c6041ea8c8629f6ad73f7206efa2797d954da1507dd43c5d262a161194ed84e960234cf5c53787033f1181aa4965e0d6ebfe82ca040de13ca307565",
"sourceDigest": "sha512:2c405cbefcd75b97b11df470025f3e51286bd11fd735607d8d512133ec49f9887dc282b4af0f434b49064fa1eab3e14d1f2c860187fb9fb8939330fc64602ba4",
"maven": {
"groupId": "org.bouncycastle",
"artifactId": "bcpkix-jdk18on",
"version": "1.83",
"version": "1.84",
},
"moduleName": "org.bouncycastle.pkix",
},
"BOUNCYCASTLE-UTIL": {
"digest": "sha512:e19831d4afc0a709fd57694f33bfe3a8e881cba287c34fb076a44ef436e56e6bdf49299ca9525028a4de9bf5fadeaa254654d0e527855f1f5659c5a7be538576",
"sourceDigest": "sha512:bc4195692721827b41e21eaa14f9cf14dffe6f141ddfb8ac26d2a89f4ead3f1611671f8b6d39ec4be479c2ccf6e4bf33176123474f852910dc7dcc23485bd036",
"digest": "sha512:e001b244723fb3c4d1e06862bb857512015a92d7e18650ae3447a3d258274ec8ed37b8cba958397b00f8dd73463943e9a9489dd5dbddbe24b24cd6fae5ca8a62",
"sourceDigest": "sha512:01ece60806f4ba9bc78509a4521eab164b37197d8d0ad647c46b77deff0aebdc5191875690edb513fd8266be41daaaf0ccca1b0c7a53df1d059950b79d0f4a26",
"maven": {
"groupId": "org.bouncycastle",
"artifactId": "bcutil-jdk18on",
"version": "1.83",
"version": "1.84",
},
"moduleName": "org.bouncycastle.util",
},
Expand Down Expand Up @@ -882,7 +882,7 @@
"default_vm_args": [
"--vm.Xss16777216", # request 16M of stack
'--vm.-enable-native-access=org.graalvm.shadowed.jline',
'--vm.-add-modules=graalpython.bouncycastle,org.bouncycastle.provider,org.bouncycastle.pkix,org.bouncycastle.util',
'<bcflags>',
],
"multitarget": [
{"os": ["linux"], "libc": ["glibc", "default"], "compiler": ["llvm-toolchain", "host", "*"]},
Expand Down Expand Up @@ -1481,10 +1481,6 @@
"distDependencies": [
"graalpython:GRAALPYTHON-LAUNCHER",
"graalpython:GRAALPYTHON",
"graalpython:GRAALPYTHON_BOUNCYCASTLE",
"graalpython:BOUNCYCASTLE-PROVIDER",
"graalpython:BOUNCYCASTLE-PKIX",
"graalpython:BOUNCYCASTLE-UTIL",
"sdk:TOOLS_FOR_STANDALONE",
],
"dynamicDistDependencies": "graalpy_standalone_deps",
Expand Down
Loading