diff options
| author | Peter Dettman <peter.dettman@bouncycastle.org> | 2023-04-12 19:47:03 +0700 |
|---|---|---|
| committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2023-04-12 19:47:03 +0700 |
| commit | 05a2153fc8cee0f896a8807c0f5decfdb9c06aee (patch) | |
| tree | 539fca5b99d32c658f8496dfb5055e7d1edbce85 /crypto/src | |
| parent | X509: Refactor stream calculator usage (diff) | |
| download | BouncyCastle.NET-ed25519-05a2153fc8cee0f896a8807c0f5decfdb9c06aee.tar.xz | |
Use KeyParameter.KeyLength
Diffstat (limited to 'crypto/src')
| -rw-r--r-- | crypto/src/cms/EnvelopedDataHelper.cs | 2 | ||||
| -rw-r--r-- | crypto/src/cms/KEKRecipientInfoGenerator.cs | 4 | ||||
| -rw-r--r-- | crypto/src/crypto/modes/ChaCha20Poly1305.cs | 2 | ||||
| -rw-r--r-- | crypto/src/crypto/modes/GcmSivBlockCipher.cs | 2 | ||||
| -rw-r--r-- | crypto/src/crypto/operators/Asn1CipherBuilder.cs | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/crypto/src/cms/EnvelopedDataHelper.cs b/crypto/src/cms/EnvelopedDataHelper.cs index 616048297..9dcfe033b 100644 --- a/crypto/src/cms/EnvelopedDataHelper.cs +++ b/crypto/src/cms/EnvelopedDataHelper.cs @@ -79,7 +79,7 @@ namespace Org.BouncyCastle.Cms public AlgorithmIdentifier GenerateEncryptionAlgID(DerObjectIdentifier encryptionOID, KeyParameter encKey, SecureRandom random) { - return AlgorithmIdentifierFactory.GenerateEncryptionAlgID(encryptionOID, encKey.GetKey().Length * 8, random); + return AlgorithmIdentifierFactory.GenerateEncryptionAlgID(encryptionOID, encKey.KeyLength * 8, random); } public CipherKeyGenerator CreateKeyGenerator(DerObjectIdentifier algorithm, SecureRandom random) diff --git a/crypto/src/cms/KEKRecipientInfoGenerator.cs b/crypto/src/cms/KEKRecipientInfoGenerator.cs index d8075d450..2b8524dc6 100644 --- a/crypto/src/cms/KEKRecipientInfoGenerator.cs +++ b/crypto/src/cms/KEKRecipientInfoGenerator.cs @@ -78,7 +78,7 @@ namespace Org.BouncyCastle.Cms } else if (Platform.StartsWith(algorithm, "AES")) { - int length = key.GetKey().Length * 8; + int length = key.KeyLength * 8; DerObjectIdentifier wrapOid; if (length == 128) @@ -107,7 +107,7 @@ namespace Org.BouncyCastle.Cms } else if (Platform.StartsWith(algorithm, "CAMELLIA")) { - int length = key.GetKey().Length * 8; + int length = key.KeyLength * 8; DerObjectIdentifier wrapOid; if (length == 128) diff --git a/crypto/src/crypto/modes/ChaCha20Poly1305.cs b/crypto/src/crypto/modes/ChaCha20Poly1305.cs index dc56f4184..7e2348932 100644 --- a/crypto/src/crypto/modes/ChaCha20Poly1305.cs +++ b/crypto/src/crypto/modes/ChaCha20Poly1305.cs @@ -112,7 +112,7 @@ namespace Org.BouncyCastle.Crypto.Modes } else { - if (KeySize != initKeyParam.GetKey().Length) + if (KeySize != initKeyParam.KeyLength) throw new ArgumentException("Key must be 256 bits"); } diff --git a/crypto/src/crypto/modes/GcmSivBlockCipher.cs b/crypto/src/crypto/modes/GcmSivBlockCipher.cs index a4fcdd759..e11411433 100644 --- a/crypto/src/crypto/modes/GcmSivBlockCipher.cs +++ b/crypto/src/crypto/modes/GcmSivBlockCipher.cs @@ -851,7 +851,7 @@ namespace Org.BouncyCastle.Crypto.Modes byte[] myIn = new byte[BUFLEN]; byte[] myOut = new byte[BUFLEN]; byte[] myResult = new byte[BUFLEN]; - byte[] myEncKey = new byte[pKey.GetKey().Length]; + byte[] myEncKey = new byte[pKey.KeyLength]; /* Prepare for encryption */ Array.Copy(theNonce, 0, myIn, BUFLEN - NONCELEN, NONCELEN); diff --git a/crypto/src/crypto/operators/Asn1CipherBuilder.cs b/crypto/src/crypto/operators/Asn1CipherBuilder.cs index b151dfcc2..4f58ef58a 100644 --- a/crypto/src/crypto/operators/Asn1CipherBuilder.cs +++ b/crypto/src/crypto/operators/Asn1CipherBuilder.cs @@ -23,7 +23,7 @@ namespace Org.BouncyCastle.Crypto.Operators CipherKeyGenerator keyGen = CipherKeyGeneratorFactory.CreateKeyGenerator(encryptionOID, random); encKey = new KeyParameter(keyGen.GenerateKey()); - algorithmIdentifier = AlgorithmIdentifierFactory.GenerateEncryptionAlgID(encryptionOID, encKey.GetKey().Length * 8, random); + algorithmIdentifier = AlgorithmIdentifierFactory.GenerateEncryptionAlgID(encryptionOID, encKey.KeyLength * 8, random); } public object AlgorithmDetails |