tabris 3.9.0-dev.20220708 → 3.9.0-dev.20220709

package/boot.js

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

package/globals.d.ts

@@ -997,7 +997,24 @@ 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 Elliptic Curve Diffie-Hellman (ECDH)
+   * Takes a base key and derives an array of bits from it using the Elliptic Curve Diffie-Hellman (ECDH)
+   * algorithm.
+   * @param algorithm
+   * @param baseKey
+   * @param length
+   */
+  deriveBits(algorithm: {name: 'ECDH', namedCurve: 'P-256', public: CryptoKey}, baseKey: CryptoKey, length: number): Promise<ArrayBuffer>;
+
+  /**
+   * Takes a base key and derives an array of bits from it using the HKDF algorithm.
+   * @param algorithm
+   * @param baseKey
+   * @param length
+   */
+  deriveBits(algorithm: {name: 'HKDF', hash: 'SHA-1' | 'SHA-256' | 'SHA-384' | 'SHA-512', salt: ArrayBuffer | TypedArray, info: ArrayBuffer | TypedArray}, baseKey: CryptoKey, length: number): Promise<ArrayBuffer>;
+
+  /**
+   * Takes a base key and derives a secret key from it using the Elliptic Curve Diffie-Hellman (ECDH)
    * algorithm.
    * @param algorithm
    * @param baseKey
@@ -1008,7 +1025,7 @@ 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.
+   * Takes a base key and derives a secret key from it using the HKDF algorithm.
    * @param algorithm
    * @param baseKey
    * @param derivedKeyAlgorithm

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tabris",
-  "version": "3.9.0-dev.20220708+0310",
+  "version": "3.9.0-dev.20220709+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.20220708+0310
+// Type definitions for Tabris.js 3.9.0-dev.20220709+0310
 /// <reference path="globals.d.ts" />
 
 // General helper types

package/tabris.js

@@ -1,5 +1,5 @@
 /*!
- * Tabris.js 3.9.0-dev.20220708+0310
+ * Tabris.js 3.9.0-dev.20220709+0310
  * 
  * Copyright (c) 2014, 2020 EclipseSource Inc.
  * All rights reserved.
@@ -998,7 +998,16 @@ function setNativeObject(object, nativeObject$$1) {
  * @returns {{cid: string, isDisposed: () => boolean, dispose: () => void}}
  */
 function getNativeObject(object) {
-    return object instanceof Object ? object[nativeObject] : null;
+    if (!(object instanceof Object)) {
+        return null;
+    }
+    if (object[nativeObject]) {
+        return object[nativeObject];
+    }
+    if (typeof object.cid === 'string' && object.isDisposed instanceof Function) {
+        return object;
+    }
+    return null;
 }
 /**
  * @param {object} object
@@ -5026,7 +5035,7 @@ class Tabris extends NativeObject {
         this.$publishProxies();
     }
     get version() {
-        return '3.9.0-dev.20220708+0310';
+        return '3.9.0-dev.20220709+0310';
     }
     get started() {
         return !!this._started;
@@ -10535,22 +10544,30 @@ class SubtleCrypto {
             });
         });
     }
+    deriveBits(algorithm, baseKey, length) {
+        return __awaiter(this, arguments, void 0, function* () {
+            if (arguments.length !== 3) {
+                throw new TypeError(`Expected 3 arguments, got ${arguments.length}`);
+            }
+            checkDeriveAlgorithm(algorithm);
+            checkType(baseKey, CryptoKey, { name: 'baseKey' });
+            checkType(length, Number, { name: 'length' });
+            const nativeObject = new _CryptoKey();
+            try {
+                yield nativeObject.derive(algorithm, baseKey, { length, name: 'AES-GCM' }, true, []);
+                return new Promise$1((onSuccess, onReject) => this._nativeObject.subtleExportKey('raw', nativeObject, onSuccess, onReject));
+            }
+            finally {
+                nativeObject.dispose();
+            }
+        });
+    }
     deriveKey(algorithm, baseKey, derivedKeyAlgorithm, extractable, keyUsages) {
         return __awaiter(this, arguments, void 0, function* () {
             if (arguments.length !== 5) {
                 throw new TypeError(`Expected 5 arguments, got ${arguments.length}`);
             }
-            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' });
-            }
+            checkDeriveAlgorithm(algorithm);
             allowOnlyKeys(derivedKeyAlgorithm, ['name', 'length']);
             allowOnlyValues(derivedKeyAlgorithm.name, ['AES-GCM'], 'derivedKeyAlgorithm.name');
             checkType(derivedKeyAlgorithm.length, Number, { name: 'derivedKeyAlgorithm.length' });
@@ -10694,6 +10711,19 @@ class NativeCrypto extends NativeObject {
             onError: (reason) => onError(new Error(String(reason)))
         });
     }
+}
+function checkDeriveAlgorithm(algorithm) {
+    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' });
+    }
 }
 
 class Drawer extends ContentView {