tabris 3.9.0-dev.20220709 → 3.9.0-dev.20220712

package/boot.js

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

package/globals.d.ts

@@ -1069,15 +1069,14 @@ declare class SubtleCrypto {
 
   /**
    * Takes an external key in a portable format and returns a CryptoKey object that can be used with the
-   * SubtleCrypto API. Currently only supports the Elliptic Curve Diffie-Hellman (ECDH) algorithm. Keys
-   * may be in spki or pkcs8 format.
+   * SubtleCrypto API. Keys may be in spki or pkcs8 format.
    * @param format
    * @param keyData
    * @param algorithm
    * @param extractable
    * @param keyUsages
    */
-  importKey(format: 'spki' | 'pkcs8', keyData: ArrayBuffer | TypedArray, algorithm: {name: 'ECDH', namedCurve: 'P-256'}, extractable: boolean, keyUsages: string[]): Promise<CryptoKey>;
+  importKey(format: 'spki' | 'pkcs8' | 'raw', keyData: ArrayBuffer | TypedArray, algorithm: {name: 'ECDH', namedCurve: 'P-256'} | {name: 'AES-GCM'} | 'HKDF' | 'AES-GCM', extractable: boolean, keyUsages: string[]): Promise<CryptoKey>;
 }
 
 

package/package.json

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

package/tabris.js

@@ -1,5 +1,5 @@
 /*!
- * Tabris.js 3.9.0-dev.20220709+0310
+ * Tabris.js 3.9.0-dev.20220712+0310
  * 
  * Copyright (c) 2014, 2020 EclipseSource Inc.
  * All rights reserved.
@@ -5035,7 +5035,7 @@ class Tabris extends NativeObject {
         this.$publishProxies();
     }
     get version() {
-        return '3.9.0-dev.20220709+0310';
+        return '3.9.0-dev.20220712+0310';
     }
     get started() {
         return !!this._started;
@@ -10438,6 +10438,9 @@ class _CryptoKey extends NativeObject {
     derive(algorithm, baseKey, derivedKeyAlgorithm, extractable, keyUsages) {
         return __awaiter(this, void 0, void 0, function* () {
             return new Promise$1((onSuccess, onError) => {
+                if (typeof algorithm === 'string') {
+                    throw new TypeError(algorithm + ' not supported');
+                }
                 if (algorithm.name === 'ECDH') {
                     return this._nativeCall('derive', {
                         algorithm: Object.assign(Object.assign({}, algorithm), { public: getCid(algorithm.public) }),
@@ -10449,7 +10452,7 @@ class _CryptoKey extends NativeObject {
                         onError: wrapErrorCb(onError)
                     });
                 }
-                else {
+                else if (algorithm.name === 'HKDF') {
                     return this._nativeCall('derive', {
                         algorithm: Object.assign(Object.assign({}, algorithm), { salt: getBuffer(algorithm.salt), info: getBuffer(algorithm.info) }),
                         baseKey: getCid(baseKey),
@@ -10460,6 +10463,9 @@ class _CryptoKey extends NativeObject {
                         onError: wrapErrorCb(onError)
                     });
                 }
+                else {
+                    throw new TypeError('Algorithm not supported');
+                }
             });
         });
     }
@@ -10528,17 +10534,31 @@ class SubtleCrypto {
             if (arguments.length !== 5) {
                 throw new TypeError(`Expected 5 arguments, got ${arguments.length}`);
             }
-            allowOnlyValues(format, ['spki', 'pkcs8'], 'format');
+            allowOnlyValues(format, ['spki', 'pkcs8', 'raw'], 'format');
             checkType(getBuffer(keyData), ArrayBuffer, { name: 'keyData' });
-            allowOnlyKeys(algorithm, ['name', 'namedCurve']);
-            allowOnlyValues(algorithm.name, ['ECDH'], 'algorithm.name');
-            allowOnlyValues(algorithm.namedCurve, ['P-256'], 'algorithm.namedCurve');
+            if (typeof algorithm === 'string') {
+                allowOnlyValues(algorithm, ['ECDH', 'AES-GCM', 'HKDF'], 'algorithm');
+            }
+            else {
+                checkType(algorithm, Object, { name: 'algorithm' });
+                allowOnlyValues(algorithm.name, ['ECDH', 'AES-GCM'], 'algorithm.name');
+                if (algorithm.name === 'ECDH') {
+                    allowOnlyKeys(algorithm, ['name', 'namedCurve']);
+                    allowOnlyValues(algorithm.namedCurve, ['P-256'], 'algorithm.namedCurve');
+                }
+                else {
+                    allowOnlyKeys(algorithm, ['name']);
+                }
+            }
             checkType(extractable, Boolean, { name: 'extractable' });
             checkType(keyUsages, Array, { name: 'keyUsages' });
             const nativeObject = new _CryptoKey();
-            yield nativeObject.import(format, keyData, algorithm, extractable, keyUsages);
+            const algorithmKeys = Object.keys(algorithm);
+            const algorithmInternal = algorithmKeys.length === 1 && algorithmKeys[0] === 'name'
+                ? algorithm.name : algorithm;
+            yield nativeObject.import(format, keyData, algorithmInternal, extractable, keyUsages);
             return new CryptoKey(nativeObject, {
-                algorithm,
+                algorithm: algorithmInternal,
                 extractable,
                 usages: Object.freeze(keyUsages.concat())
             });
@@ -10713,6 +10733,12 @@ class NativeCrypto extends NativeObject {
     }
 }
 function checkDeriveAlgorithm(algorithm) {
+    if (algorithm === 'HKDF') {
+        return;
+    }
+    if (algorithm === 'AES-GCM') {
+        throw new TypeError('AES-GCM not supported for this function');
+    }
     allowOnlyKeys(algorithm, ['name', 'namedCurve', 'public', 'hash', 'salt', 'info']);
     allowOnlyValues(algorithm.name, ['ECDH', 'HKDF'], 'algorithm.name');
     if (algorithm.name === 'ECDH') {