Skip to content

Commit

Permalink
Merge pull request #952 from martinRenou/remove_openssl_pinning
Browse files Browse the repository at this point in the history
Remove OpenSSL pinning
  • Loading branch information
martinRenou authored Apr 1, 2022
2 parents 480ef83 + f1255a4 commit 4a27ea8
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 16 deletions.
8 changes: 0 additions & 8 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,3 @@ jobs:

- name: Import check
run: python -c 'import ipyleaflet'

- name: Build docs (Only on Linux for saving time)
if: matrix.os == 'ubuntu-latest'
run: |
mamba install sphinx sphinx_rtd_theme
pip install -r docs/requirements.txt
cd docs
make html
5 changes: 1 addition & 4 deletions .github/workflows/ui-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,7 @@ jobs:
channels: conda-forge

- name: Mamba install dependencies
run: mamba install python=${{ matrix.python-version }} pip nodejs flake8

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

- name: Install ipyleaflet
run: pip install .
Expand Down
5 changes: 1 addition & 4 deletions .github/workflows/update_galata_references.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ jobs:
channels: conda-forge

- name: Mamba install dependencies
run: mamba install python=${{ matrix.python-version }} pip nodejs flake8

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

- name: Install ipyleaflet
run: pip install .
Expand Down
1 change: 1 addition & 0 deletions js/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@
"jupyterlab": {
"extension": "src/jupyterlab-plugin",
"outputDir": "../ipyleaflet/labextension",
"webpackConfig": "webpack.lab.config.js",
"sharedPackages": {
"@jupyter-widgets/base": {
"bundled": false,
Expand Down
6 changes: 6 additions & 0 deletions js/webpack.config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
var path = require('path');
var version = require('./package.json').version;
var crypto = require('crypto');

// Workaround for loaders using "md4" by default, which is not supported in FIPS-compliant OpenSSL
var cryptoOrigCreateHash = crypto.createHash;
crypto.createHash = (algorithm) =>
cryptoOrigCreateHash(algorithm == 'md4' ? 'sha256' : algorithm);

var rules = [
{
Expand Down
6 changes: 6 additions & 0 deletions js/webpack.lab.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
const crypto = require('crypto');

// Workaround for loaders using "md4" by default, which is not supported in FIPS-compliant OpenSSL
const cryptoOrigCreateHash = crypto.createHash;
crypto.createHash = (algorithm) =>
cryptoOrigCreateHash(algorithm == 'md4' ? 'sha256' : algorithm);

0 comments on commit 4a27ea8

Please sign in to comment.