Feature: RSA OAEP with SHA512

lib/src/algorithms/rsa.dart

@@ -8,18 +8,34 @@ abstract class AbstractRSA {
       publicKey != null ? PublicKeyParameter(publicKey!) : null;
   PrivateKeyParameter<RSAPrivateKey>? get _privateKeyParams =>
       privateKey != null ? PrivateKeyParameter(privateKey!) : null;
-  final AsymmetricBlockCipher _cipher;
+  late final AsymmetricBlockCipher _cipher;
+
+  // ignore: non_constant_identifier_names
+  AsymmetricBlockCipher _OAEPCipher(RSADigest digest) {
+    switch (digest) {
+      case RSADigest.SHA256:
+        return OAEPEncoding.withSHA256(RSAEngine());
+      case RSADigest.SHA512:
+        return OAEPEncoding.withCustomDigest(
+          () => SHA512Digest(),
+          RSAEngine(),
+        );
+      case RSADigest.SHA1:
+      default:
+        return OAEPEncoding.withSHA1(RSAEngine());
+    }
+  }
 
   AbstractRSA({
     this.publicKey,
     this.privateKey,
     RSAEncoding encoding = RSAEncoding.PKCS1,
     RSADigest digest = RSADigest.SHA1,
-  }) : this._cipher = encoding == RSAEncoding.OAEP
-            ? digest == RSADigest.SHA1
-                ? OAEPEncoding(RSAEngine())
-                : OAEPEncoding.withSHA256(RSAEngine())
-            : PKCS1Encoding(RSAEngine());
+  }) {
+    _cipher = encoding == RSAEncoding.OAEP
+        ? _OAEPCipher(digest)
+        : PKCS1Encoding(RSAEngine());
+  }
 }
 
 /// Wraps the RSA Engine Algorithm.
@@ -185,10 +201,12 @@ enum RSAEncoding {
 enum RSADigest {
   SHA1,
   SHA256,
+  SHA512,
 }
 
 enum RSASignDigest {
   SHA256,
+  SHA512,
 }
 
 final _digestIdFactoryMap = <RSASignDigest, _DigestIdFactory>{

pubspec.yaml

@@ -15,7 +15,7 @@ dependencies:
   clock: ^1.1.1
   collection: ^1.17.0
   crypto: ^3.0.2
-  pointycastle: '>=3.0.0 <=3.2.0'
+  pointycastle: ^3.7.3
 
 dev_dependencies:
   lints: ^2.0.0

test/encrypt_test.dart

@@ -89,7 +89,8 @@ void main() {
         final encrypted = Encrypted(base64.decode(encoded));
 
         test('encrypt', () {
-          expect(encrypter.encrypt(text.padRight(64), iv: IV.allZerosOfLength(16)),
+          expect(
+              encrypter.encrypt(text.padRight(64), iv: IV.allZerosOfLength(16)),
               equals(encrypted));
         });
 
@@ -134,13 +135,13 @@ void main() {
 
     test(
         'encrypt',
-        () => expect(
-          encrypter.encrypt(text, iv: IV.allZerosOfLength(8)), equals(encrypted)));
+        () => expect(encrypter.encrypt(text, iv: IV.allZerosOfLength(8)),
+            equals(encrypted)));
 
     test(
         'decrypt',
-        () => expect(
-          encrypter.decrypt(encrypted, iv: IV.allZerosOfLength(8)), equals(text)));
+        () => expect(encrypter.decrypt(encrypted, iv: IV.allZerosOfLength(8)),
+            equals(text)));
   });
 
   group('RSA', () {
@@ -186,6 +187,26 @@ void main() {
       expect(encrypter.decrypt(encrypted), equals(text));
     });
 
+    test('encrypt/decrypt OAEP (SHA512)', () {
+      final RSAPublicKey publicKey =
+          parser.parse(File('test/public2048.pem').readAsStringSync())
+              as RSAPublicKey;
+      final RSAPrivateKey privateKey =
+          parser.parse(File('test/private2048.pem').readAsStringSync())
+              as RSAPrivateKey;
+      final encrypter = Encrypter(
+        RSA(
+          publicKey: publicKey,
+          privateKey: privateKey,
+          encoding: RSAEncoding.OAEP,
+          digest: RSADigest.SHA512,
+        ),
+      );
+      final encrypted = encrypter.encrypt(text);
+
+      expect(encrypter.decrypt(encrypted), equals(text));
+    });
+
     group('StateError', () {
       final badStateEncrypter = Encrypter(RSA());
 

test/private2048.pem

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpQIBAAKCAQEAxUxNceds2gyqbbYiEZF8WTxfPQ+YgTzyJASSoOPmv4Tso56C
+oRy+cFdKQ0ZcLpLaH6E+VB9P/hrCswpA4bwAadFXm4k6X2VH4O/RnVR29wklhwhO
+ljFAzAZi5s1ROYvAAhuT9qxBmQWNuLWOHuVpG1zXa7wfWwWFjuEfEYrhsEY6IpDv
+SRFF04ykhvW+AnphAkCLl+wYVHfub56v0aYN6Y13X6nBciGDIPazyGgzQvDUR3Rm
+7sZbjbhPLmaAX8UFiYtAzs6Ya/hJb7Q0/cgf6LrkBGVDxTWZb+lMW7E61Uc14E4q
+Ihc2BWjDgugPJnWP8MA39oh+opyRQSBU9TuENwIDAQABAoIBAQC848hhfMdiGy4v
+y2fimf8LEBm+Q+gmE0tf4GDhWE/anFBSdbdquDI7K9cVgY9Pp5jdH2qk7zWOeeBd
+uTtU4sEijiHp7v/LxROD7xYoIm2jJUagePuEH7OBobuebIOPLJSvb+fBCjnjXsXI
+SUm/mrN+VuyHYJxEcIzltfIgwW5Ba8rvKhOnmOyCJ0nLURLzkk9DUlwJbPWKtj0A
+wGo5cZgQZGzRI3D7XfZ8M48RJIqEAUYR59xEf9eKkxdyKtVYHYVEhd9fmWWv83Tp
+J9ppgjt305cR8u1v1c/z6IiHUy2rHBdddCTD/p2clADw5YzckKaIY75slLt1d4y3
+dtzCWRfBAoGBAPSICOQkc30NabdzX4Lx+8UpU8v8fffdqHDt3BCtiaGnjhiSOw7l
+a2oSlEAm1RUXQW9sNv+wuMmL1bSF3aSG3csIXLq78n9tUllcSQpmt3NM6E76dFSR
+KIwCpnV4yMCSCBhO/Up9lqJfimc2vzzfL0fx39iY+phLIdnGtqAweGHLAoGBAM6N
+KTYO/VbQLJquW1JRdeHWoiJ+HWkwSpyVttOFhw2woXmLh7EFOYBSdudrs/jT3dVB
+739pSPWuiwVv1CFDAYwpuY6BWE5bRwglUaB7dwPIguk6mZ+U6jnPmusPDkFHe45E
+7DN2h9D/yWpYeJqmdu+JET2EDqqqcH3GDyTZ9GnFAoGBAJ9jpFgBIn4aphP70f/q
+dy+2lnZaKEnOY6LoiA8e7p0+ODLv7irxg6hqX9PI/A95Tx+vq9HSgUBuM2gt8aDy
+f9N9qePV6mUA/zJcIwfymBVBxhLk0brlu0Y33ASqLEDJbxlZM2TAo9VG7VIFr3Wg
+DJOap0vpuz5VisUG77dOoMktAoGAQCYzQGjTYZzx3XB9SEmodOV2IYRNmhe3dH5C
+89qqoSPUYq1lDSN0QlhaOXGHyaXzZYI+4bFPSY5V+vBKT7JBzsg+qvWc+Wj73JnK
+ii8OPYyOq+TZRWi4fg/uK0bXxIpw4zSgrzMG53Apm++yNUWx9p75TcOv0m1w1n8m
+wOk4MYkCgYEAy9UIMOc+eU4g8XIPMxhXRBB2aDwoyv9lV67PWF9EqUnpCHukyznQ
+87GOb2wxotTpOgjXIiOk6jYbsnSZyk8mogsoN4CxoPghtpadnl2HunJzprd5RbqC
+x8JW1M8dg6ygqnOWlx3rD+mBMCRXXnG67qr+6WrlJtTnnl144YWQC94=
+-----END RSA PRIVATE KEY-----

test/public2048.pem

@@ -0,0 +1,9 @@
+-----BEGIN PUBLIC KEY-----
+MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAxUxNceds2gyqbbYiEZF8
+WTxfPQ+YgTzyJASSoOPmv4Tso56CoRy+cFdKQ0ZcLpLaH6E+VB9P/hrCswpA4bwA
+adFXm4k6X2VH4O/RnVR29wklhwhOljFAzAZi5s1ROYvAAhuT9qxBmQWNuLWOHuVp
+G1zXa7wfWwWFjuEfEYrhsEY6IpDvSRFF04ykhvW+AnphAkCLl+wYVHfub56v0aYN
+6Y13X6nBciGDIPazyGgzQvDUR3Rm7sZbjbhPLmaAX8UFiYtAzs6Ya/hJb7Q0/cgf
+6LrkBGVDxTWZb+lMW7E61Uc14E4qIhc2BWjDgugPJnWP8MA39oh+opyRQSBU9TuE
+NwIDAQAB
+-----END PUBLIC KEY-----