Update fillRandomBytes

lib/src/impl_ffi/impl_ffi.dart

@@ -122,4 +122,7 @@ final class _WebCryptoImpl implements WebCryptoImpl {
 
   @override
   final sha512 = const _Sha512();
+
+  @override
+  final random = const _RandomImpl();
 }

lib/src/impl_ffi/impl_ffi.random.dart

@@ -14,15 +14,20 @@
 
 part of 'impl_ffi.dart';
 
-void fillRandomBytes(TypedData destination) {
-  return _Scope.sync((scope) {
-    final dest = destination.buffer.asUint8List(
-      destination.offsetInBytes,
-      destination.lengthInBytes,
-    );
+final class _RandomImpl implements RandomImpl {
+  const _RandomImpl();
 
-    final out = scope<ffi.Uint8>(dest.length);
-    _checkOp(ssl.RAND_bytes(out, dest.length) == 1);
-    dest.setAll(0, out.asTypedList(dest.length));
-  });
+  @override
+  void fillRandomBytes(TypedData destination) {
+    return _Scope.sync((scope) {
+      final dest = destination.buffer.asUint8List(
+        destination.offsetInBytes,
+        destination.lengthInBytes,
+      );
+
+      final out = scope<ffi.Uint8>(dest.length);
+      _checkOp(ssl.RAND_bytes(out, dest.length) == 1);
+      dest.setAll(0, out.asTypedList(dest.length));
+    });
+  }
 }

lib/src/impl_interface/impl_interface.dart

@@ -29,6 +29,7 @@ part 'impl_interface.hkdf.dart';
 part 'impl_interface.rsapss.dart';
 part 'impl_interface.rsassapkcs1v15.dart';
 part 'impl_interface.digest.dart';
+part 'impl_interface.random.dart';
 
 /// A key-pair as returned from key generation.
 class KeyPair<S, T> {
@@ -99,4 +100,5 @@ abstract interface class WebCryptoImpl {
   HashImpl get sha256;
   HashImpl get sha384;
   HashImpl get sha512;
+  RandomImpl get random;
 }

lib/src/impl_interface/impl_interface.random.dart

@@ -0,0 +1,19 @@
+// 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 RandomImpl {
+  void fillRandomBytes(TypedData destination);
+}

lib/src/impl_js/impl_js.dart

@@ -109,4 +109,7 @@ final class _WebCryptoImpl implements WebCryptoImpl {
 
   @override
   final sha512 = const _HashImpl('SHA-512');
+
+  @override
+  final random = const _RandomImpl();
 }

lib/src/impl_js/impl_js.random.dart

@@ -14,10 +14,15 @@
 
 part of 'impl_js.dart';
 
-void fillRandomBytes(TypedData destination) {
-  try {
-    subtle.getRandomValues(destination);
-  } on subtle.JSDomException catch (e) {
-    throw _translateDomException(e);
+final class _RandomImpl implements RandomImpl {
+  const _RandomImpl();
+
+  @override
+  void fillRandomBytes(TypedData destination) {
+    try {
+      subtle.getRandomValues(destination);
+    } on subtle.JSDomException catch (e) {
+      throw _translateDomException(e);
+    }
   }
 }

lib/src/impl_stub/impl_stub.dart

@@ -30,6 +30,7 @@ part 'impl_stub.hkdf.dart';
 part 'impl_stub.rsapss.dart';
 part 'impl_stub.rsassapkcs1v15.dart';
 part 'impl_stub.digest.dart';
+part 'impl_stub.random.dart';
 
 const WebCryptoImpl webCryptImpl = _WebCryptoImpl();
 
@@ -95,4 +96,7 @@ final class _WebCryptoImpl implements WebCryptoImpl {
 
   @override
   final sha512 = const _HashImpl();
+
+  @override
+  final random = const _RandomImpl();
 }

lib/src/impl_stub/impl_stub.ecdsa.dart

@@ -14,7 +14,7 @@
 
 part of 'impl_stub.dart';
 
-class _StaticEcdsaPrivateKeyImpl implements StaticEcdsaPrivateKeyImpl {
+final class _StaticEcdsaPrivateKeyImpl implements StaticEcdsaPrivateKeyImpl {
   const _StaticEcdsaPrivateKeyImpl();
 
   @override
@@ -38,7 +38,7 @@ class _StaticEcdsaPrivateKeyImpl implements StaticEcdsaPrivateKeyImpl {
       throw UnimplementedError('Not implemented');
 }
 
-class _StaticEcdsaPublicKeyImpl implements StaticEcdsaPublicKeyImpl {
+final class _StaticEcdsaPublicKeyImpl implements StaticEcdsaPublicKeyImpl {
   const _StaticEcdsaPublicKeyImpl();
 
   @override

lib/src/impl_stub/impl_stub.random.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 _RandomImpl implements RandomImpl {
+  const _RandomImpl();
+
+  @override
+  void fillRandomBytes(TypedData destination) {
+    throw UnimplementedError('Not implemented');
+  }
+}

lib/src/webcrypto/webcrypto.dart

@@ -25,9 +25,6 @@ import 'dart:convert';
 import 'dart:async';
 import 'dart:typed_data';
 import '../impl_interface/impl_interface.dart';
-import '../impl_stub.dart'
-    if (dart.library.ffi) '../impl_ffi/impl_ffi.dart'
-    if (dart.library.js) '../impl_js/impl_js.dart' as impl;
 import '../impl_stub/impl_stub.dart'
     if (dart.library.ffi) '../impl_ffi/impl_ffi.dart'
     if (dart.library.js) '../impl_js/impl_js.dart' show webCryptImpl;

lib/src/webcrypto/webcrypto.random.dart

@@ -46,5 +46,5 @@ void fillRandomBytes(
         'array of more than 65536 bytes is not allowed');
   }
 
-  impl.fillRandomBytes(destination);
+  webCryptImpl.random.fillRandomBytes(destination);
 }

test/crypto_subtle_test.dart

@@ -20,7 +20,7 @@ import 'dart:typed_data';
 
 import 'package:test/test.dart';
 import 'package:webcrypto/src/crypto_subtle.dart' as subtle;
-import 'package:webcrypto/src/impl_js/impl_js.dart';
+import 'package:webcrypto/webcrypto.dart';
 
 void main() {
   group('fillRandomBytes', () {
@@ -63,7 +63,7 @@ void main() {
         data.every((e) => e == 0),
         isTrue,
       );
-      subtle.window.crypto.getRandomValues(data.toJS);
+      fillRandomBytes(data);
       expect(
         data.any((e) => e != 0),
         isTrue,
@@ -72,26 +72,18 @@ void main() {
 
     test('getRandomValues: too long', () {
       expect(
-        () => subtle.window.crypto.getRandomValues(Uint8List(1000000).toJS),
+        () => fillRandomBytes(Uint8List(1000000)),
         throwsA(
-          isA<subtle.JSDomException>().having(
-            (e) => e.name,
-            'name',
-            'QuotaExceededError',
-          ),
+          isA<ArgumentError>(),
         ),
       );
     });
 
     test('getRandomValues: not supported type', () {
       expect(
-        () => subtle.window.crypto.getRandomValues(Float32List(32).toJS),
+        () => fillRandomBytes(Uint64List(32)),
         throwsA(
-          isA<subtle.JSDomException>().having(
-            (e) => e.name,
-            'name',
-            'TypeMismatchError',
-          ),
+          isA<UnsupportedError>(),
         ),
       );
     });