Skip to content

Commit c7f60bf

Browse files
committed
Remove OpenSSL pinning
1 parent 480ef83 commit c7f60bf

File tree

5 files changed

+15
-8
lines changed

5 files changed

+15
-8
lines changed

.github/workflows/ui-tests.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,7 @@ jobs:
2929
channels: conda-forge
3030

3131
- name: Mamba install dependencies
32-
run: mamba install python=${{ matrix.python-version }} pip nodejs flake8
33-
34-
- name: Mamba install dependencies
35-
run: mamba install jupyterlab ipywidgets openssl=1.1.1l jupyter-packaging~=0.7.9
32+
run: mamba install python=${{ matrix.python-version }} pip nodejs flake8 jupyterlab ipywidgets jupyter-packaging~=0.7.9
3633

3734
- name: Install ipyleaflet
3835
run: pip install .

.github/workflows/update_galata_references.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,7 @@ jobs:
3939
channels: conda-forge
4040

4141
- name: Mamba install dependencies
42-
run: mamba install python=${{ matrix.python-version }} pip nodejs flake8
43-
44-
- name: Mamba install dependencies
45-
run: mamba install jupyterlab ipywidgets openssl=1.1.1l jupyter-packaging~=0.7.9
42+
run: mamba install python=${{ matrix.python-version }} pip nodejs flake8 jupyterlab ipywidgets jupyter-packaging~=0.7.9
4643

4744
- name: Install ipyleaflet
4845
run: pip install .

js/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@
6161
"jupyterlab": {
6262
"extension": "src/jupyterlab-plugin",
6363
"outputDir": "../ipyleaflet/labextension",
64+
"webpackConfig": "webpack.lab.config.js",
6465
"sharedPackages": {
6566
"@jupyter-widgets/base": {
6667
"bundled": false,

js/webpack.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
var path = require('path');
22
var version = require('./package.json').version;
3+
var crypto = require('crypto');
4+
5+
// Workaround for loaders using "md4" by default, which is not supported in FIPS-compliant OpenSSL
6+
var cryptoOrigCreateHash = crypto.createHash;
7+
crypto.createHash = (algorithm) =>
8+
cryptoOrigCreateHash(algorithm == 'md4' ? 'sha256' : algorithm);
39

410
var rules = [
511
{

js/webpack.lab.config.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
const crypto = require('crypto');
2+
3+
// Workaround for loaders using "md4" by default, which is not supported in FIPS-compliant OpenSSL
4+
const cryptoOrigCreateHash = crypto.createHash;
5+
crypto.createHash = (algorithm) =>
6+
cryptoOrigCreateHash(algorithm == 'md4' ? 'sha256' : algorithm);

0 commit comments

Comments
 (0)