diff --git a/Bin/Microsoft.IdentityModel.JsonWebTokens.dll b/Bin/Microsoft.IdentityModel.JsonWebTokens.dll index 0382839d1..1c17c5a22 100644 Binary files a/Bin/Microsoft.IdentityModel.JsonWebTokens.dll and b/Bin/Microsoft.IdentityModel.JsonWebTokens.dll differ diff --git a/Bin/Microsoft.IdentityModel.JsonWebTokens.dll.refresh b/Bin/Microsoft.IdentityModel.JsonWebTokens.dll.refresh index 4c2565f48..db176b08b 100644 Binary files a/Bin/Microsoft.IdentityModel.JsonWebTokens.dll.refresh and b/Bin/Microsoft.IdentityModel.JsonWebTokens.dll.refresh differ diff --git a/Bin/Microsoft.IdentityModel.JsonWebTokens.xml b/Bin/Microsoft.IdentityModel.JsonWebTokens.xml index b61e7f4bf..226722764 100644 --- a/Bin/Microsoft.IdentityModel.JsonWebTokens.xml +++ b/Bin/Microsoft.IdentityModel.JsonWebTokens.xml @@ -231,10 +231,7 @@ Decodes the payload and signature from the JWE parts. Parts of the JWE including the header. - - Assumes Header has already been set. - According to the JWE documentation (https://tools.ietf.org/html/rfc7516#section-2), it is possible for the EncryptedKey, InitializationVector, and AuthenticationTag to be empty strings. - + Assumes Header has already been set. @@ -243,41 +240,17 @@ Parts of the JWS including the header. Assumes Header has already been set. - - - Gets a representing the { key, 'value' } pair corresponding to the provided . - - If the key has no corresponding value, this method will throw. - Gets the 'value' corresponding to the provided key from the JWT payload { key, 'value' }. - If the key has no corresponding value, this method will throw. - - - - Tries to get the representing the { key, 'value' } pair corresponding to the provided . - - If the key has no corresponding value, returns false. Otherwise returns true. - - - - Tries to get the 'value' corresponding to the provided key from the JWT payload { key, 'value' }. - - If the key has no corresponding value, returns false. Otherwise returns true. + If the key has no corresponding value, returns null. Gets the 'value' corresponding to the provided key from the JWT header { key, 'value' }. - If the key has no corresponding value, this method will throw. - - - - Tries to get the value corresponding to the provided key from the JWT header { key, 'value' }. - - If the key has no corresponding value, returns false. Otherwise returns true. + If the key has no corresponding value, returns null. @@ -285,13 +258,6 @@ See: http://tools.ietf.org/html/rfc7519 and http://www.rfc-editor.org/info/rfc7515. - - - Gets the Base64Url encoded string representation of the following JWT header: - { , }. - - The Base64Url encoded string representation of the unsigned JWT header. - Gets the type of the . @@ -321,64 +287,14 @@ 'true', indicating this instance can validate a . - - - Creates an unsigned JWS (Json Web Signature). - - A string containing JSON which represents the JWT token payload. - if is null. - A JWS in Compact Serialization Format. - - - - Creates an unsigned JWS (Json Web Signature). - - A string containing JSON which represents the JWT token payload. - Defines the dictionary containing any custom header claims that need to be added to the JWT token header. - if is null. - if is null. - A JWS in Compact Serialization Format. - Creates a JWS (Json Web Signature). A string containing JSON which represents the JWT token payload. Defines the security key and algorithm that will be used to sign the JWS. - if is null. - if is null. A JWS in Compact Serialization Format. - - - Creates a JWS (Json Web Signature). - - A string containing JSON which represents the JWT token payload. - Defines the security key and algorithm that will be used to sign the JWS. - Defines the dictionary containing any custom header claims that need to be added to the JWT token header. - if is null. - if is null. - if is null. - if , - , , and/or - are present inside of . - A JWS in Compact Serialization Format. - - - - Creates a JWS(Json Web Signature). - - A that contains details of contents of the token. - A JWS in Compact Serialization Format. - - - - Creates a JWE (Json Web Encryption). - - A string containing JSON which represents the JWT token payload. - Defines the security key and algorithm that will be used to encrypt the JWT. - A JWE in compact serialization format. - Creates a JWE (Json Web Encryption). @@ -386,35 +302,6 @@ A string containing JSON which represents the JWT token payload. Defines the security key and algorithm that will be used to sign the JWT. Defines the security key and algorithm that will be used to encrypt the JWT. - if is null. - if is null. - if is null. - A JWE in compact serialization format. - - - - Creates a JWE (Json Web Encryption). - - A string containing JSON which represents the JWT token payload. - Defines the security key and algorithm that will be used to sign the JWT. - Defines the security key and algorithm that will be used to encrypt the JWT. - Defines the dictionary containing any custom header claims that need to be added to the outer JWT token header. - if is null. - if is null. - if is null. - if is null. - if , - , , and/or - are present inside of . - A JWE in compact serialization format. - - - - Creates a JWE (Json Web Encryption). - - A string containing JSON which represents the JWT token payload. - Defines the security key and algorithm that will be used to encrypt the JWT. - Defines the compression algorithm that will be used to compress the JWT token payload. A JWE in compact serialization format. @@ -425,29 +312,6 @@ Defines the security key and algorithm that will be used to sign the JWT. Defines the security key and algorithm that will be used to encrypt the JWT. Defines the compression algorithm that will be used to compress the JWT token payload. - if is null. - if is null. - if is null. - if is null. - A JWE in compact serialization format. - - - - Creates a JWE (Json Web Encryption). - - A string containing JSON which represents the JWT token payload. - Defines the security key and algorithm that will be used to sign the JWT. - Defines the security key and algorithm that will be used to encrypt the JWT. - Defines the compression algorithm that will be used to compress the JWT token payload. - Defines the dictionary containing any custom header claims that need to be added to the outer JWT token header. - if is null. - if is null. - if is null. - if is null. - if is null. - if , - , , and/or - are present inside of . A JWE in compact serialization format. @@ -455,19 +319,22 @@ Compress a JWT token string. - - if is null. - if is null. + + if 'token' is null. + if 'algorithm' is null. if the compression algorithm is not supported. Compressed JWT token bytes. - + - Creates a from a . + Decompress JWT token bytes. - The to use as a source. - Contains parameters for validating the token. - A containing the . + + + if 'tokenBytes' is null. + if 'algorithm' is null. + if the decompression algorithm is not supported. + Decompressed JWT token @@ -476,78 +343,21 @@ the JWE that contains the cypher text. contains crypto material. the decoded / cleartext contents of the JWE. - if is null. - if is null. - if ' .Enc' is null or empty. + if 'jwtToken' is null. + if 'validationParameters' is null. + if 'jwtToken.Enc' is null or empty. if decompression failed. - if ' .Kid' is not null AND decryption fails. + if 'jwtToken.Kid' is not null AND decryption fails. if the JWE was not able to be decrypted. - + - Encrypts a JWS. + Returns a to use when validating the signature of a token. - A 'JSON Web Token' (JWT) in JWS Compact Serialization Format. - Defines the security key and algorithm that will be used to encrypt the . - if is null or empty. - if is null. - if both and . are null. - if the CryptoProviderFactory being used does not support the (algorithm), pair. - if unable to create a token encryption provider for the (algorithm), pair. - if encryption fails using the (algorithm), pair. - if not using one of the supported content encryption key (CEK) algorithms: 128, 384 or 512 AesCbcHmac (this applies in the case of key wrap only, not direct encryption). - - - - Encrypts a JWS. - - A 'JSON Web Token' (JWT) in JWS Compact Serialization Format. - Defines the security key and algorithm that will be used to encrypt the . - Defines the dictionary containing any custom header claims that need to be added to the outer JWT token header. - if is null or empty. - if is null. - if is null. - if both and . are null. - if the CryptoProviderFactory being used does not support the (algorithm), pair. - if unable to create a token encryption provider for the (algorithm), pair. - if encryption fails using the (algorithm), pair. - if not using one of the supported content encryption key (CEK) algorithms: 128, 384 or 512 AesCbcHmac (this applies in the case of key wrap only, not direct encryption). - - - - Encrypts a JWS. - - A 'JSON Web Token' (JWT) in JWS Compact Serialization Format. - Defines the security key and algorithm that will be used to encrypt the . - Defines the compression algorithm that will be used to compress the 'innerJwt'. - if is null or empty. - if is null. - if is null or empty. - if both and . are null. - if the CryptoProviderFactory being used does not support the (algorithm), pair. - if unable to create a token encryption provider for the (algorithm), pair. - if compression using fails. - if encryption fails using the (algorithm), pair. - if not using one of the supported content encryption key (CEK) algorithms: 128, 384 or 512 AesCbcHmac (this applies in the case of key wrap only, not direct encryption). - - - - Encrypts a JWS. - - A 'JSON Web Token' (JWT) in JWS Compact Serialization Format. - Defines the security key and algorithm that will be used to encrypt the . - Defines the compression algorithm that will be used to compress the 'innerJwt'. - Defines the dictionary containing any custom header claims that need to be added to the outer JWT token header. - if is null or empty. - if is null. - if is null or empty. - if is null or empty. - if both and . are null. - if the CryptoProviderFactory being used does not support the (algorithm), pair. - if unable to create a token encryption provider for the (algorithm), pair. - if compression using 'algorithm' fails. - if encryption fails using the (algorithm), pair. - if not using one of the supported content encryption key (CEK) algorithms: 128, 384 or 512 AesCbcHmac (this applies in the case of key wrap only, not direct encryption). + The that is being validated. + A required for validation. + Returns a to use for signature validation. + If key fails to resolve, then null is returned @@ -585,14 +395,14 @@ A 'JSON Web Token' (JWT) in JWS or JWE Compact Serialization Format. A required for validation. - A + A Validates the JWT signature. - + Obtains a and validates the signature. @@ -600,7 +410,6 @@ Signature to compare against. to use. Crypto algorithm to use. - The being validated. Priority will be given to over . 'true' if signature is valid. @@ -735,6 +544,7 @@ + http://tools.ietf.org/html/rfc7519#section-4 @@ -764,12 +574,12 @@ - https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims + http://tools.ietf.org/html/rfc7519#section-4 - https://openid.net/specs/openid-connect-core-1_0.html#HybridIDToken + http://tools.ietf.org/html/rfc7519#section-4 @@ -779,7 +589,7 @@ - https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims + http://tools.ietf.org/html/rfc7519#section-4 @@ -789,17 +599,17 @@ - https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims + http://tools.ietf.org/html/rfc7519#section-4 - https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims + http://tools.ietf.org/html/rfc7519#section-4 - https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims + http://tools.ietf.org/html/rfc7519#section-4 @@ -819,11 +629,12 @@ + http://tools.ietf.org/html/rfc7519#section-4 - https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest + http://tools.ietf.org/html/rfc7519#section-4 @@ -833,6 +644,7 @@ + http://tools.ietf.org/html/rfc7519#section-4 @@ -847,15 +659,17 @@ - https://tools.ietf.org/html/rfc7519#section-5 + http://tools.ietf.org/html/rfc7519#section-4 + http://tools.ietf.org/html/rfc7519#section-4 + http://tools.ietf.org/html/rfc7519#section-4 @@ -873,13 +687,6 @@ Regex that is used to figure out if a token is in JWE format. - - - Creates a dictionary from a list of Claim's. - - A list of claims. - A Dictionary representing claims. - Produces a signature over the 'input'. @@ -889,28 +696,6 @@ The bse64urlendcoded signature over the bytes obtained from UTF8Encoding.GetBytes( 'input' ). 'input' or 'signingCredentials' is null. - - - Produces a signature over the 'input'. - - String to be signed - The that contain crypto specs used to sign the token. - should the be cached. - The bse64urlendcoded signature over the bytes obtained from UTF8Encoding.GetBytes( 'input' ). - 'input' or 'signingCredentials' is null. - - - - Decompress JWT token bytes. - - - - if is null. - if is null. - if the decompression is not supported. - if decompression using fails. - Decompressed JWT token - Generates key bytes. @@ -921,7 +706,7 @@ Gets all decryption keys. - + Gets the DateTime using the number of seconds from 1970-01-01T0:0:0Z (UTC) @@ -932,20 +717,20 @@ If the value of the claim cannot be parsed into a long. The DateTime representation of a claim. - - - Returns a to use when validating the signature of a token. - - The kid field of the token being validated - The x5t field of the token being validated - A required for validation. - Returns a to use for signature validation. - If key fails to resolve, then null is returned - Log messages and codes + + + A class which contains the result of a token validation operation. + + + + + The validated security token. + + diff --git a/Bin/Microsoft.IdentityModel.Logging.dll b/Bin/Microsoft.IdentityModel.Logging.dll index 17f99f35f..60646a6da 100644 Binary files a/Bin/Microsoft.IdentityModel.Logging.dll and b/Bin/Microsoft.IdentityModel.Logging.dll differ diff --git a/Bin/Microsoft.IdentityModel.Logging.dll.refresh b/Bin/Microsoft.IdentityModel.Logging.dll.refresh index b7dc43fb3..20db82a9c 100644 Binary files a/Bin/Microsoft.IdentityModel.Logging.dll.refresh and b/Bin/Microsoft.IdentityModel.Logging.dll.refresh differ diff --git a/Bin/Microsoft.IdentityModel.Tokens.dll b/Bin/Microsoft.IdentityModel.Tokens.dll index 653fa3bdf..67cef9cb9 100644 Binary files a/Bin/Microsoft.IdentityModel.Tokens.dll and b/Bin/Microsoft.IdentityModel.Tokens.dll differ diff --git a/Bin/Microsoft.IdentityModel.Tokens.dll.refresh b/Bin/Microsoft.IdentityModel.Tokens.dll.refresh index cf036269e..12542a8e9 100644 Binary files a/Bin/Microsoft.IdentityModel.Tokens.dll.refresh and b/Bin/Microsoft.IdentityModel.Tokens.dll.refresh differ diff --git a/Bin/Microsoft.IdentityModel.Tokens.xml b/Bin/Microsoft.IdentityModel.Tokens.xml index 3eda6ced4..531569363 100644 --- a/Bin/Microsoft.IdentityModel.Tokens.xml +++ b/Bin/Microsoft.IdentityModel.Tokens.xml @@ -1,19 +1,29 @@ - + Microsoft.IdentityModel.Tokens + + + This adapter abstracts the 'RSA' differences between versions of .Net targets. + + + + + Calls and + + + + + The following code determines if RSACng is available on the .Net framework that is installed. + + Base class for a Security Key that contains Asymmetric key material. - - - Default constructor - - This must be overridden to get a bool indicating if a private key exists. @@ -48,78 +58,87 @@ - Provides signature and verification operations for Asymmetric Algorithms using a . + Provides signature and verification operations for Asymmetric Algorithms using a . - Mapping from algorithm to minimum .KeySize when creating signatures. + Mapping from algorithm to minimum .KeySize when creating signatures. - Mapping from algorithm to minimum .KeySize when verifying signatures. + Mapping from algorithm to minimum .KeySize when verifying signatures. - Initializes a new instance of the class used to create and verify signatures. + Initializes a new instance of the class used to create and verify signatures. - The that will be used for signature operations. + The that will be used for signature operations. The signature algorithm to apply. - Initializes a new instance of the class used to create and verify signatures. + Initializes a new instance of the class used to create and verify signatures. - The that will be used for signature operations. + The that will be used for signature operations. The signature algorithm to apply. - If this is required to create signatures then set this to true. + If this is required to create signatures then set this to true. - Creating signatures requires that the has access to a private key. + Creating signatures requires that the has access to a private key. Verifying signatures (the default), does not require access to the private key. - is null. - is null or empty. - is true and there is no private key. - If and algorithm pair are not supported. + is null. + is null or empty. + is true and there is no private key. + If and algorithm pair are not supported. - willCreateSignatures is true and .KeySize is less than the size corresponding to the given algorithm in . + willCreateSignatures is true and .KeySize is less than the size corresponding to the given algorithm in . - .KeySize is less than the size corresponding to the algorithm in . Note: this is always checked. + .KeySize is less than the size corresponding to the algorithm in . Note: this is always checked. If the runtime is unable to create a suitable cryptographic provider. - Gets the mapping from algorithm to the minimum .KeySize for creating signatures. + Gets the mapping from algorithm to the minimum .KeySize for creating signatures. - Gets the mapping from algorithm to the minimum .KeySize for verifying signatures. + Gets the mapping from algorithm to the minimum .KeySize for verifying signatures. - Creating a Signature requires the use of a . + Creating a Signature requires the use of a . This method returns the type of the HashAlgorithm (as a string) - that describes the to use when generating a Signature. + that describes the to use when generating a Signature. The SignatureAlgorithm in use. - if is null or whitespace. - if is not supported. + if is null or whitespace. + if is not supported. + + + + This method is here, just to keep the #if out of the constructor. + + + + + - Produces a signature over the 'input' using the and algorithm passed to . + Produces a signature over the 'input' using the and algorithm passed to . The bytes to be signed. A signature over the input. - if is null. - if .Length == 0. - If has been called. + if is null. + if .Length == 0. + If has been called. Sign is thread safe. @@ -129,27 +148,27 @@ The asymmetric key to validate. Algorithm for which this key will be used. Whether they key will be used for creating signatures. - if is null. - if is null or empty. - if .KeySize is less than the minimum + if is null. + if is null or empty. + if .KeySize is less than the minimum acceptable size. - for minimum signing sizes. - for minimum verifying sizes. + for minimum signing sizes. + for minimum verifying sizes. - Verifies that the over using the - and specified by this - are consistent. + Verifies that the over using the + and specified by this + are consistent. The bytes to generate the signature over. The value to verify against. true if signature matches, false otherwise. - is null or has length == 0. - is null or has length == 0. - If has been called. + is null or has length == 0. + is null or has length == 0. + If has been called. Verify is thread safe. @@ -208,42 +227,6 @@ string to decode. UTF8 string. - - - An opaque context used to store work when working with authentication artifacts. - - - - - Instantiates a new with a default activityId. - - - - - Instantiates a new with an activityId. - - - - - Gets or set a that will be used in the call to EventSource.SetCurrentThreadActivityId before logging. - - - - - Gets or sets a boolean controlling if logs are written into the context. - Useful when debugging. - - - - - The collection of logs associated with a request. Use to control capture. - - - - - Gets or sets an that enables custom extensibility scenarios. - - Constants for compression algorithms. @@ -254,20 +237,25 @@ Compression provider factory for compression and decompression. + + + Static constructor that initializes the default . + + - Default constructor for . + Default constructor for . - Constructor that creates a deep copy of given object. + Constructor that creates a deep copy of given object. - to copy from. + to copy from. - Returns the default instance. + Returns the default instance. @@ -284,10 +272,10 @@ - Returns a for a specific algorithm. + Returns a for a specific algorithm. the decompression algorithm. - a . + a . @@ -298,8 +286,8 @@ Returns the cache key to use when looking up an entry into the cache for a - the to create the key for. - the cache key to use for finding a . + the to create the key for. + the cache key to use for finding a . @@ -312,304 +300,206 @@ - Trys to adds a to this cache. + Trys to adds a to this cache. - to cache. - true if the was added, false if the cache already contained the + to cache. + true if the was added, false if the cache already contained the - Trys to find a in this cache. + Trys to find a in this cache. the key that is used to by the crypto provider. the algorithm that is used by the crypto provider. the typeof the crypto provider obtained by calling object.GetType(). - a bool to indicate if the will be used to sign. - the if found. - true if a was found, false otherwise. + a bool to indicate if the will be used to sign. + the if found. + true if a was found, false otherwise. - Trys to remove a from this cache. + Trys to remove a from this cache. - to remove. - true if the was removed, false if the was not found. + to remove. + true if the was removed, false if the was not found. - Creates cryptographic operators by specifying a 's and algorithms. + Creates cryptographic operators by specifying a 's and algorithms. - Returns the default instance. + Returns the default instance. - Gets or sets the default value for caching of 's. + Gets or sets the default value for caching + + + + + Static constructor that initializes the default . - Default constructor for . + Default constructor for . - Constructor that creates a deep copy of given object. + Constructor that creates a deep copy of given object. - to copy from. + to copy from. - Gets the + Gets the Extensibility point for creating custom cryptographic operators. - By default, if set, will be called before creating cryptographic operators. - If true is returned, then will be called. The will throw if the + By default, if set, will be called before creating cryptographic operators. + If true is returned, then will be called. The will throw if the Cryptographic operator returned is not of the correct type. - Gets or sets a bool controlling if should be cached. + Gets or sets a bool controlling if should be cached. - Creates an instance of for a specific <SecurityKey, Algorithm>. + Creates an instance of for a specific <SecurityKey, Algorithm>. - the to use. + the to use. the algorithm to use. - thrown if is null. - thrown if is null or empty. - thrown if and algorithm pair are not supported. - thrown if returns a type that is not assignable from . - - If is set and returns true. - is called to obtain the . - - When finished with the call . - - an instance of + an instance of + 'key' is null. + 'algorithm' is null or empty. + 'key' is not a . + 'algorithm, key' pair is not supported. - Creates an instance of for a specific <SecurityKey, Algorithm>. + Creates an instance of for a specific <SecurityKey, Algorithm>. - the to use. + the to use. the algorithm to use. - thrown if is null. - thrown if is null or empty. - thrown if and algorithm pair are not supported. - thrown if returns a type not assignable from . + an instance of + 'key' is null. + 'algorithm' is null or empty. + If and algorithm pair are not supported. - If is set and returns true. - is called to obtain the . - - When finished with the call . + When finished with the call . - an instance of - Creates a that creates a signature with the algorithm and . + Creates an instance of for a specific <SecurityKey, Algorithm>. - the to use for signing. - the algorithm to use for signing. - thrown if is null. - thrown if is null or empty. - thrown if is too small. - thrown if is not assignable from or . - thrown if the key / algorithm is not supported. - thrown if returns a type that is not assignable from . + the to use. + the algorithm to use. + an instance of + 'key' is null. + 'algorithm' is null or empty. + If and algorithm pair are not supported. - AsymmetricSignatureProviders require access to a PrivateKey for Signing. - When finished with the call . - If is set and returns true. - is called to obtain the . - + When finished with the call . - A that can be used to create a signature using the and algorithm. - Creates a that creates a signature with the algorithm and . + Creates a that supports the and algorithm. - the to use for signing. - the algorithm to use for signing. - thrown if is null. - thrown if is null or empty. - thrown if is too small. - thrown if is not assignable from or . - thrown if the key / algorithm is not supported. - thrown if returns a type that is not assignable from . + The to use for signing. + The algorithm to use for signing. + 'key' is null. + 'algorithm' is null or empty. + ' is too small. + is too small. + is not a or a . - AsymmetricSignatureProviders require access to a PrivateKey for Signing. - When finished with the call . - If is set and returns true. - is called to obtain the . - + AsymmetricSignatureProviders require access to a PrivateKey for Signing. + When finished with the call . - A that can be used to create a signature using the and algorithm. - - - - Creates a that creates a signature with the algorithm and . - - the to use for signing. - the algorithm to use for signing. - thrown if is null. - thrown if is null or empty. - thrown if is too small. - thrown if is not assignable from or . - thrown if the key / algorithm is not supported. - thrown if returns a type that is not assignable from . - - AsymmetricSignatureProviders require access to a PrivateKey for Signing. - When finished with the call . - If is set and returns true. - is called to obtain the . - - - A that can be used to create a signature using the and algorithm. - indicates if the should be cached for reuse. - Creates a that supports the and algorithm. + Returns a instance supports the and algorithm. - The to use for signature verification. + The to use for signing. The algorithm to use for verifying. - thrown if is null. - thrown if is null or empty. - thrown if is too small. - thrown if is not assignable from or . - thrown if the key / algorithm is not supported. - thrown if returns a type that is not assignable from . - When finished with the call . - If is set and returns true. - is called to obtain the . - - - A that can be used to validate a signature using the and algorithm. - - - - Creates a that supports the and algorithm. - - The to use for signature verification. - The algorithm to use for verifying. - thrown if is null. - thrown if is null or empty. - thrown if is too small. - thrown if is not assignable from or . - thrown if the key / algorithm is not supported. - thrown if returns a type that is not assignable from . - When finished with the call . - If is set and returns true. - is called to obtain the . - - - A that can be used to validate a signature using the and algorithm. - should the be cached. + 'key' is null. + 'algorithm' is null or empty. + is too small. + is too small. + ' is not a or a . + When finished with the call . - Creates a for a specific algorithm. + Returns a for a specific algorithm. the name of the hash algorithm to create. - thrown if is null or empty. - thrown if returns a type that is not assignable from . - thrown if is not supported. - When finished with the call . - If is set and returns true. - is called to obtain the . - - - A . + A + When finished with the call . + 'algorithm' is null or empty. + 'algorithm' is not supported. - Returns a for a specific algorithm. + Returns a for a specific algorithm. - bytes to use to create the Keyed Hash. - the name of the keyed hash algorithm to create. - thrown if is null. - thrown if is null or empty. - thrown if returns a type that is not assignable from . - is not supported. - When finished with the call . - If is set and returns true. - is called to obtain the . - - - A . + the keyed hash algorithm to create. + bytes to use to create the Keyed Hash + A + When finished with the call . + 'algorithm' is null or empty. + 'algorithm' is not supported. - Checks if an algorithm is supported. + Answers if an algorithm is supported - the name of the Hash algorithm. - Only considers known Hash algorithms. - true if: - - If is set and returns true. - - The algorithm is supported. - - + the name of the cryptographic algorithm + - Checks if the algorithm and is supported. + Checks if an 'algorithm, key' pair is supported. - the security algorithm to apply. - the . - Algorithms are supported for specific key types. - For example: - and will return true. - and will return false. - - true if: - - If is set and returns true. - - The algorithm / key pair is supported. - - + the algorithm to check. + the . + true if 'algorithm, key' pair is supported. - When finished with a call this method for cleanup. The default behavior is to call + When finished with a call this method for cleanup. The default behavior is to call - to be released. - thrown if is null. + to be released. - When finished with a call this method for cleanup."/> + When finished with a call this method for cleanup."/> - to be released. - thrown if is null. + to be released. - When finished with a call this method for cleanup."/> + When finished with a call this method for cleanup."/> - to be released. - thrown if is null. + to be released. - When finished with a call this method for cleanup. The default behavior is to call + When finished with a call this method for cleanup. The default behavior is to call - to be released. - thrown if is null. + to be released. @@ -619,12 +509,12 @@ Add a DateTime and a TimeSpan. - The maximum time is DateTime.MaxTime. It is not an error if time + timespan > MaxTime. + The maximum time is DateTime.MaxTime. It is not an error if time + timespan > MaxTime. Just return MaxTime. - Initial value. - to add. - as the sum of time and timespan. + Initial value. + to add. + as the sum of time and timespan. @@ -644,29 +534,29 @@ Ensures that DataTime is UTC. - to convert. + to convert. Ensures that DateTime is UTC. - to convert. + to convert. - A compression provider that supports compression and decompression using the algorithm. + A compression provider that supports compression and decompression using the algorithm. - Initializes a new instance of the class used to compress and decompress used the algorithm. + Initializes a new instance of the class used to compress and decompress used the algorithm. - Initializes a new instance of the class used to compress and decompress used the algorithm. + Initializes a new instance of the class used to compress and decompress used the algorithm. The compression level to use when compressing. @@ -678,7 +568,7 @@ Specifies whether compression should emphasize speed or compression size. - Set to by default. + Set to by default. @@ -709,13 +599,13 @@ - Returns a new instance of . + Returns a new instance of . - + - instance used to initialize the key. + instance used to initialize the key. @@ -732,23 +622,9 @@ - Gets key size. + Gets key size. - - - Determines whether the can compute a JWK thumbprint. - - true if JWK thumbprint can be computed; otherwise, false. - https://tools.ietf.org/html/rfc7638 - - - - Computes a sha256 hash over the . - - A JWK thumbprint. - https://tools.ietf.org/html/rfc7638 - A class for properties that are used for token encryption. @@ -756,9 +632,9 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - . + . A key wrap algorithm to use when encrypting a session key. Data encryption algorithm to apply. if 'certificate' is null. @@ -767,9 +643,9 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - to use when encrypting a session key. + to use when encrypting a session key. A key wrap algorithm to use when encrypting a session key. Data encryption algorithm to apply. if 'key' is null. @@ -778,15 +654,15 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. Used in scenarios when a key represents a 'shared' symmetric key. For example, SAML 2.0 Assertion will be encrypted using a provided symmetric key which won't be serialized to a SAML token. - to apply. + to apply. Data encryption algorithm to apply. - If the is not a . + If the is not a . if 'enc' is null or empty. @@ -801,12 +677,12 @@ - Users can override the default with this property. This factory will be used for creating encryption providers. + Users can override the default with this property. This factory will be used for creating encryption providers. - Gets the used for encryption. + Gets the used for encryption. @@ -816,15 +692,15 @@ - Initializes a new instance of the class used for encryption and decryption. - - The that will be used for crypto operations. + Initializes a new instance of the class used for encryption and decryption. + The that will be used for crypto operations. The encryption algorithm to apply. 'key' is null. 'algorithm' is null or whitespace. key size is not large enough. 'algorithm' is not supported. a symmetricSignatureProvider is not created. + @@ -833,13 +709,13 @@ - Gets or sets a user context for a . + Gets or sets a user context for a . This is null by default. This can be used by applications for extensibility scenarios. - Gets the that is being used. + Gets the that is being used. @@ -848,7 +724,7 @@ the data to be encrypted. will be combined with iv and ciphertext to create an authenticationtag. - containing ciphertext, iv, authenticationtag. + containing ciphertext, iv, authenticationtag. plaintext is null or empty. authenticationData is null or empty. AES crypto operation threw. See inner exception for details. @@ -860,11 +736,10 @@ the data to be encrypted. will be combined with iv and ciphertext to create an authenticationtag. initialization vector for encryption. - containing ciphertext, iv, authenticationtag. - is null or empty. - is null or empty. - Thrown if the AES crypto operation threw. See inner exception for details. - Thrown if the internal is disposed. + containing ciphertext, iv, authenticationtag. + is null or empty. + is null or empty. + AES crypto operation threw. See inner exception for details. @@ -875,73 +750,69 @@ the initialization vector used when creating the ciphertext. the authenticationTag that was created during the encyption. decrypted ciphertext - is null or empty. - is null or empty. - is null or empty. - is null or empty. - Thrown if the signature over the authenticationTag fails to verify. - Thrown if the AES crypto operation threw. See inner exception. - Thrown if the internal is disposed. - - - - Calls and - - - - - Releases managed resources. - - true, if called from Dispose(), false, if invoked inside a finalizer. + is null or empty. + is null or empty. + is null or empty. + is null or empty. + signature over authenticationTag fails to verify. + AES crypto operation threw. See inner exception. Checks if an 'key, algorithm' pair is supported - the + the the algorithm to check. true if 'key, algorithm' pair is supported. + + + The algorithm parameter logically defines a HMAC algorithm. + This method returns the HMAC to use. + + + + - Called to obtain the byte[] needed to create a + Called to obtain the byte[] needed to create a - that will be used to obtain the byte[]. - [] that is used to populated the KeyedHashAlgorithm. - if is null. + that will be used to obtain the byte[]. + [] that is used to populated the KeyedHashAlgorithm. + if is null. if a byte[] can not be obtained from SecurityKey. - and are supported. - For a .Key is returned - For a Base64UrlEncoder.DecodeBytes is called with if == JsonWebAlgorithmsKeyTypes.Octet + and are supported. + For a .Key is returned + For a Base64UrlEncoder.DecodeBytes is called with if == JsonWebAlgorithmsKeyTypes.Octet Checks that the key has sufficient length - that contains bytes. + that contains bytes. the algorithm to apply. - if is null. - if is null or empty. - if is not a supported algorithm. + if is null. + if is null or empty. + if is not a supported algorithm. - Contains the results of operation. + Contains the results of operation. - Initializes a new + Initializes a new - the used during + the used during protected text. the initialization vector used. - the bytes that need be passed to . + the bytes that need be passed to . - Gets the . + Gets the . @@ -971,18 +842,18 @@ - Gets or sets a user context for a . + Gets or sets a user context for a . This is null by default. This can be used by runtimes or for extensibility scenarios. - Gets the that is being used. + Gets the that is being used. - Calls and + Calls and @@ -1012,15 +883,15 @@ - Initializes a new instance of used for wrapping and un-wrappping keys. + Initializes a new instance of used for wrapping and un-wrappping keys. These keys are usually symmetric session keys that are wrapped using the recipients public key. - The that will be used for cryptographic operations. + The that will be used for cryptographic operations. The KeyWrap algorithm to apply. - Whether this is required to un-wrap keys. If true, the private key is required. + Whether this is required to un-wrap keys. If true, the private key is required. 'key' is null. 'algorithm' is null. The key size doesn't match the algorithm. - If and algorithm pair are not supported. + If and algorithm pair are not supported. Failed to create RSA algorithm with provided key and algorithm. @@ -1031,13 +902,13 @@ - Gets or sets a user context for a . + Gets or sets a user context for a . This is null by default. This is for use by the application and not used by this SDK. - Gets the that is being used. + Gets the that is being used. @@ -1050,7 +921,7 @@ Checks if an algorithm is supported. - The that will be used for crypto operations. + The that will be used for crypto operations. The KeyWrap algorithm to apply. true if the algorithm is supported; otherwise, false. @@ -1061,7 +932,7 @@ the bytes to unwrap. Unwrapped key 'keyBytes' is null or length == 0. - If has been called. + If has been called. Failed to unwrap the wrappedKey. If the internal RSA algorithm is null. @@ -1072,7 +943,7 @@ the key to be wrapped A wrapped key 'keyBytes' is null or has length == 0. - If has been called. + If has been called. Failed to wrap the 'keyBytes'. If the internal RSA algorithm is null. @@ -1083,13 +954,13 @@ - Initializes a new instance of the class used for wrap key and unwrap key. - The that will be used for crypto operations. + Initializes a new instance of the class used for wrap key and unwrap key. + The that will be used for crypto operations. The KeyWrap algorithm to apply. 'key' is null. 'algorithm' is null. - If and algorithm pair are not supported. - The cannot be converted to byte array + If and algorithm pair are not supported. + The cannot be converted to byte array The keysize doesn't match the algorithm. Failed to create symmetric algorithm with provided key and algorithm. @@ -1101,13 +972,13 @@ - Gets or sets a user context for a . + Gets or sets a user context for a . This is null by default. This can be used by runtimes or for extensibility scenarios. - Gets the that is being used. + Gets the that is being used. @@ -1118,10 +989,10 @@ - Returns the . + Returns the . - The cannot be converted to byte array + The cannot be converted to byte array The keysize doesn't match the algorithm. Failed to create symmetric algorithm with provided key and algorithm. @@ -1129,7 +1000,7 @@ Answers if an algorithm is supported - the + the the algorithm to use true if the algorithm is supported; otherwise, false. @@ -1141,7 +1012,7 @@ Unwraped key 'keyBytes' is null or length == 0. 'keyBytes' is not a multiple of 8. - If has been called. + If has been called. Failed to unwrap the wrappedKey. @@ -1152,7 +1023,7 @@ The wrapped key result 'keyBytes' is null or has length 0. 'keyBytes' is not a multiple of 8. - If has been called. + If has been called. Failed to wrap 'keyBytes'. @@ -1188,26 +1059,19 @@ - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. - Thrown when JWE decompression fails. @@ -1215,26 +1079,19 @@ - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. - Represents a security token exception when decryption failed. @@ -1242,29 +1099,22 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class with a specified error message. + Initializes a new instance of the class with a specified error message. The error message that explains the reason for the exception. - Initializes a new instance of the class with a specified error message + Initializes a new instance of the class with a specified error message and a reference to the inner exception that is the cause of this exception. The error message that explains the reason for the exception. - The that is the cause of the current exception, or a null reference if no inner exception is specified. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. + The that is the cause of the current exception, or a null reference if no inner exception is specified. @@ -1273,29 +1123,22 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class with a specified error message. + Initializes a new instance of the class with a specified error message. The error message that explains the reason for the exception. - Initializes a new instance of the class with a specified error message + Initializes a new instance of the class with a specified error message and a reference to the inner exception that is the cause of this exception. The error message that explains the reason for the exception. - The that is the cause of the current exception, or a null reference if no inner exception is specified. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. + The that is the cause of the current exception, or a null reference if no inner exception is specified. @@ -1305,28 +1148,21 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - A that represents the root cause of the exception. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. + A that represents the root cause of the exception. @@ -1335,29 +1171,22 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class with a specified error message. + Initializes a new instance of the class with a specified error message. The error message that explains the reason for the exception. - Initializes a new instance of the class with a specified error message + Initializes a new instance of the class with a specified error message and a reference to the inner exception that is the cause of this exception. The error message that explains the reason for the exception. - The that is the cause of the current exception, or a null reference if no inner exception is specified. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. + The that is the cause of the current exception, or a null reference if no inner exception is specified. @@ -1366,72 +1195,24 @@ - Gets or sets the Expires value that created the validation exception. This value is always in UTC. + Gets or sets the Expires value that created the validation exception. - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. - - - When overridden in a derived class, sets the with information about the exception.The that holds the serialized object data about the exception being thrown.The that contains contextual information about the source or destination.The parameter is a null reference ( in Visual Basic). - - - - This exception is thrown when a cryptographic algorithm is invalid. - - - - - Gets or sets the invalid algorithm that created the validation exception. - - - - - Initializes a new instance of the class. - - - - - Initializes a new instance of the class. - - Additional information to be included in the exception and displayed to user. - - - - Initializes a new instance of the class. - - Additional information to be included in the exception and displayed to user. - A that represents the root cause of the exception. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. - - - When overridden in a derived class, sets the with information about the exception.The that holds the serialized object data about the exception being thrown.The that contains contextual information about the source or destination.The parameter is a null reference ( in Visual Basic). - This exception is thrown when 'audience' of a token was not valid. @@ -1444,31 +1225,21 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - A that represents the root cause of the exception. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. - - - When overridden in a derived class, sets the with information about the exception.The that holds the serialized object data about the exception being thrown.The that contains contextual information about the source or destination.The parameter is a null reference ( in Visual Basic). + A that represents the root cause of the exception. @@ -1482,31 +1253,21 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - A that represents the root cause of the exception. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. - - - When overridden in a derived class, sets the with information about the exception.The that holds the serialized object data about the exception being thrown.The that contains contextual information about the source or destination.The parameter is a null reference ( in Visual Basic). + A that represents the root cause of the exception. @@ -1515,41 +1276,31 @@ - Gets or sets the NotBefore value that created the validation exception. This value is always in UTC. + Gets or sets the NotBefore value that created the validation exception. - Gets or sets the Expires value that created the validation exception. This value is always in UTC. + Gets or sets the Expires value that created the validation exception. - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - A that represents the root cause of the exception. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. - - - When overridden in a derived class, sets the with information about the exception.The that holds the serialized object data about the exception being thrown.The that contains contextual information about the source or destination.The parameter is a null reference ( in Visual Basic). + A that represents the root cause of the exception. @@ -1558,28 +1309,21 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - A that represents the root cause of the exception. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. + A that represents the root cause of the exception. @@ -1593,64 +1337,19 @@ - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. - - - - This exception is thrown when the token type ('typ' header claim) of a JWT token is invalid. - - - - - Gets or sets the invalid type that created the validation exception. - - - - - Initializes a new instance of the class. - - - - - Initializes a new instance of the class. - - Additional information to be included in the exception and displayed to user. - - - - Initializes a new instance of the class. - - Additional information to be included in the exception and displayed to user. - A that represents the root cause of the exception. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. - - - When overridden in a derived class, sets the with information about the exception.The that holds the serialized object data about the exception being thrown.The that contains contextual information about the source or destination.The parameter is a null reference ( in Visual Basic). - Represents a key wrap exception when encryption failed. @@ -1658,29 +1357,22 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class with a specified error message. + Initializes a new instance of the class with a specified error message. The error message that explains the reason for the exception. - Initializes a new instance of the class with a specified error message + Initializes a new instance of the class with a specified error message and a reference to the inner exception that is the cause of this exception. The error message that explains the reason for the exception. - The that is the cause of the current exception, or a null reference if no inner exception is specified. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. + The that is the cause of the current exception, or a null reference if no inner exception is specified. @@ -1689,28 +1381,21 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - A that represents the root cause of the exception. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. + A that represents the root cause of the exception. @@ -1720,34 +1405,24 @@ - Gets or sets the NotBefore value that created the validation exception. This value is always in UTC. + Gets or sets the NotBefore value that created the validation exception. - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. - - - When overridden in a derived class, sets the with information about the exception.The that holds the serialized object data about the exception being thrown.The that contains contextual information about the source or destination.The parameter is a null reference ( in Visual Basic). - This exception is thrown when an add to the TokenReplayCache fails. @@ -1755,28 +1430,21 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - A that represents the root cause of the exception. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. + A that represents the root cause of the exception. @@ -1785,26 +1453,19 @@ - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - Initializes a new instance of + Initializes a new instance of - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. - This exception is thrown when a security token contained a key identifier but the key was not found by the runtime. @@ -1812,28 +1473,21 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - Initializes a new instance of the class. + Initializes a new instance of the class. Addtional information to be included in the exception and displayed to user. - A that represents the root cause of the exception. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. + A that represents the root cause of the exception. @@ -1842,29 +1496,22 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - Initializes a new instance of the class with a specified error message. + Initializes a new instance of the class with a specified error message. The error message that explains the reason for the exception. - Initializes a new instance of the class with a specified error message + Initializes a new instance of the class with a specified error message and a reference to the inner exception that is the cause of this exception. The error message that explains the reason for the exception. - The that is the cause of the current exception, or a null reference if no inner exception is specified. - - - - Initializes a new instance of the class. - - the that holds the serialized object data. - The contextual information about the source or destination. + The that is the cause of the current exception, or a null reference if no inner exception is specified. @@ -1898,8 +1545,8 @@ Provides extensibility for cryptographic operators. - If custom operators are needed for then can be set to - return these operators. will be before each creation. + If custom operators are needed for then can be set to + return these operators. will be before each creation. @@ -1916,27 +1563,27 @@ the algorithm that defines the cryptographic operator. the arguments required by the cryptographic operator. May be null. - call when finished with the object. + call when finished with the object. - called to release the object returned from + called to release the object returned from - the object returned from . + the object returned from . Defines a cache for crypto providers. - Current support is limited to only. + Current support is limited to only. Returns the cache key to use when looking up an entry into the cache for a - the to create the key for. + the to create the key for. if signatureProvider is null. - the cache key to use for finding a . + the cache key to use for finding a . @@ -1952,37 +1599,35 @@ - Trys to adds a to this cache. + Trys to adds a to this cache. - to cache. + to cache. if signatureProvider is null. - - true if the was added, false if the cache already contained the or if should not be cached. - - if the is added will be set to 'this'. + true if the was added, false if the cache already contained the + if the is added will be set to 'this'. - Trys to find a to this cache. + Trys to find a to this cache. the key that is used to by the crypto provider. the algorithm that is used by the crypto provider. the typeof the crypto provider obtained by calling object.GetType(). - a bool to indicate if the will be used to sign. - the if found. + a bool to indicate if the will be used to sign. + the if found. if securityKey is null. if algorithm is null or empty string. if typeofProvider is null or empty string. - true if a was found, false otherwise. + true if a was found, false otherwise. - Trys to remove a from this cache. + Trys to remove a from this cache. - to remove. + to remove. if signatureProvider is null. - true if the was removed, false if the was not found. - if the is removed will be set to null. + true if the was removed, false if the was not found. + if the is removed will be set to null. @@ -2006,7 +1651,7 @@ - Validates a token passed as a string using + Validates a token passed as a string using @@ -2040,23 +1685,28 @@ Represents a JSON Web Key as defined in http://tools.ietf.org/html/rfc7517. + + + Magic numbers identifying ECDSA blob types + + - Returns a new instance of . + Returns a new instance of . A string that contains JSON Web Key parameters in JSON format. - + If 'json' is null or empty. If 'json' fails to deserialize. - Initializes an new instance of . + Initializes an new instance of . - Initializes an new instance of from a json string. + Initializes an new instance of from a json string. A string that contains JSON Web Key parameters in JSON format. If 'json' is null or empty. @@ -2108,7 +1758,7 @@ - Gets the key id of this . + Gets the key id of this . @@ -2194,7 +1844,7 @@ - Gets the key size of . + Gets the key size of . @@ -2217,77 +1867,67 @@ true if 'x5c' collection (X.509 Certificate Chain) is not empty; otherwise, false. - + - Determines whether the can compute a JWK thumbprint. + Returns the size of key in bytes - true if JWK thumbprint can be computed; otherwise, false. - https://tools.ietf.org/html/rfc7638 + Represents ecdsa curve -P256, P384, P521 + Size of the key in bytes - + - Computes a sha256 hash over the . + Returns the size of key in bits. - A JWK thumbprint. - https://tools.ietf.org/html/rfc7638 + Represents ecdsa curve -P256, P384, P512 + Size of the key in bits. - + - Returns the formatted string: GetType(), Use: 'value', Kid: 'value', Kty: 'value', InternalId: 'value'. + Returns the magic value representing the curve corresponding to the curve id. - string + Represents ecdsa curve -P256, P384, P512 + Whether the provider will create signatures or not + Uint representing the magic number - Converts a into a - Supports: converting to a from one of: , , and . + Converts a into a + Supports: , and . - Converts a into a + Converts a into a - a to convert. - a - if is null. - if is not a supported type. - Supports: , and . + a to convert. + a + if is null. + if is not a supported type. + Supports: , and . - Converts a into a + Converts a into a - a to convert. - a - if is null. + a to convert. + a + if is null. - Converts a into a + Converts a into a - a to convert. - a - if is null. - - - - Converts a into a . - - a to convert. - - true to represent the as an , - false to represent the as an , using the "x5c" parameter. - - a . - if is null. + a to convert. + a + if is null. - Converts a into a + Converts a into a - a to convert. - a - if is null. + a to convert. + a + if is null. @@ -2302,32 +1942,41 @@ - Contains a collection of that can be populated from a json string. + Contains a collection of that can be populated from a json string. provides support for http://tools.ietf.org/html/rfc7517. - Returns a new instance of . + Returns a new instance of . a string that contains JSON Web Key parameters in JSON format. - + If 'json' is null or empty. If 'json' fails to deserialize. - Initializes an new instance of . + Initializes an new instance of . - Initializes an new instance of from a json string. + Initializes an new instance of from a json string. a json string containing values. If 'json' is null or empty. If 'json' fails to deserialize. + + + Initializes an new instance of from a json string. + + a json string containing values. + jsonSerializerSettings + If 'json' is null or empty. + If 'json' fails to deserialize. + When deserializing from JSON any properties that are not defined will be placed here. @@ -2335,26 +1984,13 @@ - Gets the . + Gets the . - - - Default value for the flag that controls whether unresolved JsonWebKeys will be included in the resulting collection of method. - - - - - Flag that controls whether unresolved JsonWebKeys will be included in the resulting collection of method. - - - Returns the JsonWebKeys as a . + Returns the JsonWebKeys as a . - - To include unresolved JsonWebKeys in the resulting collection, set to false. - @@ -2367,14 +2003,16 @@ http://tools.ietf.org/html/rfc7517#section-4 + + + Log messages and codes + + The purpose of this class is to ensure that we obtain an RsaCryptoServiceProvider that supports SHA-256 signatures. If the original RsaCryptoServiceProvider doesn't support SHA-256, we create a new one using the same KeyContainer. - - There is no support for and on non-Windows platforms which makes a Windows-specific class. - @@ -2388,10 +2026,10 @@ - Initializes an new instance of . + Initializes an new instance of . - - if is null. + + if is null. @@ -2401,7 +2039,7 @@ true to perform direct System.Security.Cryptography.RSA decryption using OAEP padding (only available on a computer running Microsoft Windows XP or later) otherwise, false to use PKCS#1 v1.5 padding. decrypted bytes. - if is null or has Length == 0. + if is null or has Length == 0. @@ -2409,7 +2047,7 @@ the bytes to decrypt. decrypted bytes - if is null or Length == 0. + if is null or Length == 0. @@ -2419,7 +2057,7 @@ true to perform direct System.Security.Cryptography.RSA encryption using OAEP padding (only available on a computer running Microsoft Windows XP or later); otherwise, false to use PKCS#1 v1.5 padding. encrypted bytes. - if is null or has Length == 0. + if is null or has Length == 0. @@ -2427,7 +2065,7 @@ the bytes to encrypt. encrypted bytes. - if is null or Length == 0. + if is null or Length == 0. @@ -2435,9 +2073,9 @@ The input byte array for which to compute the hash. The hash algorithm to use to create the hash value. - The Signature for the specified data. - if is null or Length == 0. - if is null. + The Signature for the specified data. + if is null or Length == 0. + if is null. @@ -2447,20 +2085,20 @@ The hash algorithm to use to create the hash value. The signature byte array to be verified. true if the signature is valid; otherwise, false. - if is null or Length == 0. - if is null. - if is null or Length == 0. + if is null or Length == 0. + if is null. + if is null or Length == 0. - Exports rsa parameters as + Exports rsa parameters as flag to control is private parameters are included. - + - Imports rsa parameters as + Imports rsa parameters as to import. @@ -2477,15 +2115,15 @@ - Initializes a new instance of the class. + Initializes a new instance of the class. - + - Initializes a new instance of the class. + Initializes a new instance of the class. - + @@ -2506,28 +2144,14 @@ - used to initialize the key. + used to initialize the key. - instance used to initialize the key. + instance used to initialize the key. - - - Determines whether the can compute a JWK thumbprint. - - true if JWK thumbprint can be computed; otherwise, false. - https://tools.ietf.org/html/rfc7638 - - - - Computes a sha256 hash over the . - - A JWK thumbprint. - https://tools.ietf.org/html/rfc7638 - Constants for Security Algorithm. @@ -2538,53 +2162,21 @@ Base class for Security Key. - - - Default constructor - - - This must be overridden to get the size of this . + This must be overridden to get the size of this . - Gets the key id of this . + Gets the key id of this . - Gets or sets . + Gets or sets . - - - Returns the formatted string: GetType(), KeyId: 'value', InternalId: 'value'. - - string - - - - Determines whether the can compute a JWK thumbprint. - - true if JWK thumbprint can be computed; otherwise, false. - https://tools.ietf.org/html/rfc7638 - - - - Computes a sha256 hash over the . - - A JWK thumbprint. - https://tools.ietf.org/html/rfc7638 - - - - Checks if can perform the cryptographic operation specified by the with this . - - the algorithm to apply. - true if can perform the cryptographic operation sepecified by the with this . - Contains information about the keys inside the tokens. @@ -2597,33 +2189,33 @@ - This must be overridden to get the Id of this . + This must be overridden to get the Id of this . - This must be overridden to get the issuer of this . + This must be overridden to get the issuer of this . - This must be overridden to get the . + This must be overridden to get the . - This must be overridden to get or set the that signed this instance. + This must be overridden to get or set the that signed this instance. - .ValidateToken(...) can this value when a is used to successfully validate a signature. + .ValidateToken(...) can this value when a is used to successfully validate a signature. - This must be overridden to get the time when this was Valid. + This must be overridden to get the time when this was Valid. - This must be overridden to get the time when this is no longer Valid. + This must be overridden to get the time when this is no longer Valid. @@ -2636,64 +2228,39 @@ Gets or sets the value of the 'audience' claim. - - - Defines the compression algorithm that will be used to compress the JWT token payload. - - - Gets or sets the used to create a encrypted security token. + Gets or sets the used to create a encrypted security token. - Gets or sets the value of the 'expiration' claim. This value should be in UTC. + Gets or sets the value of the 'expiration' claim. - Gets or sets the issuer of this . + Gets or sets the issuer of this . - Gets or sets the time the security token was issued. This value should be in UTC. + Gets or sets the time the security token was issued. - Gets or sets the notbefore time for the security token. This value should be in UTC. - - - - - Gets or sets the which represents the claims that will be used when creating a security token. - If both and are set, the claim values in Subject will be combined with the values - in Claims. The values found in Claims take precedence over those found in Subject, so any duplicate - values will be overridden. - - - - - Gets or sets the which contains any custom header claims that need to be added to the JWT token header. - The 'alg', 'kid', 'x5t', 'enc', and 'zip' claims are added by default based on the , - , and/or provided and SHOULD NOT be included in this dictionary as this - will result in an exception being thrown. - These claims are only added to the outer header (in case of a JWE). + Gets or sets the notbefore time for the security token. - Gets or sets the used to create a security token. + Gets or sets the used to create a security token. - Gets or sets the . - If both and are set, the claim values in Subject will be combined with the values - in Claims. The values found in Claims take precedence over those found in Subject, so any duplicate - values will be overridden. + Gets or sets the . @@ -2703,21 +2270,21 @@ - Creates an instance of + Creates an instance of - Returns . + Returns . - + true if attached; otherwise, false. - Returns . + Returns . - + @@ -2739,13 +2306,6 @@ This must be overridden to get the System.Type of the SecurityToken this instance handles. - - - Indicates whether the is positioned at an element that can be read. - - An reader positioned at a start element. The reader should not be advanced. - 'true' if the token can be read. - Indicates whether the current token string can be read as a token @@ -2765,7 +2325,7 @@ Gets security token. - . + . SecurityToken instance which represents the serialized token. @@ -2780,31 +2340,23 @@ This must be overridden to serialize to XML a token of the type handled by this instance. The XML writer. - A token of type . + A token of type . - This must be overridden to deserialize token with the provided . + This must be overridden to deserialize token with the provided . - . - the current . + . + the current . SecurityToken instance which represents the serialized token. - This must be overridden to validate a token passed as a string using + This must be overridden to validate a token passed as a string using - A token of type . - the current . - The token of type that was validated. - - - - Reads and validates a token using a xmlReader and - - A pointing at the start element of the token. - Contains data and information needed for validation. - The that was validated. + A token of type . + the current . + The token of type that was validated. @@ -2813,12 +2365,12 @@ - Initializes a new instance of the class used to create and verify signatures. + Initializes a new instance of the class used to create and verify signatures. - The that will be used for signature operations. + The that will be used for signature operations. The signature algorithm to apply. - is null. - is null or empty. + is null. + is null or empty. @@ -2827,18 +2379,18 @@ - Gets or sets a user context for a . + Gets or sets a user context for a . This is null by default. This is for use by the application and not used by this SDK. - Gets or sets the that is associated with this + Gets or sets the that is associated with this - Calls and + Calls and @@ -2849,7 +2401,7 @@ - Gets the . + Gets the . @@ -2860,58 +2412,58 @@ signed bytes - Verifies that the over using the - and specified by this - are consistent. + Verifies that the over using the + and specified by this + are consistent. the bytes that were signed. signature to compare against. true if the computed signature matches the signature parameter, false otherwise. - Gets or sets a bool indicating if this is expected to create signatures. + Gets or sets a bool indicating if this is expected to create signatures. - Defines the , algorithm and digest for digital signatures. + Defines the , algorithm and digest for digital signatures. - Initializes a new instance of the class. + Initializes a new instance of the class. - that will be used for signing. - Algorithm will be set to . - the 'digest method' if needed may be implied from the algorithm. For example implies Sha256. + that will be used for signing. + Algorithm will be set to . + the 'digest method' if needed may be implied from the algorithm. For example implies Sha256. if 'key' is null. if 'algorithm' is null or empty. - Initializes a new instance of the class. + Initializes a new instance of the class. - that will be used for signing. + that will be used for signing. The signature algorithm to apply. - the 'digest method' if needed may be implied from the algorithm. For example implies Sha256. + the 'digest method' if needed may be implied from the algorithm. For example implies Sha256. if 'certificate' is null. if 'algorithm' is null or empty. - Initializes a new instance of the class. + Initializes a new instance of the class. - . + . The signature algorithm to apply. - the 'digest method' if needed may be implied from the algorithm. For example implies Sha256. + the 'digest method' if needed may be implied from the algorithm. For example implies Sha256. if 'key' is null. if 'algorithm' is null or empty. - Initializes a new instance of the class. + Initializes a new instance of the class. - . + . The signature algorithm to apply. The digest algorithm to apply. if 'key' is null. @@ -2931,20 +2483,33 @@ - Users can override the default with this property. This factory will be used for creating signature providers. + Users can override the default with this property. This factory will be used for creating signature providers. - This will have precedence over + This will have precedence over - Gets the used for signature creation or validation. + Gets the used for signature creation or validation. - Gets the key id associated with . + Gets the key id associated with . + + + Defines the default set of algorithms this library supports + + + + + Checks if an 'algorithm, key' pair is supported. + + the algorithm to check. + the . + true if 'algorithm, key' pair is supported. + Represents a symmetric security key. @@ -2952,7 +2517,7 @@ - Returns a new instance of instance. + Returns a new instance of instance. The byte array of the key. @@ -2966,95 +2531,86 @@ Gets the byte array of the key. - - - Determines whether the can compute a JWK thumbprint. - - true if JWK thumbprint can be computed; otherwise, false. - https://tools.ietf.org/html/rfc7638 - - - - Computes a sha256 hash over the . - - A JWK thumbprint. - https://tools.ietf.org/html/rfc7638 - - Provides signing and verifying operations using a and specifying an algorithm. + Provides signing and verifying operations using a and specifying an algorithm. - This is the minimum .KeySize when creating and verifying signatures. + This is the minimum .KeySize when creating and verifying signatures. - Initializes a new instance of the class that uses an to create and / or verify signatures over a array of bytes. + Initializes a new instance of the class that uses an to create and / or verify signatures over a array of bytes. - The that will be used for signature operations. + The that will be used for signature operations. The signature algorithm to use. 'key' is null. 'algorithm' is null or empty. - If and algorithm pair are not supported. - '.KeySize' is smaller than . + If and algorithm pair are not supported. + '.KeySize' is smaller than . - Initializes a new instance of the class that uses an to create and / or verify signatures over a array of bytes. + Initializes a new instance of the class that uses an to create and / or verify signatures over a array of bytes. - The that will be used for signature operations. + The that will be used for signature operations. The signature algorithm to use. - indicates if this will be used to create signatures. + indicates if this will be used to create signatures. 'key' is null. 'algorithm' is null or empty. - If and algorithm pair are not supported. - '.KeySize' is smaller than . + If and algorithm pair are not supported. + '.KeySize' is smaller than . - Gets or sets the minimum .KeySize"/>. + Gets or sets the minimum .KeySize"/>. - 'value' is smaller than . + 'value' is smaller than . - Called to obtain the byte[] needed to create a + Called to obtain the byte[] needed to create a - that will be used to obtain the byte[]. - [] that is used to populated the KeyedHashAlgorithm. + that will be used to obtain the byte[]. + [] that is used to populated the KeyedHashAlgorithm. if key is null. if a byte[] can not be obtained from SecurityKey. - and are supported. - For a .Key is returned - For a Base64UrlEncoder.DecodeBytes is called with if == JsonWebAlgorithmsKeyTypes.Octet + and are supported. + For a .Key is returned + For a Base64UrlEncoder.DecodeBytes is called with if == JsonWebAlgorithmsKeyTypes.Octet - Returns the . + Returns the . The hash algorithm to use to create the hash value. The byte array of the key. + + + Gets the for this . + + - Produces a signature over the 'input' using the and 'algorithm' passed to . + Produces a signature over the 'input' using the and 'algorithm' passed to . The bytes to sign. Signed bytes 'input' is null. 'input.Length' == 0. - has been called. - is null. This can occur if a derived type deletes it or does not create it. + has been called. + is null. This can occur if a derived type deletes it or does not create it. Sign is thread safe. - Verifies that a signature created over the 'input' matches the signature. Using and 'algorithm' passed to . + Verifies that a signature created over the 'input' matches the signature. Using and 'algorithm' passed to . The bytes to verify. signature to compare against. @@ -3063,13 +2619,13 @@ 'signature' is null. 'input.Length' == 0. 'signature.Length' == 0. - has been called. - If the internal is null. This can occur if a derived type deletes it or does not create it. + has been called. + If the internal is null. This can occur if a derived type deletes it or does not create it. Verify is thread safe. - Verifies that a signature created over the 'input' matches the signature. Using and 'algorithm' passed to . + Verifies that a signature created over the 'input' matches the signature. Using and 'algorithm' passed to . The bytes to verify. signature to compare against. @@ -3080,8 +2636,8 @@ 'input.Length' == 0. 'signature.Length' == 0. 'length < 1' - has been called. - If the internal is null. This can occur if a derived type deletes it or does not create it. + has been called. + If the internal is null. This can occur if a derived type deletes it or does not create it. @@ -3089,21 +2645,6 @@ true, if called from Dispose(), false, if invoked inside a finalizer. - - - An opaque context used to store work when working with authentication artifacts. - - - - - Instantiates a new with a default activity ID. - - - - - Instantiates a new with an activity ID. - - Defines properties shared across all security token handlers. @@ -3125,7 +2666,7 @@ Gets or sets a bool that controls if token creation will set default 'exp', 'nbf' and 'iat' if not specified. - See: for configuration. + See: for configuration. @@ -3134,50 +2675,40 @@ Used during token creation to set the default expiration ('exp'). 'value' less than 1. - - - Definition for AlgorithmValidator - - The algorithm to validate. - The that signed the . - The being validated. - required for validation. - true if the algorithm is considered valid - Definition for AudienceValidator. - The audiences found in the . - The being validated. - required for validation. + The audiences found in the . + The being validated. + required for validation. true if the audience is considered valid. Definition for IssuerSigningKeyResolver. - The representation of the token that is being validated. - The that is being validated. It may be null. + The representation of the token that is being validated. + The that is being validated. It may be null. A key identifier. It may be null. - required for validation. - A to use when validating a signature. + required for validation. + A to use when validating a signature. Definition for IssuerSigningKeyValidator. - The that signed the . - The being validated. - required for validation. + The that signed the . + The being validated. + required for validation. Definition for IssuerValidator. The issuer to validate. - The that is being validated. - required for validation. + The that is being validated. + required for validation. The issuer to use when creating the "Claim"(s) in a "ClaimsIdentity". The delegate should return a non null string that represents the 'issuer'. If null a default value will be used. @@ -3185,18 +2716,18 @@ Definition for LifetimeValidator. - The 'notBefore' time found in the . - The 'expiration' time found in the . - The being validated. - required for validation. + The 'notBefore' time found in the . + The 'expiration' time found in the . + The being validated. + required for validation. Definition for TokenReplayValidator. - The 'expiration' time found in the . - The being validated. - required for validation. + The 'expiration' time found in the . + The being validated. + required for validation. @@ -3204,42 +2735,33 @@ Definition for SignatureValidator. A securityToken with a signature. - required for validation. + required for validation. Definition for TokenReader. A securityToken with a signature. - required for validation. + required for validation. Definition for TokenDecryptionKeyResolver. - The representation of the token to be decrypted. - The to be decrypted. The runtime by default passes null. + The representation of the token to be decrypted. + The to be decrypted. The runtime by default passes null. A key identifier. It may be null. - required for validation. - A to use when decrypting the token. - - - - Definition for TypeValidator. - - The token type to validate. - The that is being validated. - required for validation. - The actual token type, that may be the same as or a different value if the token type was resolved from a different location. + required for validation. + A to use when decrypting the token. - Contains a set of parameters that are used by a when validating a . + Contains a set of parameters that are used by a when validating a . - This is the fallback authenticationtype that a will use if nothing is set. + This is the fallback authenticationtype that a will use if nothing is set. @@ -3252,44 +2774,43 @@ Default for the maximm token size. - 250 KB (kilobytes). + 2 MB (mega bytes). - Copy constructor for . + Copy constructor for . - Initializes a new instance of the class. + Initializes a new instance of the class. - Gets or sets . + Gets or sets . - - - Gets or sets a delegate used to validate the cryptographic algorithm used. - - - If set, this delegate will validate the cryptographic algorithm used and - the algorithm will not be checked against . - - Gets or sets a delegate that will be used to validate the audience. - If set, this delegate will be called to validate the 'audience', instead of normal processing. This means that no default 'audience' validation will occur. - Even if is false, this delegate will still be called. + If set, this delegate will be called to validate the 'audience' instead of normal processing. + If is false, this delegate will not be called. + + + + + Gets or sets a delegate that will be used to read the token. + + + If set, this delegate will be called to read the token instead of normal processing. - Gets or sets the AuthenticationType when creating a . + Gets or sets the AuthenticationType when creating a . If 'value' is null or whitespace. @@ -3301,55 +2822,62 @@ - Returns a new instance of with values copied from this object. + Returns a new instance of with values copied from this object. - A new object copied from this object + A new object copied from this object This is a shallow Clone. - Creates a using: - - 'NameClaimType': If NameClaimTypeRetriever is set, call delegate, else call NameClaimType. If the result is a null or empty string, use . - 'RoleClaimType': If RoleClaimTypeRetriever is set, call delegate, else call RoleClaimType. If the result is a null or empty string, use . + Creates a using: + + 'NameClaimType': If NameClaimTypeRetriever is set, call delegate, else call NameClaimType. If the result is a null or empty string, use . + 'RoleClaimType': If RoleClaimTypeRetriever is set, call delegate, else call RoleClaimType. If the result is a null or empty string, use . - A with Authentication, NameClaimType and RoleClaimType set. + A with Authentication, NameClaimType and RoleClaimType set. - Users can override the default with this property. This factory will be used for creating signature providers. + Users can override the default with this property. This factory will be used for creating signature providers. - + - Gets or sets a boolean that controls if a '/' is significant at the end of the audience. + Gets or sets the that is to be used for decryption. + + + Gets or sets a delegate that will be called to retreive a used for decryption. + + + This will be used to decrypt the token. This can be helpful when the does not contain a key identifier. + + - Gets or sets a delegate for validating the that signed the token. + Gets or sets a delegate for validating the that signed the token. - If set, this delegate will be called to validate the that signed the token, instead of normal processing. This means that no default validation will occur. - Even if is false, this delegate will still be called. + If set, this delegate will be called to validate the that signed the token, instead of normal processing. - Gets or sets the that is to be used for signature validation. + Gets or sets the that is to be used for signature validation. - Gets or sets a delegate that will be called to retrieve a used for signature validation. + Gets or sets a delegate that will be called to retrieve a used for signature validation. - This will be used to check the signature. This can be helpful when the does not contain a key identifier. + This will be used to check the signature. This can be helpful when the does not contain a key identifier. - Gets or sets an used for signature validation. + Gets or sets an used for signature validation. @@ -3357,8 +2885,8 @@ Gets or sets a delegate that will be used to validate the issuer of the token. - If set, this delegate will be called to validate the 'issuer' of the token, instead of normal processing. This means that no default 'issuer' validation will occur. - Even if is false, this delegate will still be called. + If set, this delegate will be called to validate the 'issuer' of the token, instead of normal processing. + If is false, this delegate will not be called. @@ -3366,16 +2894,34 @@ Gets or sets a delegate that will be used to validate the lifetime of the token - If set, this delegate will be called to validate the lifetime of the token, instead of normal processing. This means that no default lifetime validation will occur. - Even if is false, this delegate will still be called. + If set, this delegate will be called to validate the lifetime of the token, instead of normal processing. + If is false, this delegate will not be called. + + + + + Gets or sets a delegate that will be used to validate the token replay of the token + + + If set, this delegate will be called to validate the token replay of the token, instead of normal processing. + If is false, this delegate will not be called. - Gets or sets a that defines the . + Gets or sets a that defines the . - Controls the value returns. It will return the first where the equals . + Controls the value returns. It will return the first where the equals . + + + + + Gets or sets the that defines the . + + + Controls the results of . + Each where == will be checked for a match against the 'string' passed to . @@ -3386,12 +2932,7 @@ - Gets or sets the that contains a collection of custom key/value pairs. This allows addition of parameters that could be used in custom token validation scenarios. - - - - - Gets or sets a value indicating whether SAML tokens must have at least one AudienceRestriction. + Gets or sets the that contains a collection of custom key/value pairs. This allows addition of parameters that could be used in custom token validation scenarios. @@ -3401,18 +2942,9 @@ - Gets or sets a value indicating whether a can be considered valid if not signed. + Gets or sets a value indicating whether a can be considered valid if not signed. - - - Gets or sets the that defines the . - - - Controls the results of . - Each where == will be checked for a match against the 'string' passed to . - - Gets or sets a delegate that will be called to obtain the RoleClaimType to use when creating a ClaimsIdentity @@ -3433,64 +2965,17 @@ If set, this delegate will be called to signature of the token, instead of normal processing. - - - Gets or sets the that is to be used for decryption. - - - - - Gets or sets a delegate that will be called to retreive a used for decryption. - - - This will be used to decrypt the token. This can be helpful when the does not contain a key identifier. - - - Gets or sets the that is to be used for decrypting inbound tokens. + Gets or sets the that is to be used for decrypting inbound tokens. - - - Gets or sets a delegate that will be used to read the token. - - - If set, this delegate will be called to read the token instead of normal processing. - - - Gets or set the that store tokens that can be checked to help detect token replay. + Gets or set the that store tokens that can be checked to help detect token replay. If set, then tokens must have an expiration time or the runtime will fault. - - - Gets or sets a delegate that will be used to validate the token replay of the token - - - If set, this delegate will be called to validate the token replay of the token, instead of normal processing. This means no default token replay validation will occur. - Even if is false, this delegate will still be called. - - - - - Gets or sets a value indicating whether all should be tried during signature validation when a key is not matched to token kid or if token kid is empty. - - - - - Gets or sets a delegate that will be used to validate the type of the token. - If the token type cannot be validated, an exception MUST be thrown by the delegate. - Note: the 'type' parameter may be null if it couldn't be extracted from its usual location. - Implementations that need to resolve it from a different location can use the 'token' parameter. - - - If set, this delegate will be called to validate the 'type' of the token, instead of normal processing. - This means that no default 'type' validation will occur. - - Gets or sets a value indicating if an actor token is detected, whether it should be validated. @@ -3501,9 +2986,7 @@ Gets or sets a boolean to control if the audience will be validated during token validation. Validation of the audience, mitigates forwarding attacks. For example, a site that receives a token, could not replay it to another side. - A forwarded token would contain the audience of the original site. - This boolean only applies to default audience validation. If is set, it will be called regardless of whether this - property is true or false. + A forwarded token would contain the audience of the original site. @@ -3515,45 +2998,24 @@ It is possible that a token issued for the same audience could be from a different tenant. For example an application could accept users from contoso.onmicrosoft.com but not fabrikam.onmicrosoft.com, both valid tenants. A application that accepts tokens from fabrikam could forward them to the application that accepts tokens for contoso. - This boolean only applies to default issuer validation. If is set, it will be called regardless of whether this - property is true or false. - - - - - Gets or sets a boolean that controls if validation of the that signed the securityToken is called. - - It is possible for tokens to contain the public key needed to check the signature. For example, X509Data can be hydrated into an X509Certificate, - which can be used to validate the signature. In these cases it is important to validate the SigningKey that was used to validate the signature. - This boolean only applies to default signing key validation. If is set, it will be called regardless of whether this - property is true or false. Gets or sets a boolean to control if the lifetime will be validated during token validation. + + + + + Gets or sets a boolean that controls if validation of the that signed the securityToken is called. - - This boolean only applies to default lifetime validation. If is set, it will be called regardless of whether this - property is true or false. - + It is possible for tokens to contain the public key needed to check the signature. For example, X509Data can be hydrated into an X509Certificate, + which can be used to validate the signature. In these cases it is important to validate the SigningKey that was used to validate the signature. Gets or sets a boolean to control if the token replay will be validated during token validation. - - - This boolean only applies to default token replay validation. If is set, it will be called regardless of whether this - property is true or false. - - - - - Gets or sets the valid algorithms for cryptographic operations. - - - If set to a non-empty collection, only the algorithms listed will be considered valid. - + @@ -3562,68 +3024,17 @@ - Gets or sets the that contains valid audiences that will be used to check against the token's audience. + Gets or sets the that contains valid audiences that will be used to check against the token's audience. - Gets or sets a that represents a valid issuer that will be used to check against the token's issuer. + Gets or sets a that represents a valid issuer that will be used to check against the token's issuer. - Gets or sets the that contains valid issuers that will be used to check against the token's issuer. - - - - - Gets or sets the that contains valid types that will be used to check against the JWT header's 'typ' claim. - If this property is not set, the 'typ' header claim will not be validated and all types will be accepted. - In the case of a JWE, this property will ONLY apply to the inner token header. - - - - - Contains artifacts obtained when a SecurityToken is validated. - - - - - The created from the validated security token. - - - - - Gets or sets the that occurred during validation. - - - - - Gets or sets the issuer that was found in the token. - - - - - True if the token was successfully validated, false otherwise. - - - - - Gets or sets the that was validated. - - - - - Gets or sets the that contains call information. - - - - - Gets or sets the token type of the that was validated. - When a is registered, - the type returned by the delegate is used to populate this property. - Otherwise, the type is resolved from the token itself, if available - (e.g for a JSON Web Token, from the "typ" header). + Gets or sets the that contains valid issuers that will be used to check against the token's issuer. @@ -3690,6 +3101,18 @@ The resource array. A copy of the byte array. + + + Serializes the list of strings into string as follows: + 'str1','str2','str3' ... + + + The strings used to build a comma delimited string. + + + The single . + + Returns whether the input string is https. @@ -3701,7 +3124,7 @@ Returns whether the input uri is https. - . + . true if the input uri is https; otherwise, false. @@ -3719,134 +3142,127 @@ true if the bytes are equal, false otherwise. + + + Compares two byte arrays for equality. Hash size is fixed normally it is 32 bytes. + The attempt here is to take the same time if an attacker shortens the signature OR changes some of the signed contents. + + + One set of bytes to compare. + + + The other set of bytes to compare with. + + length of array to check + + true if the bytes are equal, false otherwise. + + AudienceValidator - - - Validates if a given algorithm for a is valid. - - The algorithm to be validated. - The that signed the . - The being validated. - required for validation. - - Determines if the audiences found in a are valid. + Determines if the audiences found in a are valid. - The audiences found in the . - The being validated. - required for validation. + The audiences found in the . + The being validated. + required for validation. If 'vaidationParameters' is null. - If 'audiences' is null and is true. - If is null or whitespace and is null. - If none of the 'audiences' matched either or one of . + If 'audiences' is null and is true. + If is null or whitespace and is null. + If none of the 'audiences' matched either or one of . An EXACT match is required. - Determines if an issuer found in a is valid. + Determines if an issuer found in a is valid. The issuer to validate - The that is being validated. - required for validation. + The that is being validated. + required for validation. The issuer to use when creating the "Claim"(s) in a "ClaimsIdentity". If 'vaidationParameters' is null. - If 'issuer' is null or whitespace and is true. - If is null or whitespace and is null. - If 'issuer' failed to matched either or one of . + If 'issuer' is null or whitespace and is true. + If is null or whitespace and is null. + If 'issuer' failed to matched either or one of . An EXACT match is required. - Validates the that signed a . + Validates the that signed a . - The that signed the . - The being validated. - required for validation. + The that signed the . + The being validated. + required for validation. if 'securityKey' is null and ValidateIssuerSigningKey is true. if 'securityToken' is null and ValidateIssuerSigningKey is true. if 'vaidationParameters' is null. - Validates the lifetime of a . + Validates the lifetime of a . - The 'notBefore' time found in the . - The 'expiration' time found in the . - The being validated. - required for validation. + The 'notBefore' time found in the . + The 'expiration' time found in the . + The being validated. + required for validation. If 'vaidationParameters' is null. - If 'expires.HasValue' is false and is true. + If 'expires.HasValue' is false and is true. If 'notBefore' is > 'expires'. If 'notBefore' is > DateTime.UtcNow. If 'expires' is < DateTime.UtcNow. - All time comparisons apply . + All time comparisons apply . Validates if a token has been replayed. When does the security token expire. - The being validated. - required for validation. + The being validated. + required for validation. If 'securityToken' is null or whitespace. If 'validationParameters' is null or whitespace. - If is not null and expirationTime.HasValue is false. When a TokenReplayCache is set, tokens require an expiration time. + If is not null and expirationTime.HasValue is false. When a TokenReplayCache is set, tokens require an expiration time. If the 'securityToken' is found in the cache. - If the 'securityToken' could not be added to the . + If the 'securityToken' could not be added to the . Validates if a token has been replayed. - The being validated. + The being validated. When does the security token expire. - required for validation. + required for validation. If 'securityToken' is null or whitespace. If 'validationParameters' is null or whitespace. - If is not null and expirationTime.HasValue is false. When a TokenReplayCache is set, tokens require an expiration time. + If is not null and expirationTime.HasValue is false. When a TokenReplayCache is set, tokens require an expiration time. If the 'securityToken' is found in the cache. - If the 'securityToken' could not be added to the . - - - - Validates the type of the token. - - The token type or null if it couldn't be resolved (e.g from the 'typ' header for a JWT). - The that is being validated. - required for validation. - If is null. - If is null. - If is null or whitespace and is not null. - If failed to match . - An EXACT match is required. (case sensitive) is used for comparing against . - The actual token type, that may be the same as or a different value if the token type was resolved from a different location. + If the 'securityToken' could not be added to the . - An designed to construct based on a x509 certificate. + An designed to construct based on a x509 certificate. - Designed to construct based on a x509 certificate. + Designed to construct based on a x509 certificate. - A + A - will be used as the key wrap algorithm - will be used as the data encryption algorithm + will be used as the key wrap algorithm + will be used as the data encryption algorithm if 'certificate' is null. - Designed to construct based on the x509 certificate, a key wrap algorithm, and data encryption algorithm. + Designed to construct based on the x509 certificate, a key wrap algorithm, and data encryption algorithm. - A + A A key wrap algorithm Data encryption algorithm if 'certificate' is null. @@ -3855,29 +3271,19 @@ - Gets the used by this instance. + Gets the used by this instance. - An that is backed by a + Security key that allows access to cert - Instantiates a using a + Instantiates a using a - The to use. - if is null. - - - - Instantiates a using a . - - The to use. - The value to set for the KeyId - if is null. - if is null or empty. + The cert to use. @@ -3886,17 +3292,17 @@ - Gets the X5t of this . + Gets the X5t of this . - Returns the private key from the . + Returns the private key from the . - Gets the public key from the . + Gets the public key from the . @@ -3913,23 +3319,9 @@ - Gets the . + Gets the . - - - Determines whether the can compute a JWK thumbprint. - - true if JWK thumbprint can be computed; otherwise, false. - https://tools.ietf.org/html/rfc7638 - - - - Computes a sha256 hash over the . - - A JWK thumbprint. - https://tools.ietf.org/html/rfc7638 - Returns a bool indicating if this key is equivalent to another key. @@ -3944,41 +3336,32 @@ - Defines the , algorithm and digest for digital signatures. + Defines the , algorithm and digest for digital signatures. - Initializes a new instance of the class. + Initializes a new instance of the class. - that will be used for signing. - Algorithm will be set to . - the 'digest method' if needed may be implied from the algorithm. For example implies Sha256. + that will be used for signing. + Algorithm will be set to . + the 'digest method' if needed may be implied from the algorithm. For example implies Sha256. if 'certificate' is null. - Initializes a new instance of the class. + Initializes a new instance of the class. - A that will be used for signing. + A that will be used for signing. The signature algorithm to apply. - the 'digest method' if needed may be implied from the algorithm. For example implies Sha256. + the 'digest method' if needed may be implied from the algorithm. For example implies Sha256. if 'certificate' is null. if 'algorithm' is null or empty. - Gets the used by this instance. + Gets the used by this instance. - - - Returns the responsible for binding operations performed on this object. - - The expression tree representation of the runtime value. - - The to bind this object. - - diff --git a/Bin/System.IdentityModel.Tokens.Jwt.dll b/Bin/System.IdentityModel.Tokens.Jwt.dll index f48948798..bb9aec487 100644 Binary files a/Bin/System.IdentityModel.Tokens.Jwt.dll and b/Bin/System.IdentityModel.Tokens.Jwt.dll differ diff --git a/Bin/System.IdentityModel.Tokens.Jwt.dll.refresh b/Bin/System.IdentityModel.Tokens.Jwt.dll.refresh index fceeba7d1..e775ba7e5 100644 Binary files a/Bin/System.IdentityModel.Tokens.Jwt.dll.refresh and b/Bin/System.IdentityModel.Tokens.Jwt.dll.refresh differ diff --git a/Bin/System.IdentityModel.Tokens.Jwt.xml b/Bin/System.IdentityModel.Tokens.Jwt.xml index 538345c27..808377f8e 100644 --- a/Bin/System.IdentityModel.Tokens.Jwt.xml +++ b/Bin/System.IdentityModel.Tokens.Jwt.xml @@ -262,12 +262,6 @@ Gets the thumbprint of the certificate used to sign the token - - - Gets the 'value' of the 'zip' claim { zip, 'value' }. - - If the 'zip' claim is not found, null is returned. - Deserializes Base64UrlEncoded JSON into a instance. @@ -394,52 +388,26 @@ Initializes a new instance of the class with claims added for each parameter specified. Default string comparer . - If this value is not null, a { iss, 'issuer' } claim will be added, overwriting any 'iss' claim in 'claims' if present. - If this value is not null, a { aud, 'audience' } claim will be added, appending to any 'aud' claims in 'claims' if present. + If this value is not null, a { iss, 'issuer' } claim will be added. + If this value is not null, a { aud, 'audience' } claim will be added If this value is not null then for each a { 'Claim.Type', 'Claim.Value' } is added. If duplicate claims are found then a { 'Claim.Type', List<object> } will be created to contain the duplicate values. - If notbefore.HasValue a { nbf, 'value' } claim is added, overwriting any 'nbf' claim in 'claims' if present. - If expires.HasValue a { exp, 'value' } claim is added, overwriting any 'exp' claim in 'claims' if present. + If notbefore.HasValue is 'true' a { nbf, 'value' } claim is added. + If expires.HasValue is 'true' a { exp, 'value' } claim is added. Initializes a new instance of the class with claims added for each parameter specified. Default string comparer . - If this value is not null, a { iss, 'issuer' } claim will be added, overwriting any 'iss' claim in 'claims' if present. - If this value is not null, a { aud, 'audience' } claim will be added, appending to any 'aud' claims in 'claims' if present. + If this value is not null, a { iss, 'issuer' } claim will be added. + If this value is not null, a { aud, 'audience' } claim will be added If this value is not null then for each a { 'Claim.Type', 'Claim.Value' } is added. If duplicate claims are found then a { 'Claim.Type', List<object> } will be created to contain the duplicate values. - If notbefore.HasValue a { nbf, 'value' } claim is added, overwriting any 'nbf' claim in 'claims' if present. - If expires.HasValue a { exp, 'value' } claim is added, overwriting any 'exp' claim in 'claims' if present. - If issuedAt.HasValue is 'true' a { iat, 'value' } claim is added, overwriting any 'iat' claim in 'claims' if present. + If notbefore.HasValue is 'true' a { nbf, 'value' } claim is added. + If expires.HasValue is 'true' a { exp, 'value' } claim is added. + If issuedAt.HasValue is 'true' a { iat, 'value' } claim is added. Comparison is set to - The 4 parameters: 'issuer', 'audience', 'notBefore', 'expires' take precedence over (s) in 'claims'. The values will be overridden. + The 4 parameters: 'issuer', 'audience', 'notBefore', 'expires' take precednece over (s) in 'claims'. The values in 'claims' will be overridden. If 'expires' <= 'notbefore'. - - - Initializes a new instance of the class with claims added for each parameter specified. Default string comparer . - - If this value is not null, a { iss, 'issuer' } claim will be added, overwriting any 'iss' claim in 'claims' and 'claimCollection' if present. - If this value is not null, a { aud, 'audience' } claim will be added, appending to any 'aud' claims in 'claims' or 'claimCollection' if present. - If this value is not null then for each a { 'Claim.Type', 'Claim.Value' } is added. If duplicate claims are found then a { 'Claim.Type', List<object> } will be created to contain the duplicate values. - If both and are not null then the values in claims will be combined with the values in claimsCollection. The values found in claimCollection take precedence over those found in claims, so any duplicate - values will be overridden. - If notbefore.HasValue a { nbf, 'value' } claim is added, overwriting any 'nbf' claim in 'claims' and 'claimcollection' if present. - If expires.HasValue a { exp, 'value' } claim is added, overwriting any 'exp' claim in 'claims' and 'claimcollection' if present. - If issuedAt.HasValue is 'true' a { iat, 'value' } claim is added, overwriting any 'iat' claim in 'claims' and 'claimcollection' if present. - Comparison is set to - The 4 parameters: 'issuer', 'audience', 'notBefore', 'expires' take precedence over (s) in 'claims' and 'claimcollection'. The values will be overridden. - If 'expires' <= 'notbefore'. - - - - Adds Nbf, Exp, Iat, Iss and Aud claims to payload - - If this value is not null, a { iss, 'issuer' } claim will be added, overwriting any 'iss' claim in instance. - If this value is not null, a { aud, 'audience' } claim will be added, appending to any 'aud' claims in instance. - If notbefore.HasValue a { nbf, 'value' } claim is added, overwriting any 'nbf' claim in instance. - If expires.HasValue a { exp, 'value' } claim is added, overwriting any 'exp' claim in instance. - If issuedAt.HasValue is 'true' a { iat, 'value' } claim is added, overwriting any 'iat' claim in instance. - Gets the 'value' of the 'actor' claim { actort, 'value' }. @@ -536,12 +504,6 @@ If the 'expiration' claim is not found, then is returned. - - - Gets the 'value' of the 'issued at' claim { iat, 'value' } converted to a assuming 'value' is seconds since UnixEpoch (UTC 1970-01-01T0:0:0Z). - - If the 'issued at' claim is not found, then is returned. - Gets a for each JSON { name, value }. @@ -564,14 +526,7 @@ For each a JSON pair { 'Claim.Type', 'Claim.Value' } is added. If duplicate claims are found then a { 'Claim.Type', List<object> } will be created to contain the duplicate values. Any in the that is null, will be ignored. - is null. - - - - Adds claims from dictionary. - - A dictionary of claims. - If a key is already present in target dictionary, its value is overridden by the value of the key in claimsCollection. + 'claims' is null. @@ -622,6 +577,7 @@ + http://tools.ietf.org/html/rfc7519#section-4 @@ -651,12 +607,12 @@ - https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims + http://tools.ietf.org/html/rfc7519#section-4 - https://openid.net/specs/openid-connect-core-1_0.html#HybridIDToken + http://tools.ietf.org/html/rfc7519#section-4 @@ -666,7 +622,7 @@ - https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims + http://tools.ietf.org/html/rfc7519#section-4 @@ -676,17 +632,17 @@ - https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims + http://tools.ietf.org/html/rfc7519#section-4 - https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims + http://tools.ietf.org/html/rfc7519#section-4 - https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims + http://tools.ietf.org/html/rfc7519#section-4 @@ -706,11 +662,12 @@ + http://tools.ietf.org/html/rfc7519#section-4 - https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest + http://tools.ietf.org/html/rfc7519#section-4 @@ -720,6 +677,7 @@ + http://tools.ietf.org/html/rfc7519#section-4 @@ -734,15 +692,17 @@ - http://tools.ietf.org/html/rfc7519#section-5 + http://tools.ietf.org/html/rfc7519#section-4 + http://tools.ietf.org/html/rfc7519#section-4 + http://tools.ietf.org/html/rfc7519#section-4 @@ -808,11 +768,11 @@ Initializes a new instance of the class specifying optional parameters. - If this value is not null, a { iss, 'issuer' } claim will be added, overwriting any 'iss' claim in 'claims' if present. - If this value is not null, a { aud, 'audience' } claim will be added, appending to any 'aud' claims in 'claims' if present. + If this value is not null, a { iss, 'issuer' } claim will be added. + If this value is not null, a { aud, 'audience' } claim will be added If this value is not null then for each a { 'Claim.Type', 'Claim.Value' } is added. If duplicate claims are found then a { 'Claim.Type', List<object> } will be created to contain the duplicate values. - If expires.HasValue a { exp, 'value' } claim is added, overwriting any 'exp' claim in 'claims' if present. - If notbefore.HasValue a { nbf, 'value' } claim is added, overwriting any 'nbf' claim in 'claims' if present. + If expires.HasValue a { exp, 'value' } claim is added. + If notbefore.HasValue a { nbf, 'value' } claim is added. The that will be used to sign the . See for details pertaining to the Header Parameter(s). If 'expires' <= 'notbefore'. @@ -866,7 +826,7 @@ Gets the associated with this instance. - Note that if this JWT is nested ( != null, this property represents the payload of the most inner token. + Note that if this JWT is nested ( != null, this property represnts the payload of the most inner token. This property can be null if the content type of the most inner token is unrecognized, in that case the content of the token is the string returned by PlainText property. @@ -977,12 +937,6 @@ If the 'expiration' claim is not found, then is returned. - - - Gets the 'value' of the 'issued at' claim { iat, 'value' } converted to a assuming 'value' is seconds since UnixEpoch (UTC 1970-01-01T0:0:0Z). - - If the 'issued at' claim is not found, then is returned. - Serializes the and @@ -1185,27 +1139,6 @@ A Base64UrlEncoded string in 'Compact Serialization Format'. If 'expires' <= 'notBefore'. - - - Creates a JWT in 'Compact Serialization Format'. - - The issuer of the token. - The audience for this token. - The source of the (s) for this token. - Translated into 'epoch time' and assigned to 'nbf'. - Translated into 'epoch time' and assigned to 'exp'. - Translated into 'epoch time' and assigned to 'iat'. - Contains cryptographic material for signing. - Contains cryptographic material for encrypting. - A collection of (key,value) pairs representing (s) for this token. - If is not null, then a claim { actort, 'value' } will be added to the payload. for details on how the value is created. - See for details on how the HeaderParameters are added to the header. - See for details on how the values are added to the payload. - Each in the will map by applying . Modifying could change the outbound JWT. - - A Base64UrlEncoded string in 'Compact Serialization Format'. - If 'expires' <= 'notBefore'. - Creates a Json Web Token (JWT). @@ -1236,30 +1169,6 @@ A . If 'expires' <= 'notBefore'. - - - Creates a - - The issuer of the token. - The audience for this token. - The source of the (s) for this token. - The notbefore time for this token. - The expiration time for this token. - The issue time for this token. - Contains cryptographic material for generating a signature. - Contains cryptographic material for encrypting the token. - A collection of (key,value) pairs representing (s) for this token. - If is not null, then a claim { actort, 'value' } will be added to the payload. for details on how the value is created. - See for details on how the HeaderParameters are added to the header. - See for details on how the values are added to the payload. - Each on the added will have translated according to the mapping found in - . Adding and removing to will affect the name component of the Json claim. - is used to sign . - is used to encrypt or . - - A . - If 'expires' <= 'notBefore'. - Creates a @@ -1295,7 +1204,7 @@ A 'JSON Web Token' (JWT) in JWS or JWE Compact Serialization Format. A 'token' is null or empty. - 'token.Length' is greater than . + 'token.Length' $gt; . If the 'token' is in JWE Compact Serialization format, only the protected header will be deserialized. This method is unable to decrypt the payload. Use to obtain the payload. @@ -1330,7 +1239,7 @@ The that was validated. is null or whitespace. is null. - .Length is greater than . + .Length $gt; MamimumTokenSizeInBytes. does not have 3 or 5 parts. returns false. was a JWE was not able to be decrypted. @@ -1377,7 +1286,7 @@ if is set and is not set. A JWE or JWS in 'Compact Serialization Format'. - + Obtains a and validates the signature. @@ -1385,7 +1294,6 @@ Signature to compare against. to use. Crypto algorithm to use. - The being validated. Priority will be given to over . 'true' if signature is valid. diff --git a/Compras/Compras.aspx.vb b/Compras/Compras.aspx.vb index abbd281cd..9781db9cf 100644 --- a/Compras/Compras.aspx.vb +++ b/Compras/Compras.aspx.vb @@ -18532,7 +18532,7 @@ Partial Class Compras_Compras RegistraScript("$('#ModalNCInv').modal('show');", "ModalNCInv") Else If ChkNCInvNC.Checked Then - Alert("Ninguna de las facturas seleccionadas cuenta con productos pendientes de darles entrada.", TipoMensaje.MsgAdvertencia) + Alert("Niguna de las facturas seleccionadas cuenta con productos pendientes de darles entrada.", TipoMensaje.MsgAdvertencia) ChkNCInvNC.Checked = False UpChkNCInvNC.Update() Exit Sub diff --git a/Contabilidad/RegPrePolizaS.aspx.vb b/Contabilidad/RegPrePolizaS.aspx.vb index c6acb1799..4bcbca048 100644 --- a/Contabilidad/RegPrePolizaS.aspx.vb +++ b/Contabilidad/RegPrePolizaS.aspx.vb @@ -533,13 +533,7 @@ Partial Class ContabilidadC_RegPrePolizaS End Sub Private Sub CargaCuentasContables() - Dim Conta As New ClsContabilidad() - - If Conta.GetCuentas(-1, "-1", 1, UsuarioActual.Empresa.CveEmpresa) Then - DtCuentasContables = Conta.DtResultados - End If - Conta.Dispose() - DdlCtaContable.DataSource = DtCuentasContables + DdlCtaContable.DataSource = Session("DtCuentas") DdlCtaContable.DataBind() DdlCtaContable.Items.Insert(0, New ListItem("Sin Asignar", "0")) End Sub @@ -1050,12 +1044,7 @@ Partial Class ContabilidadC_RegPrePolizaS DdlTipoGastoE.Items.Insert(0, New ListItem("Sin Asignar", "0")) End Sub Private Sub CargaCtaContableE() - Dim Conta As New ClsContabilidad() - - If Conta.GetCuentas(-1, "-1", 1, UsuarioActual.Empresa.CveEmpresa) Then - DdlCtaContableE.DataSource = Conta.DtResultados - End If - Conta.Dispose() + DdlCtaContableE.DataSource = Session("DtCuentas") DdlCtaContableE.DataBind() DdlCtaContableE.Items.Insert(0, New ListItem("Sin Asignar", "0")) End Sub diff --git a/Contabilidad2/CatCuentas.aspx.vb b/Contabilidad2/CatCuentas.aspx.vb index 37156d77a..1f9f6f9d5 100644 --- a/Contabilidad2/CatCuentas.aspx.vb +++ b/Contabilidad2/CatCuentas.aspx.vb @@ -529,7 +529,7 @@ Partial Class Contabilidad2_CatCuentas Case 3 pnlOpcion3.Visible = True If DdlClasificacion.Items.Count < 2 Then - DdlClasificacion.DataSource = GlobalDTClasificaciones(UsuarioActual.CveEmpresa) + DdlClasificacion.DataSource = GlobalDTClasificaciones(UsuarioActual.CveEmpresa, UsoClasificacion:=1) DdlClasificacion.DataBind() End If Case 4 diff --git a/Inventarios/EntregaAlmacen.aspx.vb b/Inventarios/EntregaAlmacen.aspx.vb index b1dd0cbef..6d6e99153 100644 --- a/Inventarios/EntregaAlmacen.aspx.vb +++ b/Inventarios/EntregaAlmacen.aspx.vb @@ -855,7 +855,7 @@ Partial Class Inventarios_EntregaAlmacen If CBool(e.Row.DBCampo("AplicaSerie")) Then e.Row.FCButton("BtnSerie").Visible = True - 'e.Row.FCButton("BtnSerie").Text = If(e.Row.DBCampo("Inv_CveMetodoInventario").ToString = "5", "Serie", "Lote-Batch") + e.Row.FCButton("BtnSerie").Text = If(e.Row.DBCampo("Inv_CveMetodoInventario").ToString = "5", "Serie", "Lote-Batch") e.Row.FCButton("BtnSerie").CommandArgument = String.Format("{0}°{1}°{2}°{3}°{4}°{5}", e.Row.DBCampo("CvePS"), e.Row.DBCampo("CveUM"), e.Row.DBCampo("PS"), e.Row.DBCampo("CantidadF"), e.Row.DBCampo("Consec"), e.Row.DBCampo("Inv_CveMetodoInventario")) e.Row.FCTextBox("TbCantidadF").Enabled = False e.Row.FCCheckBox("cbInv").Enabled = False @@ -926,7 +926,7 @@ Partial Class Inventarios_EntregaAlmacen e.Row.FCTextBox("TbCantidadF").Text = "0" 'NO BLOQUEA PARA ROL AD If UsuarioActual.CveRol = 1 Then - If CBool(e.Row.DBCampo("AplicaSerie")) Then + If e.Row.DBCampo("Inv_CveMetodoInventario").Contiene("5", "6") Then e.Row.FCTextBox("TbCantidadF").Enabled = False Else e.Row.FCTextBox("TbCantidadF").Text = e.Row.DBCampo("CantidadF").ToDecimal.ToString("#,##0.######") diff --git a/Ventas/CatClasificaciones.aspx b/Ventas/CatClasificaciones.aspx index 1d81ea537..d8fbfc59d 100644 --- a/Ventas/CatClasificaciones.aspx +++ b/Ventas/CatClasificaciones.aspx @@ -253,7 +253,7 @@
- +
diff --git a/Ventas/Clientes.aspx b/Ventas/Clientes.aspx index 2b8731800..428706e48 100644 --- a/Ventas/Clientes.aspx +++ b/Ventas/Clientes.aspx @@ -1007,126 +1007,114 @@
-
-
- - - - - - +
+ +
+ + + + +
-
-
- -
- - - - -
+
+ +
+ + + + +
+
-
- -
- - - - -
+
+ +
+ + + + +
+
-
- -
- - - - -
+
+ +
+ + + + +
+
+
+ +
+ + + -
- -
- - - - - -
+
+
-
- -
- - - +
+ +
+ + + - -
+
+
-
- -
- - - - -
+ +
+ +
+ + + + +
+
+
+ +
+ + + - - - -
- -
- - - - - -
+
-
- -
- - - +
+
+ +
+ + + - -
-
-
- -
- - - - - -
+
- <%--
+
@@ -1151,7 +1139,7 @@
-
--%> +
diff --git a/Ventas/Clientes.aspx.vb b/Ventas/Clientes.aspx.vb index 2dff697f1..59800645b 100644 --- a/Ventas/Clientes.aspx.vb +++ b/Ventas/Clientes.aspx.vb @@ -790,8 +790,8 @@ Partial Class Clientes If Request("ATI") IsNot Nothing AndAlso IsNumeric(Request("ATI")) Then Tab.ActiveTabIndex = Request("ATI").ToEntero - End If - ' CargaCuentasyConceptos() + End If + CargaCuentasyConceptos() Else 'Configuración de Modalidad Insert @@ -1079,15 +1079,15 @@ Partial Class Clientes DdlMonedaExtranjeraAnticipos.Attributes.Add("onclick", "CargaCuentas(9);") End Sub - 'Private Sub CargaCuentasyConceptos() - ' Dim ObjConta As New ClsContabilidad - ' If ObjConta.GetCuentasyConceptos(CveCliente) Then - ' GvCuentasContable.DataSource = ObjConta.DtResultados - ' End If - ' ObjConta.Dispose() - ' GvCuentasContable.DataBind() - ' UpCuentaConceptos.Update() - 'End Sub + Private Sub CargaCuentasyConceptos() + Dim ObjConta As New ClsContabilidad + If ObjConta.GetCuentasyConceptos(CveCliente) Then + GvCuentasContable.DataSource = ObjConta.DtResultados + End If + ObjConta.Dispose() + GvCuentasContable.DataBind() + UpCuentaConceptos.Update() + End Sub Protected Sub BtnCargarCuentas_Click(sender As Object, e As EventArgs) Handles BtnCargarCuentas.Click If UsuarioActual.Empresa.ServerContPAQi = "" Then Exit Sub @@ -1540,18 +1540,14 @@ Partial Class Clientes HDLG.Value = If(ObjClientes.DtResultados(0)("LG").ToString = "", "0", ObjClientes.DtResultados(0)("LG").ToString) DdlPais.SelectedValueExist(ObjClientes.CvePais) - CargaEstado() - - - + CargaEstado() + + CargaEstados(ObjClientes.DtResultados(0)("SATPais").ToString) DdlSATPais.SelectedValueExist(ObjClientes.DtResultados(0)("SATPais").ToString) DdlEstadoSAT.SelectedValueExist(ObjClientes.CveSATEstado) - ''carga las cuentas contables con nuevo modelo - CargaCuentasConceptos(CveCliente) - If DdlPais.SelectedValue.Contiene("151", "66", "40") Then DdlEstado.Visible = True @@ -1745,25 +1741,6 @@ Partial Class Clientes Return Retorno End Function - - Private Sub CargaCuentasConceptos(CveCliente As Integer) - If UsuarioActual.Empresa.Funcionalidad(300) = "1" Then - - divCuentas.Visible = True - divCuentaContp.Visible = False - Dim Conta As New ClsContabilidad - If Conta.GetCuentasConceptos(6, UsuarioActual.CveEmpresa, CveCliente:=CveCliente) Then - GvCtas.DataSource = Conta.DtResultados - End If - - Conta.Dispose() - GvCtas.DataBind() - Else - divCuentas.Visible = False - divCuentaContp.Visible = True - End If - - End Sub Private Sub CargaHistorial(Optional SelectTop As Integer = 21, Optional CveClienteSucursal As Integer = -1) Dim ObjClientes As New ClsClientes() If ObjClientes.GetHistorialVentas(CveCliente, SelectTop, CveClienteSucursal:=DdlSucursalCliente.SelectedValue.ToEntero) Then diff --git a/Ventas/Ventas.aspx.vb b/Ventas/Ventas.aspx.vb index 129a6a39f..122b2b6c1 100644 --- a/Ventas/Ventas.aspx.vb +++ b/Ventas/Ventas.aspx.vb @@ -14534,10 +14534,7 @@ Partial Class Ventas End Sub Private Sub RecargaSucursalPartidas() Dim CveSubProyecto As Integer = DdlSubProyectoDatos.SelectedValue.ToEntero() - Dim SubProyecto As String = "" - If CveSubProyecto > 0 Then - SubProyecto = DdlSubProyectoDatos.SelectedItem.Text - End If + Dim SubProyecto As String = DdlSubProyectoDatos.SelectedItem.Text If TmpDT IsNot Nothing AndAlso TmpDT.Rows.Count > 0 Then For Each Row As DataRow In TmpDT.Rows diff --git a/vwd.webinfo b/vwd.webinfo index a5848e16b..9d2d954bf 100644 --- a/vwd.webinfo +++ b/vwd.webinfo @@ -106,8 +106,6 @@ - -