summary refs log tree commit diff
path: root/crypto/src/bcpg/S2k.cs
diff options
context:
space:
mode:
authorJeffrey Stedfast <jeff@xamarin.com>2015-03-14 09:21:16 -0400
committerJeffrey Stedfast <jeff@xamarin.com>2015-03-14 09:21:16 -0400
commit5f446e15a61331939d37d0a62c72384e19b8a806 (patch)
tree6685f0f70604121f59b258d62e3efa63256053a6 /crypto/src/bcpg/S2k.cs
parentMerge branch 'master' into vs2010 (diff)
parentUpdate TLS for draft-ietf-tls-session-hash-04 (diff)
downloadBouncyCastle.NET-ed25519-5f446e15a61331939d37d0a62c72384e19b8a806.tar.xz
Merge branch 'master' into vs2010
Diffstat (limited to 'crypto/src/bcpg/S2k.cs')
-rw-r--r--crypto/src/bcpg/S2k.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/crypto/src/bcpg/S2k.cs b/crypto/src/bcpg/S2k.cs
index de08c016c..f6d306890 100644
--- a/crypto/src/bcpg/S2k.cs
+++ b/crypto/src/bcpg/S2k.cs
@@ -16,6 +16,8 @@ namespace Org.BouncyCastle.Bcpg
         public const int Salted = 1;
         public const int SaltedAndIterated = 3;
         public const int GnuDummyS2K = 101;
+        public const int GnuProtectionModeNoPrivateKey = 1;
+        public const int GnuProtectionModeDivertToCard = 2;
 
         internal int type;
         internal HashAlgorithmTag algorithm;