diff --git a/testsuite/hmac-test.c b/testsuite/hmac-test.c
index e50e335fbaa4952fe7e5b21c022e43a6d15d2591..da0d28747f8dcc35383a1de60bb4651f56e5cd8d 100644
--- a/testsuite/hmac-test.c
+++ b/testsuite/hmac-test.c
@@ -182,5 +182,139 @@ test_main(void)
 	     H("e8e99d0f45237d78 6d6bbaa7965c7808 bbff1a91")))
     FAIL();
 
+
+  /* Test vectors for sha256, from draft-ietf-ipsec-ciph-sha-256-01.txt */
+
+  /* Test Case #1: HMAC-SHA-256 with 3-byte input and 32-byte key */
+  hmac_sha256_set_key(&sha256, HL("0102030405060708 090a0b0c0d0e0f10"
+				  "1112131415161718 191a1b1c1d1e1f20"));
+  hmac_sha256_update(&sha256, LDATA("abc"));
+  hmac_sha256_digest(&sha256, SHA256_DIGEST_SIZE, digest);
+
+  if (!MEMEQ(SHA256_DIGEST_SIZE, digest,
+	     H("a21b1f5d4cf4f73a 4dd939750f7a066a"
+	       "7f98cc131cb16a66 92759021cfab8181")))
+    FAIL();
+
+  /* Test Case #2: HMAC-SHA-256 with 56-byte input and 32-byte key */
+  hmac_sha256_set_key(&sha256, HL("0102030405060708 090a0b0c0d0e0f10"
+				  "1112131415161718 191a1b1c1d1e1f20"));
+  hmac_sha256_update(&sha256, LDATA("abcdbcdecdefdefgefghfghighijhijk"
+				    "ijkljklmklmnlmnomnopnopq"));
+  hmac_sha256_digest(&sha256, SHA256_DIGEST_SIZE, digest);
+
+  if (!MEMEQ(SHA256_DIGEST_SIZE, digest,
+	     H("104fdc1257328f08 184ba73131c53cae"
+	       "e698e36119421149 ea8c712456697d30")))
+    FAIL();
+
+  /* Test Case #3: HMAC-SHA-256 with 112-byte (multi-block) input
+     and 32-byte key */
+  hmac_sha256_set_key(&sha256, HL("0102030405060708 090a0b0c0d0e0f10"
+				  "1112131415161718 191a1b1c1d1e1f20"));
+  hmac_sha256_update(&sha256, LDATA("abcdbcdecdefdefgefghfghighijhijk"
+				    "ijkljklmklmnlmnomnopnopqabcdbcde"
+				    "cdefdefgefghfghighijhijkijkljklm"
+				    "klmnlmnomnopnopq"));
+  hmac_sha256_digest(&sha256, SHA256_DIGEST_SIZE, digest);
+
+  if (!MEMEQ(SHA256_DIGEST_SIZE, digest,
+	     H("470305fc7e40fe34 d3eeb3e773d95aab"
+	       "73acf0fd060447a5 eb4595bf33a9d1a3")))
+    FAIL();
+
+  /* Test Case #4:  HMAC-SHA-256 with 8-byte input and 32-byte key */
+  hmac_sha256_set_key(&sha256, HL("0b0b0b0b0b0b0b0b 0b0b0b0b0b0b0b0b"
+				  "0b0b0b0b0b0b0b0b 0b0b0b0b0b0b0b0b"));
+  hmac_sha256_update(&sha256, LDATA("Hi There"));
+  hmac_sha256_digest(&sha256, SHA256_DIGEST_SIZE, digest);
+
+  if (!MEMEQ(SHA256_DIGEST_SIZE, digest,
+	     H("198a607eb44bfbc6 9903a0f1cf2bbdc5"
+	       "ba0aa3f3d9ae3c1c 7a3b1696a0b68cf7")))
+    FAIL();
+
+  /* Test Case #5:  HMAC-SHA-256 with 28-byte input and 4-byte key */
+  hmac_sha256_set_key(&sha256, LDATA("Jefe"));
+  hmac_sha256_update(&sha256, LDATA("what do ya want for nothing?"));
+  hmac_sha256_digest(&sha256, SHA256_DIGEST_SIZE, digest);
+
+  if (!MEMEQ(SHA256_DIGEST_SIZE, digest,
+	     H("5bdcc146bf60754e 6a042426089575c7"
+	       "5a003f089d273983 9dec58b964ec3843")))
+    FAIL();
+
+  /* Test Case #6: HMAC-SHA-256 with 50-byte input and 32-byte key */
+  hmac_sha256_set_key(&sha256, HL("aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"
+				  "aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"));
+  hmac_sha256_update(&sha256, HL("dddddddddddddddd dddddddddddddddd"
+				 "dddddddddddddddd dddddddddddddddd"
+				 "dddddddddddddddd dddddddddddddddd"
+				 "dddd"));
+  hmac_sha256_digest(&sha256, SHA256_DIGEST_SIZE, digest);
+
+  if (!MEMEQ(SHA256_DIGEST_SIZE, digest,
+	     H("cdcb1220d1ecccea 91e53aba3092f962"
+	       "e549fe6ce9ed7fdc 43191fbde45c30b0")))
+    FAIL();
+
+  /* Test Case #7: HMAC-SHA-256 with 50-byte input and 37-byte key */
+  hmac_sha256_set_key(&sha256, HL("0102030405060708 090a0b0c0d0e0f10"
+				  "1112131415161718 191a1b1c1d1e1f20"
+				  "2122232425"));
+  hmac_sha256_update(&sha256, HL("cdcdcdcdcdcdcdcd cdcdcdcdcdcdcdcd"
+				 "cdcdcdcdcdcdcdcd cdcdcdcdcdcdcdcd"
+				 "cdcdcdcdcdcdcdcd cdcdcdcdcdcdcdcd"
+				 "cdcd"));
+  hmac_sha256_digest(&sha256, SHA256_DIGEST_SIZE, digest);
+
+  if (!MEMEQ(SHA256_DIGEST_SIZE, digest,
+	     H("d4633c17f6fb8d74 4c66dee0f8f07455"
+	       "6ec4af55ef079985 41468eb49bd2e917")))
+    FAIL();
+
+  /* Test Case #8: HMAC-SHA-256 with 20-byte input and 32-byte key */
+  memset(digest, 0, SHA256_DIGEST_SIZE);
+  hmac_sha256_set_key(&sha256, HL("0c0c0c0c0c0c0c0c 0c0c0c0c0c0c0c0c"
+				  "0c0c0c0c0c0c0c0c 0c0c0c0c0c0c0c0c"));
+  hmac_sha256_update(&sha256, LDATA("Test With Truncation"));
+  hmac_sha256_digest(&sha256, 16, digest);
+
+  if (!MEMEQ(SHA256_DIGEST_SIZE, digest,
+	     H("7546af01841fc09b 1ab9c3749a5f1c17"
+	       "0000000000000000 0000000000000000")))
+    FAIL();
+
+  /* Test Case #9: HMAC-SHA-256 with 54-byte input and 80-byte key */
+  hmac_sha256_set_key(&sha256, HL("aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"
+				  "aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"
+				  "aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"
+				  "aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"
+				  "aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"));
+  hmac_sha256_update(&sha256, LDATA(
+    "Test Using Larger Than Block-Size Key - Hash Key First"));
+  hmac_sha256_digest(&sha256, SHA256_DIGEST_SIZE, digest);
+
+  if (!MEMEQ(SHA256_DIGEST_SIZE, digest,
+	     H("6953025ed96f0c09 f80a96f78e6538db"
+	       "e2e7b820e3dd970e 7ddd39091b32352f")))
+    FAIL();
+
+  /* Test Case #10: HMAC-SHA-256 with 73-byte (multi-block) input
+     and 80-byte key */
+  hmac_sha256_set_key(&sha256, HL("aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"
+				  "aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"
+				  "aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"
+				  "aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"
+				  "aaaaaaaaaaaaaaaa aaaaaaaaaaaaaaaa"));
+  hmac_sha256_update(&sha256, LDATA(
+    "Test Using Larger Than Block-Size Key and Larger Than One Block-Size Data"));
+  hmac_sha256_digest(&sha256, SHA256_DIGEST_SIZE, digest);
+
+  if (!MEMEQ(SHA256_DIGEST_SIZE, digest,
+	     H("6355ac22e890d0a3 c8481a5ca4825bc8"
+	       "84d3e7a1ff98a2fc 2ac7d8e064c3b2e6")))
+    FAIL();
+
   SUCCESS();
 }