@@ -10,14 +10,14 @@ private import AlgToAVCFlow
1010private import BlockAlgorithmInstance
1111
1212/**
13- * Given a `KnownOpenSSLCipherAlgorithmExpr `, converts this to a cipher family type.
13+ * Given a `KnownOpenSslCipherAlgorithmExpr `, converts this to a cipher family type.
1414 * Does not bind if there is no mapping (no mapping to 'unknown' or 'other').
1515 */
16- predicate knownOpenSSLConstantToCipherFamilyType (
17- KnownOpenSSLCipherAlgorithmExpr e , Crypto:: KeyOpAlg:: TAlgorithm type
16+ predicate knownOpenSslConstantToCipherFamilyType (
17+ KnownOpenSslCipherAlgorithmExpr e , Crypto:: KeyOpAlg:: TAlgorithm type
1818) {
1919 exists ( string name |
20- name = e .( KnownOpenSSLAlgorithmExpr ) .getNormalizedName ( ) and
20+ name = e .( KnownOpenSslAlgorithmExpr ) .getNormalizedName ( ) and
2121 (
2222 name .matches ( "AES%" ) and type = KeyOpAlg:: TSymmetricCipher ( KeyOpAlg:: AES ( ) )
2323 or
@@ -64,28 +64,28 @@ predicate knownOpenSSLConstantToCipherFamilyType(
6464 )
6565}
6666
67- class KnownOpenSSLCipherConstantAlgorithmInstance extends OpenSSLAlgorithmInstance ,
68- Crypto:: KeyOperationAlgorithmInstance instanceof KnownOpenSSLCipherAlgorithmExpr
67+ class KnownOpenSslCipherConstantAlgorithmInstance extends OpenSslAlgorithmInstance ,
68+ Crypto:: KeyOperationAlgorithmInstance instanceof KnownOpenSslCipherAlgorithmExpr
6969{
70- OpenSSLAlgorithmValueConsumer getterCall ;
70+ OpenSslAlgorithmValueConsumer getterCall ;
7171
72- KnownOpenSSLCipherConstantAlgorithmInstance ( ) {
72+ KnownOpenSslCipherConstantAlgorithmInstance ( ) {
7373 // Two possibilities:
7474 // 1) The source is a literal and flows to a getter, then we know we have an instance
75- // 2) The source is a KnownOpenSSLAlgorithm is call, and we know we have an instance immediately from that
75+ // 2) The source is a KnownOpenSslAlgorithm is call, and we know we have an instance immediately from that
7676 // Possibility 1:
77- this instanceof OpenSSLAlgorithmLiteral and
77+ this instanceof OpenSslAlgorithmLiteral and
7878 exists ( DataFlow:: Node src , DataFlow:: Node sink |
7979 // Sink is an argument to a CipherGetterCall
80- sink = getterCall .( OpenSSLAlgorithmValueConsumer ) .getInputNode ( ) and
80+ sink = getterCall .( OpenSslAlgorithmValueConsumer ) .getInputNode ( ) and
8181 // Source is `this`
8282 src .asExpr ( ) = this and
8383 // This traces to a getter
84- KnownOpenSSLAlgorithmToAlgorithmValueConsumerFlow :: flow ( src , sink )
84+ KnownOpenSslAlgorithmToAlgorithmValueConsumerFlow :: flow ( src , sink )
8585 )
8686 or
8787 // Possibility 2:
88- this instanceof OpenSSLAlgorithmCall and
88+ this instanceof OpenSslAlgorithmCall and
8989 getterCall = this
9090 }
9191
@@ -110,17 +110,17 @@ class KnownOpenSSLCipherConstantAlgorithmInstance extends OpenSSLAlgorithmInstan
110110 }
111111
112112 override int getKeySizeFixed ( ) {
113- this .( KnownOpenSSLCipherAlgorithmExpr ) .getExplicitKeySize ( ) = result
113+ this .( KnownOpenSslCipherAlgorithmExpr ) .getExplicitKeySize ( ) = result
114114 }
115115
116116 override Crypto:: KeyOpAlg:: Algorithm getAlgorithmType ( ) {
117- knownOpenSSLConstantToCipherFamilyType ( this , result )
117+ knownOpenSslConstantToCipherFamilyType ( this , result )
118118 or
119- not knownOpenSSLConstantToCipherFamilyType ( this , _) and
119+ not knownOpenSslConstantToCipherFamilyType ( this , _) and
120120 result = Crypto:: KeyOpAlg:: TUnknownKeyOperationAlgorithmType ( )
121121 }
122122
123- override OpenSSLAlgorithmValueConsumer getAVC ( ) { result = getterCall }
123+ override OpenSslAlgorithmValueConsumer getAvc ( ) { result = getterCall }
124124
125125 override Crypto:: ConsumerInputDataFlowNode getKeySizeConsumer ( ) {
126126 // TODO: trace to any key size initializer, symmetric and asymmetric
0 commit comments