diff options
author | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-01-21 16:46:07 +0700 |
---|---|---|
committer | Peter Dettman <peter.dettman@bouncycastle.org> | 2014-01-21 16:46:07 +0700 |
commit | 95c58fd065df852598412fa8b7d06c3cee72c29c (patch) | |
tree | 01d8a520a72b008656881a37ec88d0ab2c98c361 /crypto/src/security/DotNetUtilities.cs | |
parent | Merge branch 'pkix-validator-throw' of git://github.com/jstedfast/bc-csharp i... (diff) | |
parent | Port HMac optimisation using Memoable digests from bc-java. (diff) | |
download | BouncyCastle.NET-ed25519-95c58fd065df852598412fa8b7d06c3cee72c29c.tar.xz |
Merge branch 'feature/threefish-skein-memoable-sm3' of git://github.com/timw/bc-csharp into timw-feature/threefish-skein-memoable-sm3
Conflicts: crypto/crypto.mdp crypto/src/util/Arrays.cs
Diffstat (limited to 'crypto/src/security/DotNetUtilities.cs')
0 files changed, 0 insertions, 0 deletions