Merge pull request #24 from konstantinullrich/feature/#23-Null_safety_release

Feature/#23 null safety release

Author: konstantinullrich

CHANGELOG.md

@@ -1,3 +1,6 @@
+## 2.0.0
+- Migrate to support null safety
+
 ## 1.1.3
 - Update deprecated PointyCastle features
 

example/ec_signature_example.dart

@@ -1,16 +1,18 @@
 import 'dart:convert';
+import 'dart:typed_data';
 
 import 'package:crypton/crypton.dart';
 
 void main() {
-  var ecKeypair = ECKeypair.fromRandom();
-  var message =
+  final ecKeypair = ECKeypair.fromRandom();
+  final message =
       utf8.encode(DateTime.now().millisecondsSinceEpoch.toRadixString(16));
 
-  var privateKeyString = ecKeypair.privateKey.toString();
-  var publicKeyString = ecKeypair.publicKey.toString();
-  var signature = ecKeypair.privateKey.createSHA256Signature(message);
-  var verified =
+  final privateKeyString = ecKeypair.privateKey.toString();
+  final publicKeyString = ecKeypair.publicKey.toString();
+  final signature =
+      ecKeypair.privateKey.createSHA256Signature(message as Uint8List);
+  final verified =
       ecKeypair.privateKey.publicKey.verifySHA256Signature(message, signature);
 
   print('Your Private Key\n $privateKeyString\n---');

example/rsa_crypto_example.dart

@@ -1,13 +1,13 @@
 import 'package:crypton/crypton.dart';
 
 void main() {
-  var rsaKeypair = RSAKeypair.fromRandom();
-  var message = DateTime.now().millisecondsSinceEpoch.toRadixString(16);
+  final rsaKeypair = RSAKeypair.fromRandom();
+  final message = DateTime.now().millisecondsSinceEpoch.toRadixString(16);
 
-  var privateKeyString = rsaKeypair.privateKey.toString();
-  var publicKeyString = rsaKeypair.publicKey.toString();
-  var encrypted = rsaKeypair.publicKey.encrypt(message);
-  var decrypted = rsaKeypair.privateKey.decrypt(encrypted);
+  final privateKeyString = rsaKeypair.privateKey.toString();
+  final publicKeyString = rsaKeypair.publicKey.toString();
+  final encrypted = rsaKeypair.publicKey.encrypt(message);
+  final decrypted = rsaKeypair.privateKey.decrypt(encrypted);
 
   print('Your Private Key\n $privateKeyString\n---');
   print('Your Public Key\n $publicKeyString\n---');

example/rsa_signature_example.dart

@@ -1,16 +1,18 @@
 import 'dart:convert';
+import 'dart:typed_data';
 
 import 'package:crypton/crypton.dart';
 
 void main() {
-  var rsaKeypair = RSAKeypair.fromRandom();
-  var message =
+  final rsaKeypair = RSAKeypair.fromRandom();
+  final message =
       utf8.encode(DateTime.now().millisecondsSinceEpoch.toRadixString(16));
 
-  var privateKeyString = rsaKeypair.privateKey.toString();
-  var publicKeyString = rsaKeypair.publicKey.toString();
-  var signature = rsaKeypair.privateKey.createSHA256Signature(message);
-  var verified = rsaKeypair.publicKey.verifySHA256Signature(message, signature);
+  final privateKeyString = rsaKeypair.privateKey.toString();
+  final publicKeyString = rsaKeypair.publicKey.toString();
+  final signature =
+      rsaKeypair.privateKey.createSHA256Signature(message as Uint8List);
+  final verified = rsaKeypair.publicKey.verifySHA256Signature(message, signature);
 
   print('Your Private Key\n $privateKeyString\n---');
   print('Your Public Key\n $publicKeyString\n---');

lib/src/ec/ecpoint.dart

@@ -15,8 +15,8 @@ class ECPoint {
       curve.curve.createPoint(x, y, withCompression);
 
   ECPoint operator *(BigInt k) {
-    var point = asPointyCastle * k;
+    final point = (asPointyCastle * k)!;
     return ECPoint(
-        point.x.toBigInteger(), point.y.toBigInteger(), point.isCompressed);
+        point.x!.toBigInteger()!, point.y!.toBigInteger()!, point.isCompressed);
   }
 }

lib/src/ec/helper.dart

@@ -3,11 +3,11 @@ import 'dart:typed_data';
 
 import 'package:pointycastle/export.dart';
 
-ParametersWithRandom withRandom(var keyParams) {
-  var randomSeed = Random.secure();
-  var seed = Uint8List.fromList(
+ParametersWithRandom withRandom(ECKeyGeneratorParameters keyParams) {
+  final randomSeed = Random.secure();
+  final seed = Uint8List.fromList(
       List<int>.generate(32, (_) => randomSeed.nextInt(256)));
-  var fortunaRandom = FortunaRandom();
+  final fortunaRandom = FortunaRandom();
   fortunaRandom.seed(KeyParameter(seed));
   return ParametersWithRandom(keyParams, fortunaRandom);
 }

lib/src/ec/keypair.dart

@@ -1,30 +1,31 @@
-import 'package:pointycastle/export.dart' as pointy;
 import 'package:crypton/crypton.dart';
+import 'package:pointycastle/export.dart' as pointy;
 
 import 'helper.dart';
 
 /// [Keypair] using EC Algorithm
 class ECKeypair implements Keypair {
-  ECPrivateKey _privateKey;
-  ECPublicKey _publicKey;
+  late ECPrivateKey _privateKey;
+  late ECPublicKey _publicKey;
 
   /// Create a [ECKeypair] using an [ECPrivateKey]
   ECKeypair(this._privateKey) : _publicKey = _privateKey.publicKey;
 
   /// Generate a random [ECKeypair] on the secp256k1-Curve
   ECKeypair.fromRandom() {
-    var keyParams = pointy.ECKeyGeneratorParameters(pointy.ECCurve_secp256k1());
+    final keyParams =
+        pointy.ECKeyGeneratorParameters(pointy.ECCurve_secp256k1());
 
-    var generator = pointy.ECKeyGenerator();
+    final generator = pointy.ECKeyGenerator();
     generator.init(withRandom(keyParams));
 
-    var pair = generator.generateKeyPair();
-    pointy.ECPublicKey publicKey = pair.publicKey;
-    pointy.ECPrivateKey privateKey = pair.privateKey;
+    final pair = generator.generateKeyPair();
+    final publicKey = pair.publicKey as pointy.ECPublicKey;
+    final privateKey = pair.privateKey as pointy.ECPrivateKey;
 
-    var Q = publicKey.Q;
-    _publicKey = ECPublicKey(Q.x.toBigInteger(), Q.y.toBigInteger());
-    _privateKey = ECPrivateKey(privateKey.d);
+    final Q = publicKey.Q!;
+    _publicKey = ECPublicKey(Q.x!.toBigInteger()!, Q.y!.toBigInteger()!);
+    _privateKey = ECPrivateKey(privateKey.d!);
   }
 
   /// Get the [ECPublicKey] associated [ECPrivateKey]

lib/src/ec/private_key.dart

@@ -6,25 +6,22 @@ import 'package:pointycastle/export.dart' as pointy;
 
 /// [PrivateKey] using EC Algorithm
 class ECPrivateKey implements PrivateKey {
-  pointy.ECPrivateKey _privateKey;
+  final pointy.ECPrivateKey _privateKey;
   static final pointy.ECDomainParameters curve = pointy.ECCurve_secp256k1();
 
   /// Create an [ECPrivateKey] for the given d parameter.
-  ECPrivateKey(BigInt d) {
-    _privateKey = pointy.ECPrivateKey(d, curve);
-  }
+  ECPrivateKey(BigInt d) : _privateKey = pointy.ECPrivateKey(d, curve);
 
   /// Create an [ECPrivateKey] from the given String.
-  ECPrivateKey.fromString(String privateKeyString) {
-    _privateKey =
-        pointy.ECPrivateKey(BigInt.parse(privateKeyString, radix: 16), curve);
-  }
+  ECPrivateKey.fromString(String privateKeyString)
+      : _privateKey = pointy.ECPrivateKey(
+            BigInt.parse(privateKeyString, radix: 16), curve);
 
   /// Sign an message with SHA-256 which can be verified using the associated [ECPublicKey]
   @override
   @Deprecated('Use createSHA256Signature for creating SHA-256 signatures')
   String createSignature(String message) =>
-      utf8.decode(createSHA256Signature(utf8.encode(message)));
+      utf8.decode(createSHA256Signature(utf8.encode(message) as Uint8List));
 
   /// Sign an message with SHA-256 which can be verified using the associated [ECPublicKey]
   @override
@@ -37,29 +34,30 @@ class ECPrivateKey implements PrivateKey {
       _createSignature(message, 'SHA-512/DET-ECDSA');
 
   Uint8List _createSignature(Uint8List message, String algorithm) {
-    var signer = pointy.Signer(algorithm);
+    final signer = pointy.Signer(algorithm);
     pointy.AsymmetricKeyParameter<pointy.ECPrivateKey> privateKeyParams =
         pointy.PrivateKeyParameter(_privateKey);
     signer.init(true, privateKeyParams);
-    pointy.ECSignature sig = signer.generateSignature(message);
-    return utf8.encode(sig.r.toRadixString(16) + sig.s.toRadixString(16));
+    final sig = signer.generateSignature(message) as pointy.ECSignature;
+    return utf8.encode(sig.r.toRadixString(16) + sig.s.toRadixString(16))
+        as Uint8List;
   }
 
   /// Get the [ECPublicKey] of the [ECPrivateKey]
   @override
   ECPublicKey get publicKey {
-    var Q = curve.G * _privateKey.d;
-    return ECPublicKey(Q.x.toBigInteger(), Q.y.toBigInteger());
+    final Q = (curve.G * d)!;
+    return ECPublicKey(Q.x!.toBigInteger()!, Q.y!.toBigInteger()!);
   }
 
   /// Get the d Parameter as [BigInt]
-  BigInt get d => _privateKey.d;
+  BigInt get d => _privateKey.d!;
 
   /// Export a [ECPrivateKey] as Pointy Castle ECPrivateKey
   @override
   pointy.ECPrivateKey get asPointyCastle => _privateKey;
 
   /// Export a [ECPrivateKey] as String which can be reversed using [ECPrivateKey.fromString].
   @override
-  String toString() => _privateKey.d.toRadixString(16);
+  String toString() => d.toRadixString(16);
 }

lib/src/ec/public_key.dart

@@ -6,26 +6,25 @@ import 'package:pointycastle/export.dart' as pointy;
 
 /// [PublicKey] using EC Algorithm
 class ECPublicKey implements PublicKey {
-  pointy.ECPublicKey _publicKey;
+  final pointy.ECPublicKey _publicKey;
   static final pointy.ECDomainParameters curve = pointy.ECCurve_secp256k1();
 
   /// Create an [ECPublicKey] for the given coordinates.
-  ECPublicKey(BigInt x, BigInt y) {
-    var Q = ECPoint(x, y, true);
-    _publicKey = pointy.ECPublicKey(Q.asPointyCastle, curve);
-  }
+  ECPublicKey(BigInt x, BigInt y)
+      : _publicKey =
+            pointy.ECPublicKey(ECPoint(x, y, true).asPointyCastle, curve);
 
   /// Create an [ECPublicKey] from the given String.
-  ECPublicKey.fromString(String publicKeyString) {
-    var Q = curve.curve.decodePoint(base64Decode(publicKeyString));
-    _publicKey = pointy.ECPublicKey(Q, curve);
-  }
+  ECPublicKey.fromString(String publicKeyString)
+      : _publicKey = pointy.ECPublicKey(
+            curve.curve.decodePoint(base64Decode(publicKeyString)), curve);
 
   /// Verify the signature of a SHA256-hashed message signed with the associated [ECPrivateKey]
   @Deprecated('For SHA256 signature verification use verifySHA256Signature')
   @override
   bool verifySignature(String message, String signature) =>
-      verifySHA256Signature(utf8.encode(message), utf8.encode(signature));
+      verifySHA256Signature(utf8.encode(message) as Uint8List,
+          utf8.encode(signature) as Uint8List);
 
   /// Verify the signature of a SHA256-hashed message signed with the associated [ECPrivateKey]
   @override
@@ -39,30 +38,30 @@ class ECPublicKey implements PublicKey {
 
   bool _verifySignature(
       Uint8List message, Uint8List signatureString, String algorithm) {
-    var sigLength = (signatureString.length / 2).round();
-    var r = BigInt.parse(
+    final sigLength = (signatureString.length / 2).round();
+    final r = BigInt.parse(
       utf8.decode(signatureString.sublist(0, sigLength)),
       radix: 16,
     );
-    var s = BigInt.parse(
+    final s = BigInt.parse(
       utf8.decode(signatureString.sublist(sigLength)),
       radix: 16,
     );
-    var signature = pointy.ECSignature(r, s);
-    var signer = pointy.Signer(algorithm);
+    final signature = pointy.ECSignature(r, s);
+    final signer = pointy.Signer(algorithm);
     signer.init(false, pointy.PublicKeyParameter(_publicKey));
     return signer.verifySignature(message, signature);
   }
 
   /// Get [ECPoint] Q, which is the Public Point
-  ECPoint get Q => ECPoint(_publicKey.Q.x.toBigInteger(),
-      _publicKey.Q.y.toBigInteger(), _publicKey.Q.isCompressed);
+  ECPoint get Q => ECPoint(_publicKey.Q!.x!.toBigInteger()!,
+      _publicKey.Q!.y!.toBigInteger()!, _publicKey.Q!.isCompressed);
 
   /// Export a [ECPublicKey] as Pointy Castle ECPublicKey
   @override
   pointy.ECPublicKey get asPointyCastle => _publicKey;
 
   /// Export a [ECPublicKey] as String which can be reversed using [ECPublicKey.fromString].
   @override
-  String toString() => base64Encode(_publicKey.Q.getEncoded());
+  String toString() => base64Encode(_publicKey.Q!.getEncoded());
 }

lib/src/keypair.dart

@@ -8,8 +8,10 @@ abstract class Keypair {
   Keypair.fromRandom();
 
   /// Get the [PublicKey] associated [PrivateKey]
-  PublicKey get publicKey => null;
+  PublicKey get publicKey =>
+      throw UnimplementedError('publicKey is not implemented yet!');
 
   /// Get the [PrivateKey] associated [PublicKey]
-  PrivateKey get privateKey => null;
+  PrivateKey get privateKey =>
+      throw UnimplementedError('privateKey is not implemented yet!');
 }