diff --git a/dist/desktop b/dist/desktop
index 8bb0e18b5028245bbea050a57800d3d3973a639f..947b8c830926aeba77680b6f82914dd687d539ed 160000
--- a/dist/desktop
+++ b/dist/desktop
@@ -1 +1 @@
-Subproject commit 8bb0e18b5028245bbea050a57800d3d3973a639f
+Subproject commit 947b8c830926aeba77680b6f82914dd687d539ed
diff --git a/package.json b/package.json
index fcadb37e6d541bf4c140bf05344c11f2c2095642..8b7d20b2f8a25d4b627e48a07aac193245fb42dc 100644
--- a/package.json
+++ b/package.json
@@ -96,6 +96,7 @@
"cordova": "^11.1.0",
"cordova-android": "^10.1.2",
"cordova-clipboard": "^1.3.0",
+ "cordova-fetch": "^4.0.0",
"cordova-ios": "^6.3.0",
"cordova-plugin-androidx-adapter": "^1.1.3",
"cordova-plugin-camera": "^5.0.3",
@@ -105,7 +106,6 @@
"cordova-plugin-file": "^6.0.2",
"cordova-plugin-ionic-keyboard": "^2.2.0",
"cordova-plugin-ionic-webview": "^5.0.0",
- "cordova-plugin-minisodium": "git+https://github.com/duniter-cesium/cordova-plugin-minisodium.git#v1.0.3",
"cordova-plugin-network-information": "~3.0.0",
"cordova-plugin-secure-storage-android10": "~6.0.7",
"cordova-plugin-splashscreen": "^6.0.2",
@@ -207,7 +207,6 @@
"ANDROID_PATHPREFIX": "/wallet"
},
"cordova-plugin-secure-storage-android10": {},
- "cordova-plugin-minisodium": {},
"cordova-plugin-network-information": {}
},
"platforms": [
diff --git a/scripts/node/postinstall.js b/scripts/node/postinstall.js
index 315e3e28c5b5bfbe72e7e1431799be579e85123a..306f25fe65adab32a2a05434a84a1dfd57d94153 100644
--- a/scripts/node/postinstall.js
+++ b/scripts/node/postinstall.js
@@ -37,12 +37,3 @@ try {
} catch (e) {
// Silent
}
-
-try {
- if (!fs.existsSync('plugins')) {
- fs.mkdirSync('plugins');
- }
- fs.symlinkSync(path.resolve('node_modules/cordova-plugin-minisodium'), 'plugins/cordova-plugin-minisodium', 'junction');
-} catch (e) {
- throw new Error(e);
-}
diff --git a/www/index.html b/www/index.html
index 00fbb79d1740ffe1f6efa1b9fb667af4a812fcd0..f86334c68e3476080ccadec7efe12e0379e6336e 100644
--- a/www/index.html
+++ b/www/index.html
@@ -105,15 +105,10 @@
<script src="lib/angular-fullscreen-toggle/dist/angular-fullscreen-toggle.min.js"></script>
<script src="js/vendor/base58.js" async></script>
- <!--removeIf(android)-->
- <!--removeIf(ios)-->
<script src="lib/js-nacl/lib/nacl_factory.js" async></script>
<script src="lib/js-scrypt/browser/scrypt.js" async></script>
<script src="js/vendor/base64.js" async></script>
- <!--endRemoveIf(ios)-->
- <!--endRemoveIf(android)-->
<!--removeIf(no-device)-->
- <script src="js/vendor/sha256.min.js" async></script>
<script src="lib/ngCordova/dist/ng-cordova.min.js"></script>
<!--endRemoveIf(no-device)-->
diff --git a/www/js/controllers/login-controllers.js b/www/js/controllers/login-controllers.js
index 527495df719def631ab0ccf4fb16100d743a89de..d0df6f36269358ffbb01af013ca68dddd6302eab 100644
--- a/www/js/controllers/login-controllers.js
+++ b/www/js/controllers/login-controllers.js
@@ -136,7 +136,10 @@ function LoginModalController($scope, $timeout, $q, $ionicPopover, $window, Cryp
if (!$scope.formData.username || !$scope.formData.password) return;
var scryptPrams = $scope.formData.scrypt && $scope.formData.scrypt.params;
UIUtils.loading.show();
- promise = CryptoUtils.scryptKeypair($scope.formData.username, $scope.formData.password, scryptPrams)
+ promise = CryptoUtils.ready()
+ .then(function() {
+ return CryptoUtils.scryptKeypair($scope.formData.username, $scope.formData.password, scryptPrams)
+ })
.then(function(keypair) {
if (!keypair) return UIUtils.loading.hide(10);
var pubkey = CryptoUtils.util.encode_base58(keypair.signPk);
diff --git a/www/js/services/bma-services.js b/www/js/services/bma-services.js
index ff37f4da3f7da0d63edb8fb69b39f855a9be3019..ad0867f6d79bc0826edce31cfbfb03dadb72e380 100644
--- a/www/js/services/bma-services.js
+++ b/www/js/services/bma-services.js
@@ -473,8 +473,8 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
},
wot: {
lookup: get('/wot/lookup/:search'),
- certifiedBy: get('/wot/certified-by/:pubkey', csCache.constants.SHORT),
- certifiersOf: get('/wot/certifiers-of/:pubkey', csCache.constants.SHORT),
+ certifiedBy: get('/wot/certified-by/:pubkey?pubkey', csCache.constants.SHORT),
+ certifiersOf: get('/wot/certifiers-of/:pubkey?pubkey', csCache.constants.SHORT),
member: {
all: get('/wot/members', csCache.constants.LONG),
pending: get('/wot/pending', csCache.constants.SHORT)
@@ -552,8 +552,8 @@ angular.module('cesium.bma.services', ['ngApi', 'cesium.http.services', 'cesium.
current: get('/blockchain/current')
},
wot: {
- requirementsWithCache: get('/wot/requirements/:pubkey', csCache.constants.LONG),
- requirements: get('/wot/requirements/:pubkey')
+ requirementsWithCache: get('/wot/requirements/:pubkey?pubkey', csCache.constants.LONG),
+ requirements: get('/wot/requirements/:pubkey?pubkey')
},
tx: {
history: {
diff --git a/www/js/services/crypto-services.js b/www/js/services/crypto-services.js
index a87d55bf3d85ff4ae230a28f216b2302c7a86466..dcde9355df61bf99a3fc8a03647128b77882a074 100644
--- a/www/js/services/crypto-services.js
+++ b/www/js/services/crypto-services.js
@@ -107,12 +107,6 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
else {$timeout(function(){that.async_load_base64(on_ready);}, 100);}
};
- CryptoAbstractService.prototype.async_load_sha256 = function(on_ready) {
- var that = this;
- if (sha256 !== null){return on_ready(sha256);}
- else {$timeout(function(){that.async_load_sha256(on_ready);}, 100);}
- };
-
CryptoAbstractService.prototype.seed_from_signSk = function(signSk) {
var seed = new Uint8Array(this.constants.SEED_LENGTH);
for (var i = 0; i < seed.length; i++) seed[i] = signSk[i];
@@ -553,344 +547,6 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
}
FullJSServiceFactory.prototype = new CryptoAbstractService();
-
- /* -----------------------------------------------------------------------------------------------------------------
- * Service that use Cordova MiniSodium plugin
- * ----------------------------------------------------------------------------------------------------------------*/
-
- /***
- * Factory for crypto, using Cordova plugin
- */
- function CordovaServiceFactory() {
-
- this.id = 'MiniSodium';
-
- // libraries handlers
- this.nacl = null; // the cordova plugin
- this.base58= null;
- this.sha256= null;
- var that = this;
-
- // functions
- this.util = this.util || {};
- this.util.decode_utf8 = function(s) {
- return that.nacl.to_string(s);
- };
- this.util.encode_utf8 = function(s) {
- return that.nacl.from_string(s);
- };
- this.util.encode_base58 = function(a) {
- return that.base58.encode(a);
- };
- this.util.decode_base58 = function(a) {
- var i;
- var d = that.base58.decode(a);
- var b = new Uint8Array(d.length);
- for (i = 0; i < d.length; i++) b[i] = d[i];
- return b;
- };
- this.util.decode_base64 = function (a) {
- return that.nacl.from_base64(a);
- };
- this.util.encode_base64 = function (b) {
- return that.nacl.to_base64(b);
- };
- this.util.hash_sha256 = function(message) {
- return $q.when(that.sha256(message).toUpperCase());
- };
- this.util.random_nonce = function() {
- var nonce = new Uint8Array(that.constants.crypto_secretbox_NONCEBYTES);
- that.crypto.getRandomValues(nonce);
- return $q.when(nonce);
- };
- this.util.crypto_hash_sha256 = function (message) {
- return that.nacl.from_hex(that.sha256(message));
- };
-
- this.util.crypto_scrypt = function(password, salt, N, r, p, seedLength) {
- var deferred = $q.defer();
- that.nacl.crypto_pwhash_scryptsalsa208sha256_ll(
- password,
- salt,
- N,
- r,
- p,
- seedLength,
- function (err, seed) {
- if (err) { deferred.reject(err); return;}
- deferred.resolve(seed);
- }
- );
- return deferred.promise;
- };
-
- /**
- * Create key pairs (sign and box), from salt+password (Scrypt), using cordova
- */
- this.scryptKeypair = function(salt, password, scryptParams) {
- var deferred = $q.defer();
-
- that.nacl.crypto_pwhash_scryptsalsa208sha256_ll(
- that.nacl.from_string(password),
- that.nacl.from_string(salt),
- scryptParams && scryptParams.N || that.constants.SCRYPT_PARAMS.DEFAULT.N,
- scryptParams && scryptParams.r || that.constants.SCRYPT_PARAMS.DEFAULT.r,
- scryptParams && scryptParams.p || that.constants.SCRYPT_PARAMS.DEFAULT.p,
- that.constants.SEED_LENGTH,
- function (err, seed) {
- if (err) { deferred.reject(err); return;}
-
- that.nacl.crypto_sign_seed_keypair(seed, function (err, signKeypair) {
- if (err) { deferred.reject(err); return;}
- var result = {
- signPk: signKeypair.pk,
- signSk: signKeypair.sk
- };
- that.box_keypair_from_sign(result)
- .then(function(boxKeypair) {
- result.boxPk = boxKeypair.pk;
- result.boxSk = boxKeypair.sk;
- deferred.resolve(result);
- })
- .catch(function(err) {
- deferred.reject(err);
- });
- });
-
- }
- );
-
- return deferred.promise;
- };
-
- /**
- * Create key pairs from a seed
- */
- this.seedKeypair = function(seed) {
- var deferred = $q.defer();
-
- that.nacl.crypto_sign_seed_keypair(seed, function (err, signKeypair) {
- if (err) { deferred.reject(err); return;}
- deferred.resolve({
- signPk: signKeypair.pk,
- signSk: signKeypair.sk
- });
- });
- return deferred.promise;
- };
-
-
- /**
- * Get sign PK from salt+password (Scrypt), using cordova
- */
- this.scryptSignPk = function(salt, password, scryptParams) {
- var deferred = $q.defer();
-
- that.nacl.crypto_pwhash_scryptsalsa208sha256_ll(
- that.nacl.from_string(password),
- that.nacl.from_string(salt),
- scryptParams && scryptParams.N || that.constants.SCRYPT_PARAMS.DEFAULT.N,
- scryptParams && scryptParams.r || that.constants.SCRYPT_PARAMS.DEFAULT.r,
- scryptParams && scryptParams.p || that.constants.SCRYPT_PARAMS.DEFAULT.p,
- that.constants.SEED_LENGTH,
- function (err, seed) {
- if (err) { deferred.reject(err); return;}
-
- that.nacl.crypto_sign_seed_keypair(seed, function (err, signKeypair) {
- if (err) { deferred.reject(err); return;}
- deferred.resolve(signKeypair.pk);
- });
-
- }
- );
-
- return deferred.promise;
- };
-
- /**
- * Verify a signature of a message, for a pubkey
- */
- this.verify = function (message, signature, pubkey) {
- var deferred = $q.defer();
- that.nacl.crypto_sign_verify_detached(
- that.nacl.from_base64(signature),
- that.nacl.from_string(message),
- that.nacl.from_base64(pubkey),
- function(err, verified) {
- if (err) { deferred.reject(err); return;}
- deferred.resolve(verified);
- });
- return deferred.promise;
- };
-
- /**
- * Sign a message, from a key pair
- */
- this.sign = function(message, keypair) {
- var deferred = $q.defer();
-
- that.nacl.crypto_sign(
- that.nacl.from_string(message), // message
- keypair.signSk, // sk
- function(err, signedMsg) {
- if (err) { deferred.reject(err); return;}
- var sig;
- if (signedMsg.length > that.constants.crypto_sign_BYTES) {
- sig = new Uint8Array(that.constants.crypto_sign_BYTES);
- for (var i = 0; i < sig.length; i++) sig[i] = signedMsg[i];
- }
- else {
- sig = signedMsg;
- }
- var signature = that.nacl.to_base64(sig);
- deferred.resolve(signature);
- });
-
- return deferred.promise;
- };
-
- /**
- * Compute the box key pair, from a sign key pair
- */
- this.box_keypair_from_sign = function(signKeyPair) {
- if (signKeyPair.boxSk && signKeyPair.boxPk) return $q.when(signKeyPair);
- var deferred = $q.defer();
- var result = {};
- that.nacl.crypto_sign_ed25519_pk_to_curve25519(signKeyPair.signPk, function(err, boxPk) {
- if (err) { deferred.reject(err); return;}
- result.boxPk = boxPk;
- if (result.boxSk) deferred.resolve(result);
- });
- that.nacl.crypto_sign_ed25519_sk_to_curve25519(signKeyPair.signSk, function(err, boxSk) {
- if (err) { deferred.reject(err); return;}
- result.boxSk = boxSk;
- if (result.boxPk) deferred.resolve(result);
- });
-
- return deferred.promise;
- };
-
- /**
- * Compute the box public key, from a sign public key
- */
- this.box_pk_from_sign = function(signPk) {
- var deferred = $q.defer();
- that.nacl.crypto_sign_ed25519_pk_to_curve25519(signPk, function(err, boxPk) {
- if (err) { deferred.reject(err); return;}
- deferred.resolve(boxPk);
- });
- return deferred.promise;
- };
-
- /**
- * Compute the box secret key, from a sign secret key
- */
- this.box_sk_from_sign = function(signSk) {
- var deferred = $q.defer();
- that.nacl.crypto_sign_ed25519_sk_to_curve25519(signSk, function(err, boxSk) {
- if (err) { deferred.reject(err); return;}
- deferred.resolve(boxSk);
- });
- return deferred.promise;
- };
-
- /**
- * Encrypt a message, from a key pair
- */
- this.box = function(message, nonce, recipientPk, senderSk) {
- if (!message) {
- return $q.reject('No message');
- }
- var deferred = $q.defer();
-
- var messageBin = that.nacl.from_string(message);
- if (typeof recipientPk === "string") {
- recipientPk = that.util.decode_base58(recipientPk);
- }
-
- that.nacl.crypto_box_easy(messageBin, nonce, recipientPk, senderSk, function(err, ciphertextBin) {
- if (err) { deferred.reject(err); return;}
- var ciphertext = that.util.encode_base64(ciphertextBin);
- //console.debug('Encrypted message: ' + ciphertext);
- deferred.resolve(ciphertext);
- });
- return deferred.promise;
- };
-
- /**
- * Decrypt a message, from a key pair
- */
- this.box_open = function(cypherText, nonce, senderPk, recipientSk) {
- if (!cypherText) {
- return $q.reject('No cypherText');
- }
- var deferred = $q.defer();
-
- var ciphertextBin = that.nacl.from_base64(cypherText);
- if (typeof senderPk === "string") {
- senderPk = that.util.decode_base58(senderPk);
- }
-
- // Avoid crash if content has not the minimal length - Fix #346
- if (ciphertextBin.length < that.constants.crypto_box_MACBYTES) {
- deferred.reject('Invalid cypher content length');
- return;
- }
-
- that.nacl.crypto_box_open_easy(ciphertextBin, nonce, senderPk, recipientSk, function(err, message) {
- if (err) { deferred.reject(err); return;}
- that.util.array_to_string(message, function(result) {
- //console.debug('Decrypted text: ' + result);
- deferred.resolve(result);
- });
- });
-
- return deferred.promise;
- };
-
- this.load = function() {
- var deferred = $q.defer();
- if (!window.plugins || !window.plugins.MiniSodium) {
- deferred.reject("Cordova plugin 'MiniSodium' not found. Please load Full JS implementation instead.");
- }
- else {
- that.nacl = window.plugins.MiniSodium;
-
- var loadedLib = 0;
- var checkAllLibLoaded = function() {
- loadedLib++;
- if (loadedLib == 2) {
- that.loaded = true;
- deferred.resolve();
- }
- };
- that.async_load_base58(function(lib) {
- that.base58 = lib;
- checkAllLibLoaded();
- });
- that.async_load_sha256(function(lib) {
- that.sha256 = lib;
- checkAllLibLoaded();
- });
- }
-
- return deferred.promise;
- };
-
- // Shortcuts
- this.util.hash = that.util.hash_sha256;
- this.box = {
- keypair: {
- fromSignKeypair: that.box_keypair_from_sign,
- skFromSignSk: that.box_sk_from_sign,
- pkFromSignPk: that.box_pk_from_sign
- },
- pack: that.box,
- open: that.box_open
- };
- }
- CordovaServiceFactory.prototype = new CryptoAbstractService();
-
/* -----------------------------------------------------------------------------------------------------------------
* Create service instance
* ----------------------------------------------------------------------------------------------------------------*/
@@ -905,7 +561,7 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
// endRemoveIf(ios)
// endRemoveIf(android)
- //console.debug("[crypto] Created CryptotUtils service. device=" + isDevice);
+ console.debug("[crypto] Created CryptoUtils service. device=" + isDevice);
ionicReady().then(function() {
console.debug('[crypto] Starting...');
@@ -913,20 +569,14 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
var serviceImpl;
- // Use Cordova plugin implementation, when exists
- if (isDevice && window.plugins && window.plugins.MiniSodium && crypto && crypto.getRandomValues) {
- console.debug('[crypto] Loading \'MiniSodium\' implementation...');
- serviceImpl = new CordovaServiceFactory();
- }
- else {
- console.debug('[crypto] Loading \'FullJS\' implementation...');
- serviceImpl = new FullJSServiceFactory();
- }
+ console.debug('[crypto] Has crypto.getRandomValues ? ' + (crypto && crypto.getRandomValues && true || false));
+ console.debug('[crypto] Loading \'FullJS\' implementation...');
+ serviceImpl = new FullJSServiceFactory();
// Load (async lib)
serviceImpl.load()
.catch(function(err) {
- console.error(err);
+ console.error('[crypto] Failed to load implementation: ' + (err && err.message || err), err);
throw err;
})
.then(function() {
@@ -1059,7 +709,7 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
}
// Type: PubSec
- if (type == 'PubSec') {
+ if (type === 'PubSec') {
// Read Pub field
matches = regexp.FILE.PUB.exec(content);
@@ -1077,7 +727,7 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
}
// Type: WIF or EWIF
- else if (type == 'WIF' || type == 'EWIF') {
+ else if (type === 'WIF' || type === 'EWIF') {
matches = regexp.FILE.DATA.exec(content);
if (!matches) {
return $q.reject('Missing [Data] field in file. This is required for WIF or EWIF format');
@@ -1120,15 +770,15 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
options.type = options.type || (data_int8[0] == 1 && 'WIF') || (data_int8[0] == 2 && 'EWIF');
// Type: WIF
- if (options.type == 'WIF') {
+ if (options.type === 'WIF') {
return parseWIF_v1(data_base58);
}
// Type: EWIF
- if (options.type == 'EWIF') {
+ if (options.type === 'EWIF') {
// If not set, resolve password using the given callback
- if (typeof options.password == "function") {
+ if (typeof options.password === "function") {
//console.debug("[crypto] [EWIF] Executing 'options.password()' to resolve the password...");
options.password = options.password();
if (!options.password) {
@@ -1161,12 +811,12 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
var wif_int8 = CryptoUtils.util.decode_base58(wif_base58);
// Check identifier byte = 0x01
- if (wif_int8[0] != 1) {
+ if (wif_int8[0] !== 1) {
return $q.reject({message: 'Invalid WIF v1 format: expected [0x01] as first byte'});
}
// Check length
- if (wif_int8.length != constants.WIF.DATA_LENGTH) {
+ if (wif_int8.length !== constants.WIF.DATA_LENGTH) {
return $q.reject({message: 'Invalid WIF v1 format: Data must be a '+constants.WIF.DATA_LENGTH+' bytes array, encoded in base 58.'});
}
@@ -1176,7 +826,7 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
// Compute expected checksum
var expectedChecksum = CryptoUtils.util.crypto_hash_sha256(CryptoUtils.util.crypto_hash_sha256(wif_int8_no_checksum)).slice(0,2);
- if (CryptoUtils.util.encode_base58(checksum) != CryptoUtils.util.encode_base58(expectedChecksum)) {
+ if (CryptoUtils.util.encode_base58(checksum) !== CryptoUtils.util.encode_base58(expectedChecksum)) {
$q.reject({message: 'Invalid WIF format: bad checksum'});
}
@@ -1188,7 +838,7 @@ angular.module('cesium.crypto.services', ['cesium.utils.services'])
var ewif_int8 = CryptoUtils.util.decode_base58(ewif_base58);
// Check identifier byte = 0x02
- if (ewif_int8[0] != 2) {
+ if (ewif_int8[0] !== 2) {
return $q.reject({message: 'Invalid EWIF v1 format: Expected [0x02] as first byte'});
}
diff --git a/www/js/services/device-services.js b/www/js/services/device-services.js
index 505d3408284fe58cf36f712b8d7f91c996845bdd..cf88f8f8937c055f314f7db513583a0fab47d8d1 100644
--- a/www/js/services/device-services.js
+++ b/www/js/services/device-services.js
@@ -376,6 +376,8 @@ angular.module('cesium.device.services', ['cesium.utils.services', 'cesium.setti
angular.extend(exports.keyboard, cordova.plugins.Keyboard);
}
+ console.debug('[device] Cordova plugins: ' + Object.keys(cordova.plugins));
+ console.debug('[device] Windows plugins: ' + Object.keys(window.plugins));
console.debug('[device] Ionic platform ready, with {camera: {0}, barcode: {1}, keyboard: {2}, clipboard: {3}, intent: {4}, network: {5}}'
.format(exports.camera.enable, exports.barcode.enable, exports.keyboard.enable, exports.clipboard.enable, exports.intent.enable, exports.network.enable));
diff --git a/yarn.lock b/yarn.lock
index 48bde1313ec0cc92a0636b4e7ffd19b932e3c14f..f77bfd57f0f714fe2d5ecd66ba5125dd9b0dba76 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -827,7 +827,7 @@
dependencies:
graceful-fs "4.2.10"
-"@pnpm/npm-conf@2.2.0", "@pnpm/npm-conf@^2.1.0":
+"@pnpm/npm-conf@^2.1.0":
version "2.2.0"
resolved "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.2.0.tgz#221b4cfcde745d5f8928c25f391e5cc9d405b345"
integrity sha512-roLI1ul/GwzwcfcVpZYPdrgW2W/drLriObl1h+yLF5syc8/5ULWw2ALbCHUWF+4YltIqA3xFSbG4IwyJz37e9g==
@@ -3178,10 +3178,6 @@ cordova-plugin-ionic-webview@^5.0.0:
resolved "https://registry.npmjs.org/cordova-plugin-ionic-webview/-/cordova-plugin-ionic-webview-5.0.0.tgz#d58741af85754d80da82c7f673842a3e71bde630"
integrity sha512-Wq0kCanxubK/JroTW4Mp5soayScnRyiY1eCkbwiz1Dyt1xHOiOW/v+1miqtBHtnZhcXw25TulCKAVJzkNBdmyg==
-"cordova-plugin-minisodium@git+https://github.com/duniter-cesium/cordova-plugin-minisodium.git#v1.0.3":
- version "1.0.3"
- resolved "git+https://github.com/duniter-cesium/cordova-plugin-minisodium.git#d0ab304dfca6c59ad61fddf30c77b9b84c974a7e"
-
cordova-plugin-network-information@~3.0.0:
version "3.0.0"
resolved "https://registry.npmjs.org/cordova-plugin-network-information/-/cordova-plugin-network-information-3.0.0.tgz#8b5546b56b44e6d2c69be7cc920d5e134cbb2b7f"
@@ -5322,14 +5318,14 @@ glob@9.3.0:
path-scurry "^1.6.1"
glob@^10.2.2:
- version "10.2.3"
- resolved "https://registry.npmjs.org/glob/-/glob-10.2.3.tgz#aa6765963fe6c5936d5c2e00943e7af06302a1a7"
- integrity sha512-Kb4rfmBVE3eQTAimgmeqc2LwSnN0wIOkkUL6HmxEFxNJ4fHghYHVbFba/HcGcRjE6s9KoMNK3rSOwkL4PioZjg==
+ version "10.2.4"
+ resolved "https://registry.npmjs.org/glob/-/glob-10.2.4.tgz#f5bf7ddb080e3e9039b148a9e2aef3d5ebfc0a25"
+ integrity sha512-fDboBse/sl1oXSLhIp0FcCJgzW9KmhC/q8ULTKC82zc+DL3TL7FNb8qlt5qqXN53MsKEUSIcb+7DLmEygOE5Yw==
dependencies:
foreground-child "^3.1.0"
jackspeak "^2.0.3"
minimatch "^9.0.0"
- minipass "^5.0.0"
+ minipass "^5.0.0 || ^6.0.0"
path-scurry "^1.7.0"
glob@^5.0.15:
@@ -8758,6 +8754,11 @@ minipass@^5.0.0:
resolved "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz#3e9788ffb90b694a5d0ec94479a45b5d8738133d"
integrity sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==
+"minipass@^5.0.0 || ^6.0.0":
+ version "6.0.1"
+ resolved "https://registry.npmjs.org/minipass/-/minipass-6.0.1.tgz#315417c259cb32a1b2fc530c0e7f55c901a60a6d"
+ integrity sha512-Tenl5QPpgozlOGBiveNYHg2f6y+VpxsXRoIHFUVJuSmTonXRAE6q9b8Mp/O46762/2AlW4ye4Nkyvx0fgWDKbw==
+
minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2:
version "2.1.2"
resolved "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931"
@@ -9991,7 +9992,7 @@ path-root@^0.1.1:
dependencies:
path-root-regex "^0.1.0"
-path-scurry@^1.6.1, path-scurry@^1.7.0:
+path-scurry@^1.6.1:
version "1.8.0"
resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.8.0.tgz#809e09690c63817c76d0183f19a5b21b530ff7d2"
integrity sha512-IjTrKseM404/UAWA8bBbL3Qp6O2wXkanuIE3seCxBH7ctRuvH1QRawy1N3nVDHGkdeZsjOsSe/8AQBL/VQCy2g==
@@ -9999,6 +10000,14 @@ path-scurry@^1.6.1, path-scurry@^1.7.0:
lru-cache "^9.1.1"
minipass "^5.0.0"
+path-scurry@^1.7.0:
+ version "1.9.1"
+ resolved "https://registry.npmjs.org/path-scurry/-/path-scurry-1.9.1.tgz#838566bb22e38feaf80ecd49ae06cd12acd782ee"
+ integrity sha512-UgmoiySyjFxP6tscZDgWGEAgsW5ok8W3F5CJDnnH2pozwSTGE6eH7vwTotMwATWA2r5xqdkKdxYPkwlJjAI/3g==
+ dependencies:
+ lru-cache "^9.1.1"
+ minipass "^5.0.0 || ^6.0.0"
+
path-to-regexp@0.1.7:
version "0.1.7"
resolved "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
@@ -10185,9 +10194,9 @@ posix-character-classes@^0.1.0:
integrity sha512-xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg==
postcss-selector-parser@^6.0.10:
- version "6.0.12"
- resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.12.tgz#2efae5ffab3c8bfb2b7fbf0c426e3bca616c4abb"
- integrity sha512-NdxGCAZdRrwVI1sy59+Wzrh+pMMHxapGnpfenDVlMEXoOcvt4pGE0JLK9YY2F5dLxcFYA/YbVQKhcGU+FtSYQg==
+ version "6.0.13"
+ resolved "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.0.13.tgz#d05d8d76b1e8e173257ef9d60b706a8e5e99bf1b"
+ integrity sha512-EaV1Gl4mUEV4ddhDnv/xtj7sxwrwxdetHdWUGnT4VJQf+4d05v6lHYZr8N573k5Z0BViss7BDhfWtKS3+sfAqQ==
dependencies:
cssesc "^3.0.0"
util-deprecate "^1.0.2"
@@ -10297,7 +10306,7 @@ properties-parser@^0.3.1:
dependencies:
string.prototype.codepointat "^0.2.0"
-proto-list@1.2.1, proto-list@~1.2.1:
+proto-list@~1.2.1:
version "1.2.1"
resolved "https://registry.npmjs.org/proto-list/-/proto-list-1.2.1.tgz#2ffadc1c8fa35d3401fd8c30ada776113da0a66a"
integrity sha512-lz+pbjtY8MV0c+P9BsAiBT6F716SBH7iXpkEut63W7khkUB0McsgLkYXZcmVfhClhs4N7E3v9sx26cxxe/Z5oA==
@@ -11265,7 +11274,14 @@ semver@^6.0.0, semver@^6.2.0, semver@^6.3.0:
resolved "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d"
integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==
-semver@^7.0.0, semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
+semver@^7.0.0:
+ version "7.5.1"
+ resolved "https://registry.npmjs.org/semver/-/semver-7.5.1.tgz#c90c4d631cf74720e46b21c1d37ea07edfab91ec"
+ integrity sha512-Wvss5ivl8TMRZXXESstBA4uR5iXgEN/VC5/sOcuXdVLzcdkz4HWetIoRfG5gb5X+ij/G9rw9YoGn3QoQ8OCSpw==
+ dependencies:
+ lru-cache "^6.0.0"
+
+semver@^7.1.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8:
version "7.5.0"
resolved "https://registry.npmjs.org/semver/-/semver-7.5.0.tgz#ed8c5dc8efb6c629c88b23d41dc9bf40c1d96cd0"
integrity sha512-+XC0AD/R7Q2mPSRuy2Id0+CGTZ98+8f+KvwirxOKIEyid+XSx6HbC63p+O4IndTHuX5Z+JxQ0TghCkO5Cg/2HA==
@@ -11408,9 +11424,9 @@ signal-exit@^4.0.1:
integrity sha512-MY2/qGx4enyjprQnFaZsHib3Yadh3IXyV2C321GY0pjGfVBu4un0uDJkwgdxqO+Rdx8JMT8IfJIRwbYVz3Ob3Q==
sigstore@^1.3.0:
- version "1.5.0"
- resolved "https://registry.npmjs.org/sigstore/-/sigstore-1.5.0.tgz#795e44b8e9ab0089daa90eff792a831ba87ffe9c"
- integrity sha512-i3nhvdobiPj8XrXNIggjeur6+A5iAQ4f+r1bR5SGitFJBbthy/6c7Fz0h+kY70Wua1FSMdDr/UEhXSVRXNpynw==
+ version "1.5.1"
+ resolved "https://registry.npmjs.org/sigstore/-/sigstore-1.5.1.tgz#92b9e371a37d1f53d3baa991a2c63b89bbe3cee5"
+ integrity sha512-FIPThk7S1oeFXn8O8yh7gpyiQb6lYXzMIlOBzXhId/f81VvU587xNCHc4jd2lZ9724UkKUYYTuKSYcjhDSRD/Q==
dependencies:
"@sigstore/protobuf-specs" "^0.1.0"
make-fetch-happen "^11.0.1"