Crypto: Updating JCA to use new key size predicate returning int for elliptic curve.

This commit is contained in:
REDMOND\brodes
2025-05-19 13:09:33 -04:00
parent dfbe08d14c
commit e7535b3eff
2 changed files with 4 additions and 9 deletions

View File

@@ -1606,13 +1606,8 @@ module JCAModel {
else result = Crypto::OtherEllipticCurveType()
}
override string getKeySize() {
exists(int keySize |
Crypto::ellipticCurveNameToKeySizeAndFamilyMapping(this.getRawEllipticCurveName(), keySize,
_)
|
result = keySize.toString()
)
override int getKeySize() {
Crypto::ellipticCurveNameToKeySizeAndFamilyMapping(this.getRawEllipticCurveName(), result, _)
}
EllipticCurveAlgorithmValueConsumer getConsumer() { result = consumer }

View File

@@ -972,7 +972,7 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
abstract TEllipticCurveType getEllipticCurveType();
abstract string getKeySize();
abstract int getKeySize();
/**
* The 'parsed' curve name, e.g., "P-256" or "secp256r1"
@@ -2613,7 +2613,7 @@ module CryptographyBase<LocationSig Location, InputSig<Location> Input> {
or
// [ONLY_KNOWN]
key = "KeySize" and
value = instance.asAlg().getKeySize() and
value = instance.asAlg().getKeySize().toString() and
location = this.getLocation()
or
// [KNOWN_OR_UNKNOWN]