Merge pull request #18 from jerson/flatbuffers

Flatbuffers
jerson · Jul 8, 2021 · 7578246 · 7578246
2 parents c4839e4 + fdfec02
commit 7578246
Show file tree

Hide file tree

Showing 45 changed files with 5,347 additions and 4,952 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 3.0.0
+
+- First version with flatbuffers, smaller binaries, please take a look
 ## 2.0.1
 
 - Support import .so for older android versions, thanks to @BobanLW

diff --git a/Makefile b/Makefile
@@ -8,8 +8,8 @@ upgrade: upgrade-libs upgrade-protobuf
 upgrade-libs:
 	./scripts/upgrade_bridge_libs.sh
 
-upgrade-protobuf:
-	./scripts/upgrade_bridge_protobuf.sh
+upgrade-flatbuffers:
+	./scripts/upgrade_bridge_flatbuffers.sh
 
 example-web:
 	docker build -t flutter-rsa-web -f example/Dockerfile .
diff --git a/android/src/main/jniLibs/arm64-v8a/librsa_bridge.so b/android/src/main/jniLibs/arm64-v8a/librsa_bridge.so
diff --git a/android/src/main/jniLibs/armeabi-v7a/librsa_bridge.so b/android/src/main/jniLibs/armeabi-v7a/librsa_bridge.so
diff --git a/android/src/main/jniLibs/x86/librsa_bridge.so b/android/src/main/jniLibs/x86/librsa_bridge.so
diff --git a/android/src/main/jniLibs/x86_64/librsa_bridge.so b/android/src/main/jniLibs/x86_64/librsa_bridge.so
diff --git a/example/lib/base64.dart b/example/lib/base64.dart
@@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -15,7 +15,7 @@ class Base64 extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;

diff --git a/example/lib/convert_jwt.dart b/example/lib/convert_jwt.dart
@@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -16,7 +16,7 @@ class ConvertJWT extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;

diff --git a/example/lib/convert_keypair.dart b/example/lib/convert_keypair.dart
@@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -16,7 +16,7 @@ class ConvertKeyPair extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;

diff --git a/example/lib/convert_private.dart b/example/lib/convert_private.dart
@@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -16,7 +16,7 @@ class ConvertPrivate extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;

diff --git a/example/lib/convert_public.dart b/example/lib/convert_public.dart
@@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -16,7 +16,7 @@ class ConvertPublic extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;

diff --git a/example/lib/encrypt_decrypt_oaep.dart b/example/lib/encrypt_decrypt_oaep.dart
@@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -15,7 +15,7 @@ class EncryptAndDecryptOAEP extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;
@@ -45,7 +45,7 @@ class _EncryptAndDecryptOAEPState extends State<EncryptAndDecryptOAEP> {
                 var encrypted = await RSA.encryptOAEP(
                   controller.text,
                   "",
-                  Hash.HASH_SHA256,
+                  Hash.SHA256,
                   widget.keyPair.publicKey,
                 );
                 setState(() {
@@ -61,7 +61,7 @@ class _EncryptAndDecryptOAEPState extends State<EncryptAndDecryptOAEP> {
                 var decrypted = await RSA.decryptOAEP(
                   _encrypted,
                   "",
-                  Hash.HASH_SHA256,
+                  Hash.SHA256,
                   widget.keyPair.privateKey,
                 );
                 setState(() {

diff --git a/example/lib/encrypt_decrypt_oaep_bytes.dart b/example/lib/encrypt_decrypt_oaep_bytes.dart
@@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -16,7 +16,7 @@ class EncryptAndDecryptOAEPBytes extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;
@@ -48,7 +48,7 @@ class _EncryptAndDecryptOAEPBytesState
                 var encrypted = await RSA.encryptOAEPBytes(
                   Uint8List.fromList(controller.text.codeUnits),
                   "",
-                  Hash.HASH_SHA256,
+                  Hash.SHA256,
                   widget.keyPair.publicKey,
                 );
                 setState(() {
@@ -64,7 +64,7 @@ class _EncryptAndDecryptOAEPBytesState
                 var decrypted = await RSA.decryptOAEPBytes(
                   base64Decode(_encrypted),
                   "",
-                  Hash.HASH_SHA256,
+                  Hash.SHA256,
                   widget.keyPair.privateKey,
                 );
                 setState(() {

diff --git a/example/lib/encrypt_decrypt_pkcs.dart b/example/lib/encrypt_decrypt_pkcs.dart
@@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -15,7 +15,7 @@ class EncryptAndDecryptPKCS extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;

diff --git a/example/lib/encrypt_decrypt_pkcs_bytes.dart b/example/lib/encrypt_decrypt_pkcs_bytes.dart
@@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -16,7 +16,7 @@ class EncryptAndDecryptPKCSBytes extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;

diff --git a/example/lib/encrypt_sign_pkcs.dart b/example/lib/encrypt_sign_pkcs.dart
@@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -15,7 +15,7 @@ class SignAndVerifyPKCS extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;
@@ -45,7 +45,7 @@ class _SignAndVerifyPKCSState extends State<SignAndVerifyPKCS> {
               onPressed: (controller) async {
                 var result = await RSA.signPKCS1v15(
                   controller.text,
-                  Hash.HASH_SHA256,
+                  Hash.SHA256,
                   widget.keyPair.privateKey,
                 );
                 setState(() {
@@ -62,7 +62,7 @@ class _SignAndVerifyPKCSState extends State<SignAndVerifyPKCS> {
                 var result = await RSA.verifyPKCS1v15(
                   _signed,
                   _text,
-                  Hash.HASH_SHA256,
+                  Hash.SHA256,
                   widget.keyPair.publicKey,
                 );
                 setState(() {

diff --git a/example/lib/encrypt_sign_pkcs_bytes.dart b/example/lib/encrypt_sign_pkcs_bytes.dart
@@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -16,7 +16,7 @@ class SignAndVerifyPKCSBytes extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;
@@ -46,7 +46,7 @@ class _SignAndVerifyPKCSBytesState extends State<SignAndVerifyPKCSBytes> {
               onPressed: (controller) async {
                 var result = await RSA.signPKCS1v15Bytes(
                   Uint8List.fromList(controller.text.codeUnits),
-                  Hash.HASH_SHA256,
+                  Hash.SHA256,
                   widget.keyPair.privateKey,
                 );
                 setState(() {
@@ -63,7 +63,7 @@ class _SignAndVerifyPKCSBytesState extends State<SignAndVerifyPKCSBytes> {
                 var result = await RSA.verifyPKCS1v15Bytes(
                   base64Decode(_signed),
                   Uint8List.fromList(_text.codeUnits),
-                  Hash.HASH_SHA256,
+                  Hash.SHA256,
                   widget.keyPair.publicKey,
                 );
                 setState(() {

diff --git a/example/lib/encrypt_sign_pss.dart b/example/lib/encrypt_sign_pss.dart
@@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -15,7 +15,7 @@ class SignAndVerifyPSS extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;
@@ -45,8 +45,8 @@ class _SignAndVerifyPSSState extends State<SignAndVerifyPSS> {
               onPressed: (controller) async {
                 var result = await RSA.signPSS(
                   controller.text,
-                  Hash.HASH_SHA256,
-                  SaltLength.SALTLENGTH_AUTO,
+                  Hash.SHA256,
+                  SaltLength.AUTO,
                   widget.keyPair.privateKey,
                 );
                 setState(() {
@@ -63,8 +63,8 @@ class _SignAndVerifyPSSState extends State<SignAndVerifyPSS> {
                 var result = await RSA.verifyPSS(
                   _signed,
                   _text,
-                  Hash.HASH_SHA256,
-                  SaltLength.SALTLENGTH_AUTO,
+                  Hash.SHA256,
+                  SaltLength.AUTO,
                   widget.keyPair.publicKey,
                 );
                 setState(() {

diff --git a/example/lib/encrypt_sign_pss_bytes.dart b/example/lib/encrypt_sign_pss_bytes.dart
@@ -5,7 +5,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/main.dart';
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
@@ -16,7 +16,7 @@ class SignAndVerifyPSSBytes extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;
@@ -46,8 +46,8 @@ class _SignAndVerifyPSSBytesState extends State<SignAndVerifyPSSBytes> {
               onPressed: (controller) async {
                 var result = await RSA.signPSSBytes(
                   Uint8List.fromList(controller.text.codeUnits),
-                  Hash.HASH_SHA256,
-                  SaltLength.SALTLENGTH_AUTO,
+                  Hash.SHA256,
+                  SaltLength.AUTO,
                   widget.keyPair.privateKey,
                 );
                 setState(() {
@@ -64,8 +64,8 @@ class _SignAndVerifyPSSBytesState extends State<SignAndVerifyPSSBytes> {
                 var result = await RSA.verifyPSSBytes(
                   base64Decode(_signed),
                   Uint8List.fromList(_text.codeUnits),
-                  Hash.HASH_SHA256,
-                  SaltLength.SALTLENGTH_AUTO,
+                  Hash.SHA256,
+                  SaltLength.AUTO,
                   widget.keyPair.publicKey,
                 );
                 setState(() {

diff --git a/example/lib/generate.dart b/example/lib/generate.dart
@@ -4,7 +4,7 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/widgets.dart';
 import 'package:fast_rsa/rsa.dart';
-import 'package:fast_rsa/model/bridge.pb.dart';
+
 import 'package:rsa_example/shared/button_widget.dart';
 import 'package:rsa_example/shared/input_widget.dart';
 import 'package:rsa_example/shared/title_widget.dart';
@@ -14,7 +14,7 @@ class Generate extends StatefulWidget {
     Key? key,
     required this.title,
     required PKCS12KeyPair keyPair,
-  })   : keyPair = keyPair,
+  })  : keyPair = keyPair,
         super(key: key);
 
   final PKCS12KeyPair keyPair;
@@ -25,9 +25,7 @@ class Generate extends StatefulWidget {
 }
 
 class _GenerateState extends State<Generate> {
-  KeyPair _keyPair = KeyPair()
-    ..privateKey = ""
-    ..publicKey = "";
+  KeyPair _keyPair = KeyPair("", "");
 
   @override
   Widget build(BuildContext context) {