fix: migrate rsaoaep keypair to tuples

google · Oct 18, 2024 · 2991d1e · 2991d1e
1 parent 91a4f9e
commit 2991d1e
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 14 deletions.
diff --git a/lib/src/impl_ffi/impl_ffi.rsaoaep.dart b/lib/src/impl_ffi/impl_ffi.rsaoaep.dart
@@ -69,8 +69,8 @@ Future<KeyPair<RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl>>
   final h = _Hash.fromHash(hash);
   final keys = _generateRsaKeyPair(modulusLength, publicExponent);
   return createKeyPair(
-    _RsaOaepPrivateKey(keys.privateKey, h),
-    _RsaOaepPublicKey(keys.publicKey, h),
+    _RsaOaepPrivateKeyImpl(keys.privateKey, h),
+    _RsaOaepPublicKeyImpl(keys.publicKey, h),
   );
 }
 
@@ -182,12 +182,16 @@ final class _StaticRsaOaepPrivateKeyImpl implements StaticRsaOaepPrivateKeyImpl
       rsaOaepPrivateKey_importJsonWebKey(jwk, hash);
 
   @override
-  Future<KeyPair<RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl>> generateKey(
+  Future<(RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl)> generateKey(
     int modulusLength,
     BigInt publicExponent,
     Hash hash,
-  ) =>
-      rsaOaepPrivateKey_generateKey(modulusLength, publicExponent, hash);
+  ) async {
+    final KeyPair<RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl> keyPair =
+        await rsaOaepPrivateKey_generateKey(modulusLength, publicExponent, hash);
+
+    return (keyPair.privateKey, keyPair.publicKey);
+  }
 }
 
 final class _RsaOaepPrivateKeyImpl implements RsaOaepPrivateKeyImpl {

diff --git a/lib/src/impl_interface/impl_interface.dart b/lib/src/impl_interface/impl_interface.dart
@@ -25,6 +25,7 @@ part 'impl_interface.hmac.dart';
 part 'impl_interface.pbkdf2.dart';
 part 'impl_interface.aesgcm.dart';
 part 'impl_interface.ecdh.dart';
+part 'impl_interface.rsaoaep.dart';
 
 /// A key-pair as returned from key generation.
 class KeyPair<S, T> {
@@ -57,7 +58,6 @@ enum EllipticCurve {
   /// [1]: https://bugs.webkit.org/show_bug.cgi?id=216755
   p521,
 }
-part 'impl_interface.rsaoaep.dart';
 
 /// Interface to be provided by platform implementations.
 ///

diff --git a/lib/src/impl_interface/impl_interface.rsaoaep.dart b/lib/src/impl_interface/impl_interface.rsaoaep.dart
@@ -17,7 +17,7 @@ part of 'impl_interface.dart';
 abstract interface class StaticRsaOaepPrivateKeyImpl {
   Future<RsaOaepPrivateKeyImpl> importPkcs8Key(List<int> keyData, Hash hash);
   Future<RsaOaepPrivateKeyImpl> importJsonWebKey(Map<String, dynamic> jwk, Hash hash);
-  Future<KeyPair<RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl>> generateKey(int modulusLength, BigInt publicExponent, Hash hash);
+  Future<(RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl)> generateKey(int modulusLength, BigInt publicExponent, Hash hash);
 }
 
 abstract interface class RsaOaepPrivateKeyImpl {

diff --git a/lib/src/impl_js/impl_js.rsaoaep.dart b/lib/src/impl_js/impl_js.rsaoaep.dart
@@ -65,8 +65,8 @@ Future<KeyPair<RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl>>
     _usagesEncryptDecrypt,
   );
   return createKeyPair(
-    _RsaOaepPrivateKey(pair.privateKey),
-    _RsaOaepPublicKey(pair.publicKey),
+    _RsaOaepPrivateKeyImpl(pair.privateKey),
+    _RsaOaepPublicKeyImpl(pair.publicKey),
   );
 }
 
@@ -115,8 +115,10 @@ final class _StaticRsaOaepPrivateKeyImpl implements StaticRsaOaepPrivateKeyImpl
   }
 
   @override
-  Future<KeyPair<RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl>> generateKey(int modulusLength, BigInt publicExponent, Hash hash) {
-    return rsaOaepPrivateKey_generateKey(modulusLength, publicExponent, hash);
+  Future<(RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl)> generateKey(int modulusLength, BigInt publicExponent, Hash hash) async {
+    final KeyPair<RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl> keyPair = await rsaOaepPrivateKey_generateKey(modulusLength, publicExponent, hash);
+
+    return (keyPair.privateKey, keyPair.publicKey);
   }
 }
 

diff --git a/lib/src/impl_stub/impl_stub.rsaoaep.dart b/lib/src/impl_stub/impl_stub.rsaoaep.dart
@@ -28,7 +28,7 @@ final class _StaticRsaOaepPrivateKeyImpl implements StaticRsaOaepPrivateKeyImpl
   }
 
   @override
-  Future<KeyPair<RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl>> generateKey(int modulusLength, BigInt publicExponent, Hash hash) {
+  Future<(RsaOaepPrivateKeyImpl, RsaOaepPublicKeyImpl)> generateKey(int modulusLength, BigInt publicExponent, Hash hash) {
     throw UnimplementedError('Not implemented');
   }
 }

diff --git a/lib/src/webcrypto/webcrypto.rsaoaep.dart b/lib/src/webcrypto/webcrypto.rsaoaep.dart
@@ -77,6 +77,10 @@ final class RsaOaepPrivateKey {
 
   RsaOaepPrivateKey._(this._impl); // keep the constructor private.
 
+  factory RsaOaepPrivateKey(RsaOaepPrivateKeyImpl impl) {
+    return RsaOaepPrivateKey._(impl);
+  }
+
   /// Import RSAES-OAEP private key in PKCS #8 format.
   ///
   /// Creates an [RsaOaepPrivateKey] from [keyData] given as the DER
@@ -219,8 +223,12 @@ final class RsaOaepPrivateKey {
     BigInt publicExponent,
     Hash hash,
   ) async {
-    final pair = await webCryptImpl.rsaOaepPrivateKey.generateKey(modulusLength, publicExponent, hash);
-    return pair as KeyPair<RsaOaepPrivateKey, RsaOaepPublicKey>;
+    final (privateKeyImpl, publicKeyImpl) = await webCryptImpl.rsaOaepPrivateKey.generateKey(modulusLength, publicExponent, hash);
+
+    final privateKey = RsaOaepPrivateKey(privateKeyImpl);
+    final publicKey = RsaOaepPublicKey(publicKeyImpl);
+
+    return createKeyPair(privateKey, publicKey);
   }
 
   /// Decrypt [data] encrypted with [RsaOaepPublicKey.encryptBytes] from the
@@ -348,6 +356,10 @@ final class RsaOaepPublicKey {
 
   RsaOaepPublicKey._(this._impl); // keep the constructor private.
 
+  factory RsaOaepPublicKey(RsaOaepPublicKeyImpl impl) {
+    return RsaOaepPublicKey._(impl);
+  }
+
   /// Import RSAES-OAEP public key in SPKI format.
   ///
   /// Creates an [RsaOaepPublicKey] from [keyData] given as the DER