diff options
author | David Hook <david.hook@keyfactor.com> | 2022-10-29 18:56:29 +1100 |
---|---|---|
committer | David Hook <david.hook@keyfactor.com> | 2022-10-29 18:56:29 +1100 |
commit | 590610a1faf81601756bfc683154446802157c86 (patch) | |
tree | 871ef215c63025dfea08a4cdd99120ad8a07fa45 /crypto/src/security/ParameterUtilities.cs | |
parent | Merge remote-tracking branch 'refs/remotes/origin/master' (diff) | |
parent | Release preparations (diff) | |
download | BouncyCastle.NET-ed25519-590610a1faf81601756bfc683154446802157c86.tar.xz |
resolve conflicts
Diffstat (limited to 'crypto/src/security/ParameterUtilities.cs')
-rw-r--r-- | crypto/src/security/ParameterUtilities.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/src/security/ParameterUtilities.cs b/crypto/src/security/ParameterUtilities.cs index 5a407fc9d..d79f15359 100644 --- a/crypto/src/security/ParameterUtilities.cs +++ b/crypto/src/security/ParameterUtilities.cs @@ -118,7 +118,7 @@ namespace Org.BouncyCastle.Security AddAlgorithm("GOST28147", "GOST", "GOST-28147", - CryptoProObjectIdentifiers.GostR28147Cbc); + CryptoProObjectIdentifiers.GostR28147Gcfb); AddAlgorithm("HC128"); AddAlgorithm("HC256"); AddAlgorithm("IDEA", |