diff --git a/CHANGELOG.md b/CHANGELOG.md index a56deb2..a3255ba 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +## 2.7.1 + +- Migrating from `pedantic` to `lints` + ## 2.7.0 - `parsing.dart` has been replaced by more accurate CryptoUtils functions `https://github.com/Ephenodrom/Dart-Basic-Utils` diff --git a/analysis_options.yaml b/analysis_options.yaml index 108d105..c36c2c5 100644 --- a/analysis_options.yaml +++ b/analysis_options.yaml @@ -1 +1 @@ -include: package:pedantic/analysis_options.yaml +include: package:lints/core.yaml diff --git a/lib/src/crypto_utils.dart b/lib/src/crypto_utils.dart index 64b5daf..3a09f7a 100644 --- a/lib/src/crypto_utils.dart +++ b/lib/src/crypto_utils.dart @@ -511,7 +511,7 @@ class CryptoUtils { .map((line) => line.trim()) .where((line) => line.isNotEmpty) .toList(); - var base64; + String base64; if (checkHeader) { if (lines.length < 2 || !lines.first.startsWith('-----BEGIN') || @@ -541,7 +541,7 @@ class CryptoUtils { static RSAPublicKey rsaPublicKeyFromDERBytes(Uint8List bytes) { var asn1Parser = ASN1Parser(bytes); var topLevelSeq = asn1Parser.nextObject() as ASN1Sequence; - var publicKeySeq; + ASN1Sequence publicKeySeq; if (topLevelSeq.elements![1].runtimeType == ASN1BitString) { var publicKeyBitString = topLevelSeq.elements![1] as ASN1BitString; @@ -696,8 +696,8 @@ class CryptoUtils { {bool pkcs8 = false}) { var asn1Parser = ASN1Parser(bytes); var topLevelSeq = asn1Parser.nextObject() as ASN1Sequence; - var curveName; - var x; + String? curveName; + Uint8List x; if (pkcs8) { // Parse the PKCS8 format var innerSeq = topLevelSeq.elements!.elementAt(1) as ASN1Sequence; @@ -735,7 +735,7 @@ class CryptoUtils { x = privateKeyAsOctetString.valueBytes!; } - return ECPrivateKey(osp2i(x), ECDomainParameters(curveName)); + return ECPrivateKey(osp2i(x), ECDomainParameters(curveName!)); } /// @@ -751,7 +751,7 @@ class CryptoUtils { var algorithmIdentifierSequence = topLevelSeq.elements![0] as ASN1Sequence; var curveNameOi = algorithmIdentifierSequence.elements!.elementAt(1) as ASN1ObjectIdentifier; - var curveName; + String? curveName; var data = ObjectIdentifiers.getIdentifierByIdentifier( curveNameOi.objectIdentifierAsString); if (data != null) { @@ -772,7 +772,7 @@ class CryptoUtils { } var x = pubBytes.sublist(1, (pubBytes.length / 2).round()); var y = pubBytes.sublist(1 + x.length, pubBytes.length); - var params = ECDomainParameters(curveName); + var params = ECDomainParameters(curveName!); var bigX = decodeBigIntWithSign(1, x); var bigY = decodeBigIntWithSign(1, y); var pubKey = ECPublicKey( diff --git a/pubspec.yaml b/pubspec.yaml index b936f57..2e52fb6 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,6 +1,6 @@ name: dart_jsonwebtoken description: A dart implementation of the famous javascript library 'jsonwebtoken' (JWT). -version: 2.7.0 +version: 2.7.1 repository: https://github.com/jonasroussel/dart_jsonwebtoken homepage: https://github.com/jonasroussel/dart_jsonwebtoken#readme @@ -21,4 +21,4 @@ dependencies: ed25519_edwards: ^0.3.1 dev_dependencies: - pedantic: ^1.11.0 + lints: ^2.0.1