Merge pull request #20605 from bdrodes/santander-java-crypto-check

Crypto: Add Java Cryptographic Analysis Queries

Author: nicolaswill

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/EllipticCurveAlgorithmInstance.qll

@@ -40,7 +40,7 @@ class KnownOpenSslEllipticCurveConstantAlgorithmInstance extends OpenSslAlgorith
     result = this.(Call).getTarget().getName()
   }
 
-  override Crypto::EllipticCurveFamilyType getEllipticCurveFamilyType() {
+  override Crypto::EllipticCurveType getEllipticCurveType() {
     if
       Crypto::ellipticCurveNameToKnownKeySizeAndFamilyMapping(this.getParsedEllipticCurveName(), _,
         _)

cpp/ql/lib/experimental/quantum/OpenSSL/AlgorithmInstances/HashAlgorithmInstance.qll

@@ -72,7 +72,7 @@ class KnownOpenSslHashConstantAlgorithmInstance extends OpenSslAlgorithmInstance
 
   override OpenSslAlgorithmValueConsumer getAvc() { result = getterCall }
 
-  override Crypto::THashType getHashFamily() {
+  override Crypto::THashType getHashType() {
     knownOpenSslConstantToHashFamilyType(this, result)
     or
     not knownOpenSslConstantToHashFamilyType(this, _) and result = Crypto::OtherHashType()

java/ql/integration-tests/java/query-suite/not_included_in_qls.expected

@@ -228,14 +228,24 @@ ql/java/ql/src/experimental/Security/CWE/CWE-665/InsecureRmiJmxEnvironmentConfig
 ql/java/ql/src/experimental/Security/CWE/CWE-755/NFEAndroidDoS.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-759/HashWithoutSalt.ql
 ql/java/ql/src/experimental/Security/CWE/CWE-939/IncorrectURLVerification.ql
-ql/java/ql/src/experimental/quantum/Analysis/InsecureNonceSource.ql
-ql/java/ql/src/experimental/quantum/Analysis/KnownWeakKDFIterationCount.ql
-ql/java/ql/src/experimental/quantum/Analysis/ReusedNonce.ql
-ql/java/ql/src/experimental/quantum/Analysis/UnknownKDFIterationCount.ql
+ql/java/ql/src/experimental/quantum/Examples/BadMacOrderDecryptToMac.ql
+ql/java/ql/src/experimental/quantum/Examples/BadMacOrderMacOnEncryptPlaintext.ql
 ql/java/ql/src/experimental/quantum/Examples/BrokenCrypto.ql
+ql/java/ql/src/experimental/quantum/Examples/InsecureIVorNonceSource.ql
+ql/java/ql/src/experimental/quantum/Examples/NonAESGCMCipher.ql
+ql/java/ql/src/experimental/quantum/Examples/ReusedNonce.ql
 ql/java/ql/src/experimental/quantum/Examples/TestAESGCMNonce.ql
 ql/java/ql/src/experimental/quantum/Examples/TestCipher.ql
 ql/java/ql/src/experimental/quantum/Examples/TestHash.ql
+ql/java/ql/src/experimental/quantum/Examples/UnknownHash.ql
+ql/java/ql/src/experimental/quantum/Examples/UnknownIVorNonceSource.ql
+ql/java/ql/src/experimental/quantum/Examples/UnknownKDFIterationCount.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakAsymmetricKeyGenSize.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakBlockModes.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakHash.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakKDFIterationCount.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakKDFKeySize.ql
+ql/java/ql/src/experimental/quantum/Examples/WeakSymmetricCipher.ql
 ql/java/ql/src/experimental/quantum/InventorySlices/KnownAsymmetricAlgorithm.ql
 ql/java/ql/src/experimental/quantum/InventorySlices/KnownAsymmetricCipherAlgorithm.ql
 ql/java/ql/src/experimental/quantum/InventorySlices/KnownAsymmetricOperationAlgorithm.ql