[glib] hmac: Add support for SHA-512 in GHmac

From: Philip Withnall <pwithnall src gnome org>
To: commits-list gnome org
Cc:
Subject: [glib] hmac: Add support for SHA-512 in GHmac
Date: Wed, 16 Apr 2014 15:21:07 +0000 (UTC)
commit 7a86a6690a767b48379c9233049a6a9d2a21a86e
Author: Philip Withnall <philip withnall collabora co uk>
Date:   Wed Feb 19 18:02:37 2014 +0000

    hmac: Add support for SHA-512 in GHmac
    
    The block size wasn’t configured before, so calling g_hmac_new() with
    G_CHECKSUM_SHA512 would hit a g_assert_not_reached() and explode.
    
    Implement G_CHECKSUM_SHA512 and add unit tests for HMACs with SHA-256
    and SHA-512 using the test vectors from RFC 4868.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=724741

 glib/ghmac.c      |   10 +++-
 glib/tests/hmac.c |  177 +++++++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 173 insertions(+), 14 deletions(-)
---
diff --git a/glib/ghmac.c b/glib/ghmac.c
index c9f4ba1..a5ac705 100644
--- a/glib/ghmac.c
+++ b/glib/ghmac.c
@@ -49,7 +49,8 @@
  *
  * Both the key and data are arbitrary byte arrays of bytes or characters.
  *
- * Support for HMAC Digests has been added in GLib 2.30.
+ * Support for HMAC Digests has been added in GLib 2.30, and support for SHA-512
+ * in GLib 2.42.
  */
 
 struct _GHmac
@@ -80,6 +81,8 @@ struct _GHmac
  * will be closed and it won't be possible to call g_hmac_update()
  * on it anymore.
  *
+ * Support for digests of type %G_CHECKSUM_SHA512 has been added in GLib 2.42.
+ *
  * Returns: the newly created #GHmac, or %NULL.
  *   Use g_hmac_unref() to free the memory allocated by it.
  *
@@ -107,7 +110,10 @@ g_hmac_new (GChecksumType  digest_type,
       block_size = 64; /* RFC 2104 */
       break;
     case G_CHECKSUM_SHA256:
-      block_size = 64; /* RFC draft-kelly-ipsec-ciph-sha2-01 */
+      block_size = 64; /* RFC 4868 */
+      break;
+    case G_CHECKSUM_SHA512:
+      block_size = 128; /* RFC 4868 */
       break;
     default:
       g_return_val_if_reached (NULL);
diff --git a/glib/tests/hmac.c b/glib/tests/hmac.c
index 2a434db..cb5cc0d 100644
--- a/glib/tests/hmac.c
+++ b/glib/tests/hmac.c
@@ -82,26 +82,55 @@ guint8 result_md5_test7[] = {
     0x6f, 0x63, 0x0f, 0xad, 0x67, 0xcd, 0xa0, 0xee, 0x1f, 0xb1,
     0xf5, 0x62, 0xdb, 0x3a, 0xa5, 0x3e };
 
-/* HMAC-SHA1 test vectors as per RFC 2202 */
+/* HMAC-SHA1, HMAC-SHA256 and HMAC-SHA512 test vectors
+ * as per RFCs 2202 and 4868.
+ *
+ * See: https://tools.ietf.org/html/rfc4868#section-2.7.1 */
 
 /* Test 1 */
-guint8 key_sha1_test1[] = {
+guint8 key_sha_test1[] = {
     0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
     0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b };
 guint8 result_sha1_test1[] = {
     0xb6, 0x17, 0x31, 0x86, 0x55, 0x05, 0x72, 0x64, 0xe2, 0x8b,
     0xc0, 0xb6, 0xfb, 0x37, 0x8c, 0x8e, 0xf1, 0x46, 0xbe, 0x00 };
+guint8 result_sha256_test1[] = {
+    0xb0, 0x34, 0x4c, 0x61, 0xd8, 0xdb, 0x38, 0x53, 0x5c, 0xa8,
+    0xaf, 0xce, 0xaf, 0x0b, 0xf1, 0x2b, 0x88, 0x1d, 0xc2, 0x00,
+    0xc9, 0x83, 0x3d, 0xa7, 0x26, 0xe9, 0x37, 0x6c, 0x2e, 0x32,
+    0xcf, 0xf7 };
+guint8 result_sha512_test1[] = {
+    0x87, 0xaa, 0x7c, 0xde, 0xa5, 0xef, 0x61, 0x9d, 0x4f, 0xf0,
+    0xb4, 0x24, 0x1a, 0x1d, 0x6c, 0xb0, 0x23, 0x79, 0xf4, 0xe2,
+    0xce, 0x4e, 0xc2, 0x78, 0x7a, 0xd0, 0xb3, 0x05, 0x45, 0xe1,
+    0x7c, 0xde, 0xda, 0xa8, 0x33, 0xb7, 0xd6, 0xb8, 0xa7, 0x02,
+    0x03, 0x8b, 0x27, 0x4e, 0xae, 0xa3, 0xf4, 0xe4, 0xbe, 0x9d,
+    0x91, 0x4e, 0xeb, 0x61, 0xf1, 0x70, 0x2e, 0x69, 0x6c, 0x20,
+    0x3a, 0x12, 0x68, 0x54 };
 
 /* Test 2 */
 guint8 result_sha1_test2[] = {
     0xef, 0xfc, 0xdf, 0x6a, 0xe5, 0xeb, 0x2f, 0xa2, 0xd2, 0x74,
     0x16, 0xd5, 0xf1, 0x84, 0xdf, 0x9c, 0x25, 0x9a, 0x7c, 0x79 };
+guint8 result_sha256_test2[] = {
+    0x5b, 0xdc, 0xc1, 0x46, 0xbf, 0x60, 0x75, 0x4e, 0x6a, 0x04,
+    0x24, 0x26, 0x08, 0x95, 0x75, 0xc7, 0x5a, 0x00, 0x3f, 0x08,
+    0x9d, 0x27, 0x39, 0x83, 0x9d, 0xec, 0x58, 0xb9, 0x64, 0xec,
+    0x38, 0x43 };
+guint8 result_sha512_test2[] = {
+    0x16, 0x4b, 0x7a, 0x7b, 0xfc, 0xf8, 0x19, 0xe2, 0xe3, 0x95,
+    0xfb, 0xe7, 0x3b, 0x56, 0xe0, 0xa3, 0x87, 0xbd, 0x64, 0x22,
+    0x2e, 0x83, 0x1f, 0xd6, 0x10, 0x27, 0x0c, 0xd7, 0xea, 0x25,
+    0x05, 0x54, 0x97, 0x58, 0xbf, 0x75, 0xc0, 0x5a, 0x99, 0x4a,
+    0x6d, 0x03, 0x4f, 0x65, 0xf8, 0xf0, 0xe6, 0xfd, 0xca, 0xea,
+    0xb1, 0xa3, 0x4d, 0x4a, 0x6b, 0x4b, 0x63, 0x6e, 0x07, 0x0a,
+    0x38, 0xbc, 0xe7, 0x37 };
 
 /* Test 3 */
-guint8 key_sha1_test3[] = {
+guint8 key_sha_test3[] = {
     0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
     0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa };
-guint8 data_sha1_test3[] = {
+guint8 data_sha_test3[] = {
     0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
     0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
     0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
@@ -110,13 +139,26 @@ guint8 data_sha1_test3[] = {
 guint8 result_sha1_test3[] = {
     0x12, 0x5d, 0x73, 0x42, 0xb9, 0xac, 0x11, 0xcd, 0x91, 0xa3,
     0x9a, 0xf4, 0x8a, 0xa1, 0x7b, 0x4f, 0x63, 0xf1, 0x75, 0xd3 };
+guint8 result_sha256_test3[] = {
+    0x77, 0x3e, 0xa9, 0x1e, 0x36, 0x80, 0x0e, 0x46, 0x85, 0x4d,
+    0xb8, 0xeb, 0xd0, 0x91, 0x81, 0xa7, 0x29, 0x59, 0x09, 0x8b,
+    0x3e, 0xf8, 0xc1, 0x22, 0xd9, 0x63, 0x55, 0x14, 0xce, 0xd5,
+    0x65, 0xfe };
+guint8 result_sha512_test3[] = {
+    0xfa, 0x73, 0xb0, 0x08, 0x9d, 0x56, 0xa2, 0x84, 0xef, 0xb0,
+    0xf0, 0x75, 0x6c, 0x89, 0x0b, 0xe9, 0xb1, 0xb5, 0xdb, 0xdd,
+    0x8e, 0xe8, 0x1a, 0x36, 0x55, 0xf8, 0x3e, 0x33, 0xb2, 0x27,
+    0x9d, 0x39, 0xbf, 0x3e, 0x84, 0x82, 0x79, 0xa7, 0x22, 0xc8,
+    0x06, 0xb4, 0x85, 0xa4, 0x7e, 0x67, 0xc8, 0x07, 0xb9, 0x46,
+    0xa3, 0x37, 0xbe, 0xe8, 0x94, 0x26, 0x74, 0x27, 0x88, 0x59,
+    0xe1, 0x32, 0x92, 0xfb };
 
 /* Test 4 */
-guint8 key_sha1_test4[] = {
+guint8 key_sha_test4[] = {
     0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a,
     0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10, 0x11, 0x12, 0x13, 0x14,
     0x15, 0x16, 0x17, 0x18, 0x19 };
-guint8 data_sha1_test4[] = {
+guint8 data_sha_test4[] = {
     0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
     0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
     0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
@@ -125,8 +167,21 @@ guint8 data_sha1_test4[] = {
 guint8 result_sha1_test4[] = {
     0x4c, 0x90, 0x07, 0xf4, 0x02, 0x62, 0x50, 0xc6, 0xbc, 0x84,
     0x14, 0xf9, 0xbf, 0x50, 0xc8, 0x6c, 0x2d, 0x72, 0x35, 0xda };
-
-/* Test 5 */
+guint8 result_sha256_test4[] = {
+    0x82, 0x55, 0x8a, 0x38, 0x9a, 0x44, 0x3c, 0x0e, 0xa4, 0xcc,
+    0x81, 0x98, 0x99, 0xf2, 0x08, 0x3a, 0x85, 0xf0, 0xfa, 0xa3,
+    0xe5, 0x78, 0xf8, 0x07, 0x7a, 0x2e, 0x3f, 0xf4, 0x67, 0x29,
+    0x66, 0x5b };
+guint8 result_sha512_test4[] = {
+    0xb0, 0xba, 0x46, 0x56, 0x37, 0x45, 0x8c, 0x69, 0x90, 0xe5,
+    0xa8, 0xc5, 0xf6, 0x1d, 0x4a, 0xf7, 0xe5, 0x76, 0xd9, 0x7f,
+    0xf9, 0x4b, 0x87, 0x2d, 0xe7, 0x6f, 0x80, 0x50, 0x36, 0x1e,
+    0xe3, 0xdb, 0xa9, 0x1c, 0xa5, 0xc1, 0x1a, 0xa2, 0x5e, 0xb4,
+    0xd6, 0x79, 0x27, 0x5c, 0xc5, 0x78, 0x80, 0x63, 0xa5, 0xf1,
+    0x97, 0x41, 0x12, 0x0c, 0x4f, 0x2d, 0xe2, 0xad, 0xeb, 0xeb,
+    0x10, 0xa2, 0x98, 0xdd };
+
+/* Test 5 (note: different for SHA-256/SHA-512) */
 guint8 key_sha1_test5[] = {
     0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
     0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c };
@@ -134,7 +189,7 @@ guint8 result_sha1_test5[] = {
     0x4c, 0x1a, 0x03, 0x42, 0x4b, 0x55, 0xe0, 0x7f, 0xe7, 0xf2,
     0x7b, 0xe1, 0xd5, 0x8b, 0xb9, 0x32, 0x4a, 0x9a, 0x5a, 0x04 };
 
-/* Test 6 & 7*/
+/* Test 6 & 7 (note: different for SHA-1 and SHA-256/SHA-512) */
 guint8 key_sha1_test6_7[] = {
     0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
     0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
@@ -153,6 +208,51 @@ guint8 result_sha1_test7[] = {
     0xe8, 0xe9, 0x9d, 0xf, 0x45, 0x23, 0x7d, 0x78, 0x6d, 0x6b,
     0xba, 0xa7, 0x96, 0x5c, 0x78, 0x8, 0xbb, 0xff, 0x1a, 0x91 };
 
+/* Test 5 & 6 for SHA-256 and SHA-512. */
+guint8 key_sha256_test5_6[] = {
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
+    0xaa };
+
+guint8 result_sha256_test5[] = {
+    0x60, 0xe4, 0x31, 0x59, 0x1e, 0xe0, 0xb6, 0x7f, 0x0d, 0x8a,
+    0x26, 0xaa, 0xcb, 0xf5, 0xb7, 0x7f, 0x8e, 0x0b, 0xc6, 0x21,
+    0x37, 0x28, 0xc5, 0x14, 0x05, 0x46, 0x04, 0x0f, 0x0e, 0xe3,
+    0x7f, 0x54 };
+guint8 result_sha512_test5[] = {
+    0x80, 0xb2, 0x42, 0x63, 0xc7, 0xc1, 0xa3, 0xeb, 0xb7, 0x14,
+    0x93, 0xc1, 0xdd, 0x7b, 0xe8, 0xb4, 0x9b, 0x46, 0xd1, 0xf4,
+    0x1b, 0x4a, 0xee, 0xc1, 0x12, 0x1b, 0x01, 0x37, 0x83, 0xf8,
+    0xf3, 0x52, 0x6b, 0x56, 0xd0, 0x37, 0xe0, 0x5f, 0x25, 0x98,
+    0xbd, 0x0f, 0xd2, 0x21, 0x5d, 0x6a, 0x1e, 0x52, 0x95, 0xe6,
+    0x4f, 0x73, 0xf6, 0x3f, 0x0a, 0xec, 0x8b, 0x91, 0x5a, 0x98,
+    0x5d, 0x78, 0x65, 0x98 };
+
+guint8 result_sha256_test6[] = {
+    0x9b, 0x09, 0xff, 0xa7, 0x1b, 0x94, 0x2f, 0xcb, 0x27, 0x63,
+    0x5f, 0xbc, 0xd5, 0xb0, 0xe9, 0x44, 0xbf, 0xdc, 0x63, 0x64,
+    0x4f, 0x07, 0x13, 0x93, 0x8a, 0x7f, 0x51, 0x53, 0x5c, 0x3a,
+    0x35, 0xe2 };
+guint8 result_sha512_test6[] = {
+    0xe3, 0x7b, 0x6a, 0x77, 0x5d, 0xc8, 0x7d, 0xba, 0xa4, 0xdf,
+    0xa9, 0xf9, 0x6e, 0x5e, 0x3f, 0xfd, 0xde, 0xbd, 0x71, 0xf8,
+    0x86, 0x72, 0x89, 0x86, 0x5d, 0xf5, 0xa3, 0x2d, 0x20, 0xcd,
+    0xc9, 0x44, 0xb6, 0x02, 0x2c, 0xac, 0x3c, 0x49, 0x82, 0xb1,
+    0x0d, 0x5e, 0xeb, 0x55, 0xc3, 0xe4, 0xde, 0x15, 0x13, 0x46,
+    0x76, 0xfb, 0x6d, 0xe0, 0x44, 0x60, 0x65, 0xc9, 0x74, 0x40,
+    0xfa, 0x8c, 0x6a, 0x58 };
+
 
 typedef struct {
   GChecksumType digest_type;
@@ -183,12 +283,12 @@ HmacCase hmac_md5_tests[] = {
 };
 
 HmacCase hmac_sha1_tests[] = {
-  { G_CHECKSUM_SHA1, key_sha1_test1, 20, "Hi There", 8, result_sha1_test1 },
+  { G_CHECKSUM_SHA1, key_sha_test1, 20, "Hi There", 8, result_sha1_test1 },
   { G_CHECKSUM_SHA1, "Jefe", 4, "what do ya want for nothing?", 28,
       result_sha1_test2 },
-  { G_CHECKSUM_SHA1, key_sha1_test3, 20, data_sha1_test3, 50,
+  { G_CHECKSUM_SHA1, key_sha_test3, 20, data_sha_test3, 50,
       result_sha1_test3 },
-  { G_CHECKSUM_SHA1, key_sha1_test4, 25, data_sha1_test4, 50,
+  { G_CHECKSUM_SHA1, key_sha_test4, 25, data_sha_test4, 50,
       result_sha1_test4 },
   { G_CHECKSUM_SHA1, key_sha1_test5, 20, "Test With Truncation", 20,
     result_sha1_test5 },
@@ -201,6 +301,43 @@ HmacCase hmac_sha1_tests[] = {
   { -1, NULL, 0, NULL, 0, NULL },
 };
 
+HmacCase hmac_sha256_tests[] = {
+  { G_CHECKSUM_SHA256, key_sha_test1, 20, "Hi There", 8, result_sha256_test1 },
+  { G_CHECKSUM_SHA256, "Jefe", 4, "what do ya want for nothing?", 28,
+      result_sha256_test2 },
+  { G_CHECKSUM_SHA256, key_sha_test3, 20, data_sha_test3, 50,
+      result_sha256_test3 },
+  { G_CHECKSUM_SHA256, key_sha_test4, 25, data_sha_test4, 50,
+      result_sha256_test4 },
+  { G_CHECKSUM_SHA256, key_sha256_test5_6, 131,
+      "Test Using Larger Than Block-Size Key - Hash Key First", 54,
+      result_sha256_test5 },
+  { G_CHECKSUM_SHA256, key_sha256_test5_6, 131,
+      "This is a test using a larger than block-size key and a larger than "
+      "block-size data. The key needs to be hashed before being used by the "
+      "HMAC algorithm.", 152, result_sha256_test6, },
+  { -1, NULL, 0, NULL, 0, NULL },
+};
+
+HmacCase hmac_sha512_tests[] = {
+  { G_CHECKSUM_SHA512, key_sha_test1, 20, "Hi There", 8, result_sha512_test1 },
+  { G_CHECKSUM_SHA512, "Jefe", 4, "what do ya want for nothing?", 28,
+      result_sha512_test2 },
+  { G_CHECKSUM_SHA512, key_sha_test3, 20, data_sha_test3, 50,
+      result_sha512_test3 },
+  { G_CHECKSUM_SHA512, key_sha_test4, 25, data_sha_test4, 50,
+      result_sha512_test4 },
+  { G_CHECKSUM_SHA512, key_sha256_test5_6, 131,
+      "Test Using Larger Than Block-Size Key - Hash Key First", 54,
+      result_sha512_test5 },
+  { G_CHECKSUM_SHA512, key_sha256_test5_6, 131,
+      "This is a test using a larger than block-size key and a larger than "
+      "block-size data. The key needs to be hashed before being used by the "
+      "HMAC algorithm.", 152, result_sha512_test6, },
+  { -1, NULL, 0, NULL, 0, NULL },
+};
+
+
 static void
 test_hmac (HmacCase *t)
 {
@@ -296,6 +433,22 @@ main (int argc,
       g_free (name);
     }
 
+  for (i = 0 ; hmac_sha256_tests[i].key_len > 0 ; i++)
+    {
+      gchar *name = g_strdup_printf ("/hmac/sha256-%d", i + 1);
+      g_test_add_data_func (name, hmac_sha256_tests + i,
+        (void (*)(const void *)) test_hmac);
+      g_free (name);
+    }
+
+  for (i = 0 ; hmac_sha512_tests[i].key_len > 0 ; i++)
+    {
+      gchar *name = g_strdup_printf ("/hmac/sha512-%d", i + 1);
+      g_test_add_data_func (name, hmac_sha512_tests + i,
+        (void (*)(const void *)) test_hmac);
+      g_free (name);
+    }
+
   for (i = 0 ; hmac_md5_tests[i].key_len > 0 ; i++)
     {
       gchar *name = g_strdup_printf ("/hmac/md5-%d", i + 1);
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]