OfficialDakari
/
matrix-dart-sdk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: Type error when using CryptoKey in dart web 

In Dart Web when using CryptoKey we
get a type error. When using the html version of it
it seems to work fine.
This commit is contained in:
Krille Fear 2021-10-13 13:51:37 +02:00
parent ffea21a309
commit 3ae42d1a88
1 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
lib/src/utils/crypto/subtle.dart
View File

@ -9,9 +9,6 @@ import 'dart:async';
import 'dart:js_util'; import 'dart:js_util';
import 'dart:typed_data'; import 'dart:typed_data';
@JS()
class CryptoKey {}
@JS() @JS()
@anonymous @anonymous
class Pbkdf2Params { class Pbkdf2Params {
@ -41,16 +38,16 @@ class AesCtrParams {
} }
@JS('crypto.subtle.encrypt') @JS('crypto.subtle.encrypt')
external dynamic _encrypt(dynamic algorithm, CryptoKey key, Uint8List data); external dynamic _encrypt(dynamic algorithm, dynamic key, Uint8List data);
Future<ByteBuffer> encrypt(dynamic algorithm, CryptoKey key, Uint8List data) { Future<ByteBuffer> encrypt(dynamic algorithm, dynamic key, Uint8List data) {
return promiseToFuture(_encrypt(algorithm, key, data)); return promiseToFuture(_encrypt(algorithm, key, data));
} }
@JS('crypto.subtle.decrypt') @JS('crypto.subtle.decrypt')
external dynamic _decrypt(dynamic algorithm, CryptoKey key, Uint8List data); external dynamic _decrypt(dynamic algorithm, dynamic key, Uint8List data);
Future<ByteBuffer> decrypt(dynamic algorithm, CryptoKey key, Uint8List data) { Future<ByteBuffer> decrypt(dynamic algorithm, dynamic key, Uint8List data) {
return promiseToFuture(_decrypt(algorithm, key, data)); return promiseToFuture(_decrypt(algorithm, key, data));
} }
@ -58,34 +55,33 @@ Future<ByteBuffer> decrypt(dynamic algorithm, CryptoKey key, Uint8List data) {
external dynamic _importKey(String format, dynamic keyData, dynamic algorithm, external dynamic _importKey(String format, dynamic keyData, dynamic algorithm,
bool extractable, List<String> keyUsages); bool extractable, List<String> keyUsages);
Future<CryptoKey> importKey(String format, dynamic keyData, dynamic algorithm, Future<dynamic> importKey(String format, dynamic keyData, dynamic algorithm,
bool extractable, List<String> keyUsages) { bool extractable, List<String> keyUsages) {
return promiseToFuture( return promiseToFuture(
_importKey(format, keyData, algorithm, extractable, keyUsages)); _importKey(format, keyData, algorithm, extractable, keyUsages));
} }
@JS('crypto.subtle.exportKey') @JS('crypto.subtle.exportKey')
external dynamic _exportKey(String algorithm, CryptoKey key); external dynamic _exportKey(String algorithm, dynamic key);
Future<dynamic> exportKey(String algorithm, CryptoKey key) { Future<dynamic> exportKey(String algorithm, dynamic key) {
return promiseToFuture(_exportKey(algorithm, key)); return promiseToFuture(_exportKey(algorithm, key));
} }
@JS('crypto.subtle.deriveKey') @JS('crypto.subtle.deriveKey')
external dynamic _deriveKey(dynamic algorithm, CryptoKey baseKey, external dynamic _deriveKey(dynamic algorithm, dynamic baseKey,
dynamic derivedKeyAlgorithm, bool extractable, List<String> keyUsages); dynamic derivedKeyAlgorithm, bool extractable, List<String> keyUsages);
Future<ByteBuffer> deriveKey(dynamic algorithm, CryptoKey baseKey, Future<ByteBuffer> deriveKey(dynamic algorithm, dynamic baseKey,
dynamic derivedKeyAlgorithm, bool extractable, List<String> keyUsages) { dynamic derivedKeyAlgorithm, bool extractable, List<String> keyUsages) {
return promiseToFuture(_deriveKey( return promiseToFuture(_deriveKey(
algorithm, baseKey, derivedKeyAlgorithm, extractable, keyUsages)); algorithm, baseKey, derivedKeyAlgorithm, extractable, keyUsages));
} }
@JS('crypto.subtle.deriveBits') @JS('crypto.subtle.deriveBits')
external dynamic _deriveBits(dynamic algorithm, CryptoKey baseKey, int length); external dynamic _deriveBits(dynamic algorithm, dynamic baseKey, int length);
Future<ByteBuffer> deriveBits( Future<ByteBuffer> deriveBits(dynamic algorithm, dynamic baseKey, int length) {
dynamic algorithm, CryptoKey baseKey, int length) {
return promiseToFuture(_deriveBits(algorithm, baseKey, length)); return promiseToFuture(_deriveBits(algorithm, baseKey, length));
} }