Skip to content

Commit 936a5c2

Browse files
committed
fixed test regression
1 parent 9c2525e commit 936a5c2

File tree

1 file changed

+6
-10
lines changed

1 file changed

+6
-10
lines changed

powershell/ql/lib/semmle/code/powershell/security/cryptography/CryptographyModule.qll

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,6 @@ abstract class CryptoAlgorithmCreateCall extends DataFlow::CallNode {
2525
.getMember("create")
2626
.asCall()
2727
}
28-
29-
string getObjectName() { result = objectName }
3028
}
3129

3230
abstract class CryptoAlgorithmCreateArgCall extends DataFlow::CallNode {
@@ -51,7 +49,6 @@ abstract class CryptoAlgorithmCreateArgCall extends DataFlow::CallNode {
5149
objectName = this.getAnArgument().asExpr().getValue().asString().toLowerCase()
5250
}
5351

54-
string getObjectName() { result = objectName }
5552
}
5653

5754
class CryptoAlgorithmCreateFromNameCall extends DataFlow::CallNode {
@@ -68,14 +65,13 @@ class CryptoAlgorithmCreateFromNameCall extends DataFlow::CallNode {
6865
objectName = this.getAnArgument().asExpr().getValue().asString().toLowerCase()
6966
}
7067

71-
string getObjectName() { result = objectName }
7268
}
7369

7470
class HashAlgorithmObjectCreation extends HashAlgorithm, CryptoAlgorithmObjectCreation {
7571
string algName;
7672

7773
HashAlgorithmObjectCreation() {
78-
this.getObjectName() = "system.security.cryptography." + algName + ["", "cryptoserviceprovider"] and
74+
objectName = "system.security.cryptography." + algName + ["", "cryptoserviceprovider"] and
7975
isHashingAlgorithm(algName)
8076
}
8177

@@ -87,7 +83,7 @@ class HashAlgorithmCreateCall extends HashAlgorithm, CryptoAlgorithmCreateCall {
8783

8884
HashAlgorithmCreateCall() {
8985
isHashingAlgorithm(algName) and
90-
this.getObjectName() = ["", "system.security.cryptography."] + algName
86+
objectName = ["", "system.security.cryptography."] + algName
9187
}
9288

9389
override string getName() { result = algName }
@@ -97,7 +93,7 @@ class HashAlgorithmCreateFromNameCall extends HashAlgorithm, CryptoAlgorithmCrea
9793
string algName;
9894

9995
HashAlgorithmCreateFromNameCall() {
100-
this.getObjectName() = ["", "system.security.cryptography."] + algName and
96+
objectName = ["", "system.security.cryptography."] + algName and
10197
isHashingAlgorithm(algName)
10298
}
10399

@@ -124,7 +120,7 @@ class SymmetricAlgorithmCreateCall extends SymmetricAlgorithm, CryptoAlgorithmCr
124120

125121
SymmetricAlgorithmCreateCall() {
126122
isSymmetricAlgorithm(algName) and
127-
this.getObjectName() = ["", "system.security.cryptography.", "system.security.cryptography.symmetricalgorithm."] + algName
123+
objectName = ["", "system.security.cryptography.", "system.security.cryptography.symmetricalgorithm."] + algName
128124
}
129125

130126
override string getName() { result = algName }
@@ -134,7 +130,7 @@ class SymmetricAlgorithmCreateArgCall extends SymmetricAlgorithm, CryptoAlgorith
134130
string algName;
135131

136132
SymmetricAlgorithmCreateArgCall() {
137-
algName = ["", "system.security.cryptography."] + this.getObjectName() and
133+
objectName = ["", "system.security.cryptography."] + algName and
138134
isSymmetricAlgorithm(algName)
139135
}
140136

@@ -147,7 +143,7 @@ class SymmetricAlgorithmCreateFromNameCall extends SymmetricAlgorithm,
147143
string algName;
148144

149145
SymmetricAlgorithmCreateFromNameCall() {
150-
this.getObjectName() = ["", "system.security.cryptography.", "system.security.cryptography.symmetricalgorithm."] + algName and
146+
objectName = ["", "system.security.cryptography.", "system.security.cryptography.symmetricalgorithm."] + algName and
151147
isSymmetricAlgorithm(algName)
152148
}
153149

0 commit comments

Comments
 (0)