Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove Operand of null-aware operation warning #25

Merged
merged 2 commits into from Oct 13, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/src/certificate.dart
Expand Up @@ -134,7 +134,7 @@ class TbsCertificate {
if (elements.first.tag == 0xa0) {
var e =
ASN1Parser(elements.first.valueBytes()).nextObject() as ASN1Integer;
version = e.valueAsBigInteger!.toInt() + 1;
version = e.valueAsBigInteger.toInt() + 1;
elements = elements.skip(1).toList();
}
var optionals = elements.skip(6);
Expand All @@ -151,7 +151,7 @@ class TbsCertificate {
sUid = o.contentBytes();
break;
case 3:
ex = (ASN1Parser(o.contentBytes()!).nextObject() as ASN1Sequence)
ex = (ASN1Parser(o.contentBytes()).nextObject() as ASN1Sequence)
.elements
.map((v) => Extension.fromAsn1(v as ASN1Sequence))
.toList();
Expand All @@ -161,7 +161,7 @@ class TbsCertificate {

return TbsCertificate(
version: version,
serialNumber: (elements[0] as ASN1Integer).valueAsBigInteger!.toInt(),
serialNumber: (elements[0] as ASN1Integer).valueAsBigInteger.toInt(),
signature: AlgorithmIdentifier.fromAsn1(elements[1] as ASN1Sequence),
issuer: Name.fromAsn1(elements[2] as ASN1Sequence),
validity: Validity.fromAsn1(elements[3] as ASN1Sequence),
Expand Down
4 changes: 2 additions & 2 deletions lib/src/extension.dart
Expand Up @@ -44,7 +44,7 @@ class Extension {
extnId: id,
isCritical: critical,
extnValue: ExtensionValue.fromAsn1(
ASN1Parser(sequence.elements[octetIndex].contentBytes()!)
ASN1Parser(sequence.elements[octetIndex].contentBytes())
.nextObject(),
id));
}
Expand Down Expand Up @@ -352,7 +352,7 @@ class BasicConstraints extends ExtensionValue {
int? len;
for (var o in sequence.elements) {
if (o is ASN1Boolean) {
cA = o.booleanValue!;
cA = o.booleanValue;
}
if (o is ASN1Integer) {
len = o.intValue;
Expand Down
10 changes: 5 additions & 5 deletions lib/src/util.dart
Expand Up @@ -36,9 +36,9 @@ KeyPair ecKeyPairFromAsn1(ASN1Sequence sequence) {
throw UnsupportedError('Only `ecPrivkeyVer1` supported.');
}

var privateKey = toBigInt(sequence.elements[1].contentBytes()!);
var privateKey = toBigInt(sequence.elements[1].contentBytes());

var l = sequence.elements[1].contentBytes()!.length;
var l = sequence.elements[1].contentBytes().length;

Identifier? curve;

Expand All @@ -52,7 +52,7 @@ KeyPair ecKeyPairFromAsn1(ASN1Sequence sequence) {

EcPublicKey? publicKey;
if (sequence.elements.length > i && sequence.elements[i].tag == 0xa1) {
var e = ASN1Parser(sequence.elements[i].contentBytes()!).nextObject()
var e = ASN1Parser(sequence.elements[i].contentBytes()).nextObject()
as ASN1BitString;
// https://tools.ietf.org/html/rfc5480#section-2.2
// ECPoint ::= OCTET STRING
Expand Down Expand Up @@ -98,8 +98,8 @@ KeyPair rsaKeyPairFromAsn1(ASN1Sequence sequence) {
}

RsaPublicKey rsaPublicKeyFromAsn1(ASN1Sequence sequence) {
var modulus = (sequence.elements[0] as ASN1Integer).valueAsBigInteger!;
var exponent = (sequence.elements[1] as ASN1Integer).valueAsBigInteger!;
var modulus = (sequence.elements[0] as ASN1Integer).valueAsBigInteger;
var exponent = (sequence.elements[1] as ASN1Integer).valueAsBigInteger;
return RsaPublicKey(modulus: modulus, exponent: exponent);
}

Expand Down
4 changes: 2 additions & 2 deletions lib/src/x509_base.dart
Expand Up @@ -173,7 +173,7 @@ class PrivateKeyInfo {
algorithm,
keyPairFromAsn1(
ASN1BitString(
(sequence.elements[2] as ASN1OctetString).contentBytes()!),
(sequence.elements[2] as ASN1OctetString).contentBytes()),
algorithm.algorithm));
}
}
Expand All @@ -192,7 +192,7 @@ class EncryptedPrivateKeyInfo {
final algorithm =
AlgorithmIdentifier.fromAsn1(sequence.elements[0] as ASN1Sequence);
return EncryptedPrivateKeyInfo(
algorithm, (sequence.elements[1] as ASN1OctetString).contentBytes()!);
algorithm, (sequence.elements[1] as ASN1OctetString).contentBytes());
}
}

Expand Down
8 changes: 4 additions & 4 deletions pubspec.yaml
Expand Up @@ -3,19 +3,19 @@ description: Dart library for parsing and working with X.509 certificates.
version: 0.2.3
homepage: https://github.com/appsup-dart/x509
funding:
- https://github.com/sponsors/rbellens
- https://github.com/sponsors/rbellens

environment:
sdk: '>=2.12.0 <3.0.0'
sdk: ">=3.0.0 <4.0.0"

dependencies:
asn1lib: ^1.0.0
quiver: ^3.0.0
crypto_keys: '>=0.2.0 <0.4.0'
crypto_keys: ">=0.2.0 <0.4.0"

dev_dependencies:
test: ^1.0.0
lints: ^2.0.0

false_secrets:
- test/files/*
- test/files/*