Added CKM_SHA224 support

opendnssec · May 23, 2016 · f251f22 · f251f22
1 parent e476540
commit f251f22
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 0 deletions.
diff --git a/checks/checks.c b/checks/checks.c
@@ -385,6 +385,8 @@ void runInfoCheck(unsigned int counter) {
     assert(rv == CKR_OK);
     rv = C_GetMechanismInfo(slotWithToken, CKM_SHA_1, &info);
     assert(rv == CKR_OK);
+    rv = C_GetMechanismInfo(slotWithToken, CKM_SHA224, &info);
+    assert(rv == CKR_OK);
     rv = C_GetMechanismInfo(slotWithToken, CKM_SHA256, &info);
     assert(rv == CKR_OK);
     rv = C_GetMechanismInfo(slotWithToken, CKM_SHA384, &info);

diff --git a/src/lib/cryptoki_compat/pkcs11.h b/src/lib/cryptoki_compat/pkcs11.h
@@ -549,6 +549,9 @@ typedef unsigned long ck_mechanism_type_t;
 #define CKM_SHA256			(0x250)
 #define CKM_SHA256_HMAC			(0x251)
 #define CKM_SHA256_HMAC_GENERAL		(0x252)
+#define CKM_SHA224			(0x255)
+#define CKM_SHA224_HMAC			(0x256)
+#define CKM_SHA224_HMAC_GENERAL		(0x257)
 #define CKM_SHA384			(0x260)
 #define CKM_SHA384_HMAC			(0x261)
 #define CKM_SHA384_HMAC_GENERAL		(0x262)

diff --git a/src/lib/main.cpp b/src/lib/main.cpp
@@ -1271,6 +1271,10 @@ CK_RV C_DigestInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism) {
       mechSize = 20;
       hashFunc = new Botan::SHA_160;
       break;
+    case CKM_SHA224:
+      mechSize = 28;
+      hashFunc = new Botan::SHA_224;
+      break;
     case CKM_SHA256:
       mechSize = 32;
       hashFunc = new Botan::SHA_256;

diff --git a/src/lib/mechanisms.cpp b/src/lib/mechanisms.cpp
@@ -41,6 +41,7 @@ static CK_MECHANISM_TYPE supportedMechanisms[] = {
   CKM_MD5,
   CKM_RIPEMD160,
   CKM_SHA_1,
+  CKM_SHA224,
   CKM_SHA256,
   CKM_SHA384,
   CKM_SHA512,
@@ -108,6 +109,7 @@ CK_RV getMechanismInfo(CK_MECHANISM_TYPE type, CK_MECHANISM_INFO_PTR pInfo) {
     case CKM_MD5:
     case CKM_RIPEMD160:
     case CKM_SHA_1:
+    case CKM_SHA224:
     case CKM_SHA256:
     case CKM_SHA384:
     case CKM_SHA512: