summary refs log tree commit diff
path: root/crypto/src/bcpg/S2k.cs
diff options
context:
space:
mode:
authorOren Novotny <oren@novotny.org>2015-04-25 13:48:16 -0400
committerOren Novotny <oren@novotny.org>2015-04-25 13:48:16 -0400
commitd5f27ee43958695c5b2637882177d2a99664bb9f (patch)
tree1a2dad61668dab77b7543bafc004f5fca8acd6fd /crypto/src/bcpg/S2k.cs
parentUnified Xamarin (diff)
parentMerge branch 'master' into master-vs12 (diff)
downloadBouncyCastle.NET-ed25519-d5f27ee43958695c5b2637882177d2a99664bb9f.tar.xz
Merge branch 'master-vs12' into pcl
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;