Skip to content

Commit 3881c1b

Browse files
committed
Make bouncycastle work in native image
1 parent ef3ba70 commit 3881c1b

File tree

5 files changed

+440
-7
lines changed

5 files changed

+440
-7
lines changed
Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
/*
2+
* Copyright (c) 2022, Oracle and/or its affiliates. All rights reserved.
3+
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
4+
*
5+
* The Universal Permissive License (UPL), Version 1.0
6+
*
7+
* Subject to the condition set forth below, permission is hereby granted to any
8+
* person obtaining a copy of this software, associated documentation and/or
9+
* data (collectively the "Software"), free of charge and under any and all
10+
* copyright rights in the Software, and any and all patent rights owned or
11+
* freely licensable by each licensor hereunder covering either (i) the
12+
* unmodified Software as contributed to or provided by such licensor, or (ii)
13+
* the Larger Works (as defined below), to deal in both
14+
*
15+
* (a) the Software, and
16+
*
17+
* (b) any piece of software and/or hardware listed in the lrgrwrks.txt file if
18+
* one is included with the Software each a "Larger Work" to which the Software
19+
* is contributed by such licensors),
20+
*
21+
* without restriction, including without limitation the rights to copy, create
22+
* derivative works of, display, perform, and distribute the Software and make,
23+
* use, sell, offer for sale, import, export, have made, and have sold the
24+
* Software and the Larger Work(s), and to sublicense the foregoing rights on
25+
* either these or other terms.
26+
*
27+
* This license is subject to the following condition:
28+
*
29+
* The above copyright notice and either this complete permission notice or at a
30+
* minimum a reference to the UPL must be included in all copies or substantial
31+
* portions of the Software.
32+
*
33+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
34+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
35+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
36+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
37+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
38+
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
39+
* SOFTWARE.
40+
*/
41+
package com.oracle.graal.python;
42+
43+
import java.security.Security;
44+
45+
import org.graalvm.nativeimage.ImageSingletons;
46+
import org.graalvm.nativeimage.hosted.Feature;
47+
import org.graalvm.nativeimage.impl.RuntimeClassInitializationSupport;
48+
49+
import com.oracle.graal.python.builtins.objects.ssl.CertUtils;
50+
51+
public class BouncyCastleFeature implements Feature {
52+
@Override
53+
public void afterRegistration(AfterRegistrationAccess access) {
54+
RuntimeClassInitializationSupport support = ImageSingletons.lookup(RuntimeClassInitializationSupport.class);
55+
support.initializeAtBuildTime("org.bouncycastle", "security provider");
56+
support.rerunInitialization("org.bouncycastle.jcajce.provider.drbg.DRBG$Default", "RNG");
57+
support.rerunInitialization("org.bouncycastle.jcajce.provider.drbg.DRBG$NonceAndIV", "RNG");
58+
Security.addProvider(CertUtils.BOUNCYCASTLE_PROVIDER);
59+
}
60+
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,6 @@ private static boolean tryProtocolAvailability(SSLContext context, SSLProtocol p
204204
@Override
205205
public void postInitialize(Python3Core core) {
206206
super.postInitialize(core);
207-
CertUtils.initialize();
208207
loadDefaults();
209208
PythonModule module = core.lookupBuiltinModule("_ssl");
210209
PythonObjectFactory factory = core.factory();

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,11 +113,9 @@
113113
import com.oracle.truffle.api.frame.Frame;
114114

115115
public final class CertUtils {
116-
private static BouncyCastleProvider BOUNCYCASTLE_PROVIDER;
116+
public static final BouncyCastleProvider BOUNCYCASTLE_PROVIDER = new BouncyCastleProvider();
117117

118-
public static void initialize() {
119-
120-
BOUNCYCASTLE_PROVIDER = new BouncyCastleProvider();
118+
static {
121119
Security.addProvider(BOUNCYCASTLE_PROVIDER);
122120
}
123121

0 commit comments

Comments
 (0)