diff --git a/javascript/ql/lib/semmle/javascript/Concepts.qll b/javascript/ql/lib/semmle/javascript/Concepts.qll index a760e746030..14308a3d17b 100644 --- a/javascript/ql/lib/semmle/javascript/Concepts.qll +++ b/javascript/ql/lib/semmle/javascript/Concepts.qll @@ -115,5 +115,22 @@ abstract class PersistentWriteAccess extends DataFlow::Node { * Provides models for cryptographic things. */ module Cryptography { - import semmle.javascript.internal.ConceptsShared::Cryptography + private import semmle.javascript.internal.ConceptsShared::Cryptography as SC + + class CryptographicOperation extends SC::CryptographicOperation instanceof CryptographicOperation::Range { + /** DEPRECATED. This predicate has been renamed to `getAnInput`. */ + deprecated final DataFlow::Node getInput() { result = this.getAnInput() } + } + + class EncryptionAlgorithm = SC::EncryptionAlgorithm; + + class HashingAlgorithm = SC::HashingAlgorithm; + + class PasswordHashingAlgorithm = SC::PasswordHashingAlgorithm; + + module CryptographicOperation = SC::CryptographicOperation; + + class BlockMode = SC::BlockMode; + + class CryptographicAlgorithm = SC::CryptographicAlgorithm; } diff --git a/javascript/ql/lib/semmle/javascript/internal/ConceptsShared.qll b/javascript/ql/lib/semmle/javascript/internal/ConceptsShared.qll index 522c883e0b4..449aca6e5c4 100644 --- a/javascript/ql/lib/semmle/javascript/internal/ConceptsShared.qll +++ b/javascript/ql/lib/semmle/javascript/internal/ConceptsShared.qll @@ -43,9 +43,6 @@ module Cryptography { /** Gets an input the algorithm is used on, for example the plain text input to be encrypted. */ DataFlow::Node getAnInput() { result = super.getAnInput() } - /** DEPRECATED. This predicate has been renamed to `getAnInput`. */ - deprecated final DataFlow::Node getInput() { result = super.getInput() } - /** * Gets the block mode used to perform this cryptographic operation. * This may have no result - for example if the `CryptographicAlgorithm` used @@ -70,9 +67,6 @@ module Cryptography { /** Gets an input the algorithm is used on, for example the plain text input to be encrypted. */ abstract DataFlow::Node getAnInput(); - /** DEPRECATED. This predicate has been renamed to `getAnInput`. */ - deprecated final DataFlow::Node getInput() { result = this.getAnInput() } - /** * Gets the block mode used to perform this cryptographic operation. * This may have no result - for example if the `CryptographicAlgorithm` used diff --git a/python/ql/lib/semmle/python/internal/ConceptsShared.qll b/python/ql/lib/semmle/python/internal/ConceptsShared.qll index 522c883e0b4..449aca6e5c4 100644 --- a/python/ql/lib/semmle/python/internal/ConceptsShared.qll +++ b/python/ql/lib/semmle/python/internal/ConceptsShared.qll @@ -43,9 +43,6 @@ module Cryptography { /** Gets an input the algorithm is used on, for example the plain text input to be encrypted. */ DataFlow::Node getAnInput() { result = super.getAnInput() } - /** DEPRECATED. This predicate has been renamed to `getAnInput`. */ - deprecated final DataFlow::Node getInput() { result = super.getInput() } - /** * Gets the block mode used to perform this cryptographic operation. * This may have no result - for example if the `CryptographicAlgorithm` used @@ -70,9 +67,6 @@ module Cryptography { /** Gets an input the algorithm is used on, for example the plain text input to be encrypted. */ abstract DataFlow::Node getAnInput(); - /** DEPRECATED. This predicate has been renamed to `getAnInput`. */ - deprecated final DataFlow::Node getInput() { result = this.getAnInput() } - /** * Gets the block mode used to perform this cryptographic operation. * This may have no result - for example if the `CryptographicAlgorithm` used diff --git a/ruby/ql/lib/codeql/ruby/internal/ConceptsShared.qll b/ruby/ql/lib/codeql/ruby/internal/ConceptsShared.qll index 522c883e0b4..449aca6e5c4 100644 --- a/ruby/ql/lib/codeql/ruby/internal/ConceptsShared.qll +++ b/ruby/ql/lib/codeql/ruby/internal/ConceptsShared.qll @@ -43,9 +43,6 @@ module Cryptography { /** Gets an input the algorithm is used on, for example the plain text input to be encrypted. */ DataFlow::Node getAnInput() { result = super.getAnInput() } - /** DEPRECATED. This predicate has been renamed to `getAnInput`. */ - deprecated final DataFlow::Node getInput() { result = super.getInput() } - /** * Gets the block mode used to perform this cryptographic operation. * This may have no result - for example if the `CryptographicAlgorithm` used @@ -70,9 +67,6 @@ module Cryptography { /** Gets an input the algorithm is used on, for example the plain text input to be encrypted. */ abstract DataFlow::Node getAnInput(); - /** DEPRECATED. This predicate has been renamed to `getAnInput`. */ - deprecated final DataFlow::Node getInput() { result = this.getAnInput() } - /** * Gets the block mode used to perform this cryptographic operation. * This may have no result - for example if the `CryptographicAlgorithm` used