2007-08-17 Sebastien Pouliot <sebastien@ximian.com>

[mono.git] / mcs / class / corlib / System.Security.Cryptography / PasswordDeriveBytes.cs

diff --git a/mcs/class/corlib/System.Security.Cryptography/PasswordDeriveBytes.cs b/mcs/class/corlib/System.Security.Cryptography/PasswordDeriveBytes.cs
index a722a7857c3f81e830bd8b7ecfeb73a1a00d5a1d..ae1bb1f8b53ff2fa53f90cd715524ef76712dc66 100644 (file)
--- a/mcs/class/corlib/System.Security.Cryptography/PasswordDeriveBytes.cs
+++ b/mcs/class/corlib/System.Security.Cryptography/PasswordDeriveBytes.cs
@@ -5,7 +5,7 @@
 //     Sebastien Pouliot (sebastien@ximian.com)
 //
 // (C) 2002, 2003 Motus Technologies Inc. (http://www.motus.com)
-// Copyright (C) 2004-2005 Novell, Inc (http://www.novell.com)
+// Copyright (C) 2004-2007 Novell, Inc (http://www.novell.com)
 //
 // Permission is hereby granted, free of charge, to any person obtaining
 // a copy of this software and associated documentation files (the
@@ -228,6 +228,9 @@ public class PasswordDeriveBytes : DeriveBytes {
        }
 
        // note: Key is returned - we can't zeroize it ourselve :-(
+#if NET_2_0
+       [Obsolete ("see Rfc2898DeriveBytes for PKCS#5 v2 support")]
+#endif
        public override byte[] GetBytes (int cb) 
        {
 #if ! NET_2_0
@@ -239,10 +242,10 @@ public class PasswordDeriveBytes : DeriveBytes {
                        throw new IndexOutOfRangeException ("cb");
 
                if (state == 0) {
-                       state = 1;
                        // it's now impossible to change the HashName, Salt
                        // and IterationCount
                        Reset ();
+                       state = 1;
                }
 
                byte[] result = new byte [cb];
@@ -295,7 +298,11 @@ public class PasswordDeriveBytes : DeriveBytes {
 
        public override void Reset () 
        {
+#if NET_2_0
+               state = 0;
+#else
                // note: Reset doesn't change state
+#endif
                position = 0;
                hashnumber = 0;