diff options
| author | David Hook <dgh@cryptoworkshop.com> | 2021-05-24 08:36:47 +1000 |
|---|---|---|
| committer | David Hook <dgh@cryptoworkshop.com> | 2021-05-24 08:36:47 +1000 |
| commit | a61de1f919999be24f88248e10e46ff2151bef8b (patch) | |
| tree | 572147c91b2de098481763aefee7635a432903ab | |
| parent | Use portable Stream close (diff) | |
| parent | Merge branch 'master' of https://github.com/fabiogermann/bc-csharp into fabio... (diff) | |
| download | BouncyCastle.NET-ed25519-a61de1f919999be24f88248e10e46ff2151bef8b.tar.xz | |
Merge branch 'fabiogermann-master'
| -rw-r--r-- | crypto/src/security/CipherUtilities.cs | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/crypto/src/security/CipherUtilities.cs b/crypto/src/security/CipherUtilities.cs index fb2a31a56..79e3de794 100644 --- a/crypto/src/security/CipherUtilities.cs +++ b/crypto/src/security/CipherUtilities.cs @@ -89,6 +89,10 @@ namespace Org.BouncyCastle.Security OAEPWITHSHA_224ANDMGF1PADDING, OAEPWITHSHA256ANDMGF1PADDING, OAEPWITHSHA_256ANDMGF1PADDING, + OAEPWITHSHA256ANDMGF1WITHSHA256PADDING, + OAEPWITHSHA_256ANDMGF1WITHSHA_256PADDING, + OAEPWITHSHA256ANDMGF1WITHSHA1PADDING, + OAEPWITHSHA_256ANDMGF1WITHSHA_1PADDING, OAEPWITHSHA384ANDMGF1PADDING, OAEPWITHSHA_384ANDMGF1PADDING, OAEPWITHSHA512ANDMGF1PADDING, @@ -571,8 +575,14 @@ namespace Org.BouncyCastle.Security break; case CipherPadding.OAEPWITHSHA256ANDMGF1PADDING: case CipherPadding.OAEPWITHSHA_256ANDMGF1PADDING: + case CipherPadding.OAEPWITHSHA256ANDMGF1WITHSHA256PADDING: + case CipherPadding.OAEPWITHSHA_256ANDMGF1WITHSHA_256PADDING: asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha256Digest()); break; + case CipherPadding.OAEPWITHSHA256ANDMGF1WITHSHA1PADDING: + case CipherPadding.OAEPWITHSHA_256ANDMGF1WITHSHA_1PADDING: + asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha256Digest(), new Sha1Digest(), null); + break; case CipherPadding.OAEPWITHSHA384ANDMGF1PADDING: case CipherPadding.OAEPWITHSHA_384ANDMGF1PADDING: asymBlockCipher = new OaepEncoding(asymBlockCipher, new Sha384Digest()); |