tabris 3.9.0-dev.20220523 → 3.9.0-dev.20220526

package/boot.js

@@ -1,5 +1,5 @@
 /*!
- * Tabris.js 3.9.0-dev.20220523+0310
+ * Tabris.js 3.9.0-dev.20220526+0310
  * 
  * Copyright (c) 2014, 2020 EclipseSource Inc.
  * All rights reserved.

package/globals.d.ts

@@ -997,8 +997,8 @@ declare class SubtleCrypto {
   decrypt(algorithm: {name: 'AES-GCM', iv: ArrayBuffer | TypedArray, tagLength?: number}, key: CryptoKey, data: ArrayBuffer | TypedArray): Promise<ArrayBuffer>;
 
   /**
-   * Takes a master key and derives a secret key from it using the given algorithm. Currently only
-   * supports the Elliptic Curve Diffie-Hellman (ECDH) algorithm.
+   * Takes a master key and derives a secret key from it using the Elliptic Curve Diffie-Hellman (ECDH)
+   * algorithm.
    * @param algorithm
    * @param baseKey
    * @param derivedKeyAlgorithm
@@ -1007,6 +1007,16 @@ declare class SubtleCrypto {
    */
   deriveKey(algorithm: {name: 'ECDH', namedCurve: 'P-256', public: CryptoKey}, baseKey: CryptoKey, derivedKeyAlgorithm: {name: 'AES-GCM', length: number}, extractable: boolean, keyUsages: string[]): Promise<CryptoKey>;
 
+  /**
+   * Takes a master key and derives a secret key from it using the HKDF algorithm.
+   * @param algorithm
+   * @param baseKey
+   * @param derivedKeyAlgorithm
+   * @param extractable
+   * @param keyUsages
+   */
+  deriveKey(algorithm: {name: 'HKDF', hash: 'SHA-1' | 'SHA-256' | 'SHA-384' | 'SHA-512', salt: ArrayBuffer | TypedArray, info: ArrayBuffer | TypedArray}, baseKey: CryptoKey, derivedKeyAlgorithm: {name: 'AES-GCM', length: number}, extractable: boolean, keyUsages: string[]): Promise<CryptoKey>;
+
   /**
    * Provides the digest value of the given data as an ArrayBuffer. Fo this the method uses the hashing
    * algorithms provided by the operating system.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabris",
-  "version": "3.9.0-dev.20220523+0310",
+  "version": "3.9.0-dev.20220526+0310",
   "description": "Mobile apps with native UIs in JavaScript",
   "keywords": [
     "native",

package/tabris.d.ts

@@ -1,4 +1,4 @@
-// Type definitions for Tabris.js 3.9.0-dev.20220523+0310
+// Type definitions for Tabris.js 3.9.0-dev.20220526+0310
 /// <reference path="globals.d.ts" />
 
 // General helper types

package/tabris.js

@@ -1,5 +1,5 @@
 /*!
- * Tabris.js 3.9.0-dev.20220523+0310
+ * Tabris.js 3.9.0-dev.20220526+0310
  * 
  * Copyright (c) 2014, 2020 EclipseSource Inc.
  * All rights reserved.
@@ -5026,7 +5026,7 @@ class Tabris extends NativeObject {
         this.$publishProxies();
     }
     get version() {
-        return '3.9.0-dev.20220523+0310';
+        return '3.9.0-dev.20220526+0310';
     }
     get started() {
         return !!this._started;
@@ -10428,15 +10428,30 @@ class _CryptoKey extends NativeObject {
     }
     derive(algorithm, baseKey, derivedKeyAlgorithm, extractable, keyUsages) {
         return __awaiter(this, void 0, void 0, function* () {
-            return new Promise$1((onSuccess, onError) => this._nativeCall('derive', {
-                algorithm: Object.assign(Object.assign({}, algorithm), { public: getCid(algorithm.public) }),
-                baseKey: getCid(baseKey),
-                derivedKeyAlgorithm,
-                extractable,
-                keyUsages,
-                onSuccess,
-                onError: wrapErrorCb(onError)
-            }));
+            return new Promise$1((onSuccess, onError) => {
+                if (algorithm.name === 'ECDH') {
+                    return this._nativeCall('derive', {
+                        algorithm: Object.assign(Object.assign({}, algorithm), { public: getCid(algorithm.public) }),
+                        baseKey: getCid(baseKey),
+                        derivedKeyAlgorithm,
+                        extractable,
+                        keyUsages,
+                        onSuccess,
+                        onError: wrapErrorCb(onError)
+                    });
+                }
+                else {
+                    return this._nativeCall('derive', {
+                        algorithm: Object.assign(Object.assign({}, algorithm), { salt: getBuffer(algorithm.salt), info: getBuffer(algorithm.info) }),
+                        baseKey: getCid(baseKey),
+                        derivedKeyAlgorithm,
+                        extractable,
+                        keyUsages,
+                        onSuccess,
+                        onError: wrapErrorCb(onError)
+                    });
+                }
+            });
         });
     }
     generate(algorithm, extractable, keyUsages) {
@@ -10525,10 +10540,17 @@ class SubtleCrypto {
             if (arguments.length !== 5) {
                 throw new TypeError(`Expected 5 arguments, got ${arguments.length}`);
             }
-            allowOnlyKeys(algorithm, ['name', 'namedCurve', 'public']);
-            allowOnlyValues(algorithm.name, ['ECDH'], 'algorithm.name');
-            allowOnlyValues(algorithm.namedCurve, ['P-256'], 'algorithm.namedCurve');
-            checkType(algorithm.public, CryptoKey, { name: 'algorithm.public' });
+            allowOnlyKeys(algorithm, ['name', 'namedCurve', 'public', 'hash', 'salt', 'info']);
+            allowOnlyValues(algorithm.name, ['ECDH', 'HKDF'], 'algorithm.name');
+            if (algorithm.name === 'ECDH') {
+                allowOnlyValues(algorithm.namedCurve, ['P-256'], 'algorithm.namedCurve');
+                checkType(algorithm.public, CryptoKey, { name: 'algorithm.public' });
+            }
+            else if (algorithm.name === 'HKDF') {
+                checkType(algorithm.hash, String, { name: 'algorithm.hash' });
+                checkType(getBuffer(algorithm.salt), ArrayBuffer, { name: 'algorithm.salt' });
+                checkType(getBuffer(algorithm.info), ArrayBuffer, { name: 'algorithm.info' });
+            }
             allowOnlyKeys(derivedKeyAlgorithm, ['name', 'length']);
             allowOnlyValues(derivedKeyAlgorithm.name, ['AES-GCM'], 'derivedKeyAlgorithm.name');
             checkType(derivedKeyAlgorithm.length, Number, { name: 'derivedKeyAlgorithm.length' });
@@ -13347,7 +13369,7 @@ function fetch(input, init) {
                     hr.dispose();
                     break;
                 case 'error':
-                    reject(new TypeError('Network request failed'));
+                    reject(new TypeError(event.message || 'Network request failed'));
                     hr.dispose();
                     break;
                 case 'timeout':