diff options
author | Oren Novotny <oren@novotny.org> | 2015-10-16 20:23:05 -0400 |
---|---|---|
committer | Oren Novotny <oren@novotny.org> | 2015-10-16 20:23:05 -0400 |
commit | de17e96f2d52a25a33e742d0f81e9052da77f49b (patch) | |
tree | 03ccef76aacc1bac6340df9faedf1d64dda76077 /crypto/src/bcpg/S2k.cs | |
parent | prep release for 1.8.0-rc2 (diff) | |
parent | Merge branch 'master' into master-vs12 (diff) | |
download | BouncyCastle.NET-ed25519-de17e96f2d52a25a33e742d0f81e9052da77f49b.tar.xz |
Merge branch 'master-vs12' into pcl
Diffstat (limited to 'crypto/src/bcpg/S2k.cs')
-rw-r--r-- | crypto/src/bcpg/S2k.cs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/crypto/src/bcpg/S2k.cs b/crypto/src/bcpg/S2k.cs index f6d306890..33fd792fe 100644 --- a/crypto/src/bcpg/S2k.cs +++ b/crypto/src/bcpg/S2k.cs @@ -84,19 +84,19 @@ namespace Org.BouncyCastle.Bcpg this.itCount = itCount; } - public int Type + public virtual int Type { get { return type; } } /// <summary>The hash algorithm.</summary> - public HashAlgorithmTag HashAlgorithm + public virtual HashAlgorithmTag HashAlgorithm { get { return algorithm; } } /// <summary>The IV for the key generation algorithm.</summary> - public byte[] GetIV() + public virtual byte[] GetIV() { return Arrays.Clone(iv); } @@ -108,13 +108,13 @@ namespace Org.BouncyCastle.Bcpg } /// <summary>The iteration count</summary> - public long IterationCount + public virtual long IterationCount { get { return (16 + (itCount & 15)) << ((itCount >> 4) + ExpBias); } } /// <summary>The protection mode - only if GnuDummyS2K</summary> - public int ProtectionMode + public virtual int ProtectionMode { get { return protectionMode; } } |