Documenting some details

Author: Aitor Gómez Goiri

src/kdf/nist.py

@@ -40,9 +40,9 @@ def _to_one_byte(self, inByte):
         output.append(inByte)
         return output;
 
-    def _debug_string_as_bytes(self, array_alpha):
-        import binascii
-        print binascii.hexlify(array_alpha)
+    # def _debug_string_as_bytes(self, array_alpha):
+    #     import binascii
+    #     print binascii.hexlify(array_alpha)
 
     def derive_key(self, outputSizeBits, fixedInput):
         assert outputSizeBits >= 56, "Key has size of %d, which is less than minimum of 56-bits." % outputSizeBits
@@ -67,6 +67,7 @@ def derive_key(self, outputSizeBits, fixedInput):
             hmac.update(fixedInput)
             tmpKey = hmac.digest() # type: string
             #print self._debug_string_as_bytes(tmpKey)
+            # or simply hmac.hexdigest()
 
             if len(tmpKey) >= outputSizeBytes:
                 lenn = outputSizeBytes

test/nistTest.py

@@ -9,11 +9,11 @@
 
 class NISTTest(unittest.TestCase):
 
-    def _test_NIST_UseCase(self, nist_obj, testCase):
+    def _test_NIST_UseCase(self, nist_obj, testCase, error_msg):
         nist_obj.set_hmac( testCase["digestmod"], testCase["ki"] )
         #ret = self.nist.derive_key( len(testCase["ko"])*8, testCase["fixedInput"] )
         ret = nist_obj.derive_key( testCase["l"], testCase["fixedInput"] )
-        self.assertSequenceEqual(ret, testCase["ko"])
+        self.assertSequenceEqual(ret, testCase["ko"], error_msg)
 
     def _test_using_hmac_library(self, generic_case):
         # less things to do because this test suite was originally conceived for hmac implementation
@@ -26,7 +26,7 @@ def _test_using_hmac_library(self, generic_case):
             raise Exception("Digest mode not considered.")
 
         from kdf.lhmac import NIST
-        self._test_NIST_UseCase( NIST(), case )
+        self._test_NIST_UseCase( NIST(), case, "hmac library based implementation" )
 
     def _test_using_crypto_library(self, generic_case):
         case = generic_case.copy()
@@ -45,7 +45,7 @@ def _test_using_crypto_library(self, generic_case):
         case["ko"] = str(case["ko"])
 
         from kdf.lcrypto import NIST
-        self._test_NIST_UseCase( NIST(), case )
+        self._test_NIST_UseCase( NIST(), case, "crypto library based implementation" )
 
     def test_NIST1(self):
         """