Merge branch 'master' into refactor-rsaoaep

jonasfj · web-flow · commit 084db0d20ec9 · 2024-10-17T10:43:18.000+02:00
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -56,14 +56,15 @@ jobs:
       - run: flutter test --platform chrome
       - run: flutter test integration_test/webcrypto_test.dart -d macos
         working-directory: ./example
-      - uses: nanasess/setup-chromedriver@v2
-      - name: Run integration_test with chromedriver
-        working-directory: ./example
-        run: |
-          ../tool/with-chromedriver.sh flutter drive \
-            --driver=test_driver/integration_test.dart \
-            --target=integration_test/webcrypto_test.dart \
-            -d chrome
+      # TODO: Enable chromdriver testing on MacOS when it works reliably
+      #- uses: nanasess/setup-chromedriver@v2
+      #- name: Run integration_test with chromedriver
+      #  working-directory: ./example
+      #  run: |
+      #    ../tool/with-chromedriver.sh flutter drive \
+      #      --driver=test_driver/integration_test.dart \
+      #      --target=integration_test/webcrypto_test.dart \
+      #      -d chrome
       - run: flutter pub run test -p vm,chrome # TODO: Enable firefox if it works
   windows:
     name: webcrypto on Windows desktop / Chrome / Firefox
diff --git a/darwin/webcrypto.podspec b/darwin/webcrypto.podspec
@@ -28,7 +28,6 @@ Pod::Spec.new do |s|
   s.compiler_flags      = [
     '-DOPENSSL_NO_ASM',
     '-DDOPENSSL_SMALL',
-    '-GCC_WARN_INHIBIT_ALL_WARNINGS',
     '-w',
   ]
 
diff --git a/lib/src/impl_ffi/impl_ffi.dart b/lib/src/impl_ffi/impl_ffi.dart
@@ -92,4 +92,7 @@ final class _WebCryptoImpl implements WebCryptoImpl {
 
   @override
   final rsaOaepPublicKey = const _StaticRsaOaepPublicKeyImpl();
+
+  @override
+  final pbkdf2SecretKey = const _StaticPbkdf2SecretKeyImpl();
 }
diff --git a/lib/src/impl_ffi/impl_ffi.pbkdf2.dart b/lib/src/impl_ffi/impl_ffi.pbkdf2.dart
@@ -16,14 +16,23 @@
 
 part of 'impl_ffi.dart';
 
-Future<Pbkdf2SecretKey> pbkdf2SecretKey_importRawKey(List<int> keyData) async {
-  return _Pbkdf2SecretKey(Uint8List.fromList(keyData));
+Future<Pbkdf2SecretKeyImpl> pbkdf2SecretKey_importRawKey(List<int> keyData) async {
+  return _Pbkdf2SecretKeyImpl(Uint8List.fromList(keyData));
 }
 
-class _Pbkdf2SecretKey implements Pbkdf2SecretKey {
+final class _StaticPbkdf2SecretKeyImpl implements StaticPbkdf2SecretKeyImpl {
+  const _StaticPbkdf2SecretKeyImpl();
+
+  @override
+  Future<Pbkdf2SecretKeyImpl> importRawKey(List<int> keyData) {
+    return pbkdf2SecretKey_importRawKey(keyData);
+  }
+}
+
+final class _Pbkdf2SecretKeyImpl implements Pbkdf2SecretKeyImpl {
   final Uint8List _key;
 
-  _Pbkdf2SecretKey(this._key);
+  _Pbkdf2SecretKeyImpl(this._key);
 
   @override
   String toString() {
diff --git a/lib/src/impl_interface/impl_interface.dart b/lib/src/impl_interface/impl_interface.dart
@@ -24,6 +24,7 @@ part 'impl_interface.aescbc.dart';
 part 'impl_interface.aesctr.dart';
 part 'impl_interface.hmac.dart';
 part 'impl_interface.rsaoaep.dart';
+part 'impl_interface.pbkdf2.dart';
 part 'impl_interface.aesgcm.dart';
 
 /// Interface to be provided by platform implementations.
@@ -49,4 +50,5 @@ abstract interface class WebCryptoImpl {
   StaticHmacSecretKeyImpl get hmacSecretKey;
   StaticRsaOaepPrivateKeyImpl get rsaOaepPrivateKey;
   StaticRsaOaepPublicKeyImpl get rsaOaepPublicKey;
+  StaticPbkdf2SecretKeyImpl get pbkdf2SecretKey;
 }
diff --git a/lib/src/impl_interface/impl_interface.pbkdf2.dart b/lib/src/impl_interface/impl_interface.pbkdf2.dart
@@ -0,0 +1,23 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+part of 'impl_interface.dart';
+
+abstract interface class StaticPbkdf2SecretKeyImpl {
+  Future<Pbkdf2SecretKeyImpl> importRawKey(List<int> keyData);
+}
+
+abstract interface class Pbkdf2SecretKeyImpl {
+  Future<Uint8List> deriveBits(int length, Hash hash, List<int> salt, int iterations);
+}
diff --git a/lib/src/impl_js/impl_js.dart b/lib/src/impl_js/impl_js.dart
@@ -78,4 +78,7 @@ final class _WebCryptoImpl implements WebCryptoImpl {
 
   @override
   final rsaOaepPublicKey = const _StaticRsaOaepPublicKeyImpl();
+
+  @override
+  final pbkdf2SecretKey = const _StaticPbkdf2SecretKeyImpl();
 }
diff --git a/lib/src/impl_js/impl_js.pbkdf2.dart b/lib/src/impl_js/impl_js.pbkdf2.dart
@@ -18,8 +18,8 @@ part of 'impl_js.dart';
 
 const _pbkdf2AlgorithmName = 'PBKDF2';
 
-Future<Pbkdf2SecretKey> pbkdf2SecretKey_importRawKey(List<int> keyData) async {
-  return _Pbkdf2SecretKey(await _importKey(
+Future<Pbkdf2SecretKeyImpl> pbkdf2SecretKey_importRawKey(List<int> keyData) async {
+  return _Pbkdf2SecretKeyImpl(await _importKey(
     'raw',
     keyData,
     const subtle.Algorithm(name: _pbkdf2AlgorithmName),
@@ -31,9 +31,18 @@ Future<Pbkdf2SecretKey> pbkdf2SecretKey_importRawKey(List<int> keyData) async {
   ));
 }
 
-class _Pbkdf2SecretKey implements Pbkdf2SecretKey {
+final class _StaticPbkdf2SecretKeyImpl implements StaticPbkdf2SecretKeyImpl {
+  const _StaticPbkdf2SecretKeyImpl();
+
+  @override
+  Future<Pbkdf2SecretKeyImpl> importRawKey(List<int> keyData) {
+    return pbkdf2SecretKey_importRawKey(keyData);
+  }
+}
+
+final class _Pbkdf2SecretKeyImpl implements Pbkdf2SecretKeyImpl {
   final subtle.JSCryptoKey _key;
-  _Pbkdf2SecretKey(this._key);
+  _Pbkdf2SecretKeyImpl(this._key);
 
   @override
   String toString() {
diff --git a/lib/src/impl_stub.dart b/lib/src/impl_stub.dart
@@ -202,5 +202,3 @@ Future<HkdfSecretKey> hkdfSecretKey_importRawKey(List<int> keyData) =>
 
 //---------------------- PBKDF2
 
-Future<Pbkdf2SecretKey> pbkdf2SecretKey_importRawKey(List<int> keyData) =>
-    throw _notImplemented;
diff --git a/lib/src/impl_stub/impl_stub.dart b/lib/src/impl_stub/impl_stub.dart
@@ -22,6 +22,7 @@ part 'impl_stub.aesctr.dart';
 part 'impl_stub.aesgcm.dart';
 part 'impl_stub.hmac.dart';
 part 'impl_stub.rsaoaep.dart';
+part 'impl_stub.pbkdf2.dart';
 
 const WebCryptoImpl webCryptImpl = _WebCryptoImpl();
 
@@ -45,4 +46,7 @@ final class _WebCryptoImpl implements WebCryptoImpl {
 
   @override
   final rsaOaepPublicKey = const _StaticRsaOaepPublicKeyImpl();
+
+  @override
+  final pbkdf2SecretKey = const _StaticPbkdf2SecretKeyImpl();
 }
diff --git a/lib/src/impl_stub/impl_stub.pbkdf2.dart b/lib/src/impl_stub/impl_stub.pbkdf2.dart
@@ -0,0 +1,24 @@
+// Copyright 2020 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+part of 'impl_stub.dart';
+
+final class _StaticPbkdf2SecretKeyImpl implements StaticPbkdf2SecretKeyImpl {
+  const _StaticPbkdf2SecretKeyImpl();
+
+  @override
+  Future<Pbkdf2SecretKeyImpl> importRawKey(List<int> keyData) {
+    throw UnimplementedError('Not implemented');
+  }
+}
diff --git a/lib/src/webcrypto/webcrypto.pbkdf2.dart b/lib/src/webcrypto/webcrypto.pbkdf2.dart
@@ -50,17 +50,20 @@ part of 'webcrypto.dart';
 ///
 /// [1]: https://tools.ietf.org/html/rfc8018
 // TODO: Rewrite all RFC links to use https://www.rfc-editor.org/rfc/rfcXXXX
-@sealed
-abstract class Pbkdf2SecretKey {
-  Pbkdf2SecretKey._(); // keep the constructor private.
+
+final class Pbkdf2SecretKey {
+  final Pbkdf2SecretKeyImpl _impl;
+  
+  Pbkdf2SecretKey._(this._impl); // keep the constructor private.
 
   /// Import [Pbkdf2SecretKey] from raw [keyData].
   ///
   /// Creates a [Pbkdf2SecretKey] for key derivation using [keyData].
   ///
   /// {@macro Pbkdf2SecretKey:example}
-  static Future<Pbkdf2SecretKey> importRawKey(List<int> keyData) {
-    return impl.pbkdf2SecretKey_importRawKey(keyData);
+  static Future<Pbkdf2SecretKey> importRawKey(List<int> keyData) async {
+    final impl = await webCryptImpl.pbkdf2SecretKey.importRawKey(keyData);
+    return Pbkdf2SecretKey._(impl);
   }
 
   /// Derive key from [salt] and password specified as `keyData` in
@@ -90,5 +93,6 @@ abstract class Pbkdf2SecretKey {
     Hash hash,
     List<int> salt,
     int iterations,
-  );
+  ) =>
+    _impl.deriveBits(length, hash, salt, iterations);
 }

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@ Pod::Spec.new do \|s\|`
`28`	`28`	`s.compiler_flags = [`
`29`	`29`	`'-DOPENSSL_NO_ASM',`
`30`	`30`	`'-DDOPENSSL_SMALL',`
`31`		`- '-GCC_WARN_INHIBIT_ALL_WARNINGS',`
`32`	`31`	`'-w',`
`33`	`32`	`]`
`34`	`33`
Original file line number	Diff line number	Diff line change
`@@ -92,4 +92,7 @@ final class _WebCryptoImpl implements WebCryptoImpl {`
`92`	`92`
`93`	`93`	`@override`
`94`	`94`	`final rsaOaepPublicKey = const _StaticRsaOaepPublicKeyImpl();`
	`95`	`+`
	`96`	`+ @override`
	`97`	`+ final pbkdf2SecretKey = const _StaticPbkdf2SecretKeyImpl();`
`95`	`98`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,4 +78,7 @@ final class _WebCryptoImpl implements WebCryptoImpl {`
`78`	`78`
`79`	`79`	`@override`
`80`	`80`	`final rsaOaepPublicKey = const _StaticRsaOaepPublicKeyImpl();`
	`81`	`+`
	`82`	`+ @override`
	`83`	`+ final pbkdf2SecretKey = const _StaticPbkdf2SecretKeyImpl();`
`81`	`84`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,5 +202,3 @@ Future<HkdfSecretKey> hkdfSecretKey_importRawKey(List<int> keyData) =>`
`202`	`202`
`203`	`203`	`//---------------------- PBKDF2`
`204`	`204`
`205`		`-Future<Pbkdf2SecretKey> pbkdf2SecretKey_importRawKey(List<int> keyData) =>`
`206`		`- throw _notImplemented;`