minor refactor of Hkdf to HKdf

Author: dghgit

crypto/src/crypto/generators/HKDFBytesGenerator.cs renamed to crypto/src/crypto/generators/HKdfBytesGenerator.cs

@@ -13,7 +13,7 @@ namespace Org.BouncyCastle.Crypto.Generators
      * (output keying material) and is likely to have better security properties
      * than KDF's based on just a hash function.
      */
-    public class HkdfBytesGenerator
+    public class HKdfBytesGenerator
         : IDerivationFunction
     {
         private HMac hMacHash;
@@ -29,18 +29,18 @@ public class HkdfBytesGenerator
          *
          * @param hash the digest to be used as the source of generatedBytes bytes
          */
-        public HkdfBytesGenerator(IDigest hash)
+        public HKdfBytesGenerator(IDigest hash)
         {
             this.hMacHash = new HMac(hash);
             this.hashLen = hash.GetDigestSize();
         }
 
         public virtual void Init(IDerivationParameters parameters)
         {
-            if (!(parameters is HkdfParameters))
-                throw new ArgumentException("HKDF parameters required for HkdfBytesGenerator", "parameters");
+            if (!(parameters is HKdfParameters))
+                throw new ArgumentException("HKDF parameters required for HKdfBytesGenerator", "parameters");
 
-            HkdfParameters hkdfParameters = (HkdfParameters)parameters;
+            HKdfParameters hkdfParameters = (HKdfParameters)parameters;
             if (hkdfParameters.SkipExtract)
             {
                 // use IKM directly as PRK

crypto/src/crypto/parameters/HKDFParameters.cs renamed to crypto/src/crypto/parameters/HKdfParameters.cs

@@ -6,17 +6,17 @@
 namespace Org.BouncyCastle.Crypto.Parameters
 {
     /**
-     * Parameter class for the HkdfBytesGenerator class.
+     * Parameter class for the HKdfBytesGenerator class.
      */
-    public class HkdfParameters
+    public class HKdfParameters
         : IDerivationParameters
     {
         private readonly byte[] ikm;
         private readonly bool skipExpand;
         private readonly byte[] salt;
         private readonly byte[] info;
 
-        private HkdfParameters(byte[] ikm, bool skip, byte[] salt, byte[] info)
+        private HKdfParameters(byte[] ikm, bool skip, byte[] salt, byte[] info)
         {
             if (ikm == null)
                 throw new ArgumentNullException("ikm");
@@ -51,7 +51,7 @@ private HkdfParameters(byte[] ikm, bool skip, byte[] salt, byte[] info)
          * @param salt the salt to use, may be null for a salt for hashLen zeros
          * @param info the info to use, may be null for an info field of zero bytes
          */
-        public HkdfParameters(byte[] ikm, byte[] salt, byte[] info)
+        public HKdfParameters(byte[] ikm, byte[] salt, byte[] info)
             : this(ikm, false, salt, info)
         {
         }
@@ -65,14 +65,14 @@ public HkdfParameters(byte[] ikm, byte[] salt, byte[] info)
          * @param info the info to use, may be null for an info field of zero bytes
          * @return HKDFParameters that makes the implementation skip step 1
          */
-        public static HkdfParameters SkipExtractParameters(byte[] ikm, byte[] info)
+        public static HKdfParameters SkipExtractParameters(byte[] ikm, byte[] info)
         {
-            return new HkdfParameters(ikm, true, null, info);
+            return new HKdfParameters(ikm, true, null, info);
         }
 
-        public static HkdfParameters DefaultParameters(byte[] ikm)
+        public static HKdfParameters DefaultParameters(byte[] ikm)
         {
-            return new HkdfParameters(ikm, false, null, null);
+            return new HKdfParameters(ikm, false, null, null);
         }
 
         /**