Add support for PKCS#11 Version 3.2

Author: Frauschi

configure.ac

@@ -491,6 +491,20 @@ then
     AM_CFLAGS="$AM_CFLAGS -DWOLFPKCS11_PKCS11_V3_0"
 fi
 
+AC_ARG_ENABLE([pkcs11v32],
+    [AS_HELP_STRING([--enable-pkcs11v32],[Enable PKCS#11 Version 3.2 support (default: disabled)])],
+    [ ENABLED_PKCS11V3_2=$enableval ],
+    [ ENABLED_PKCS11V3_2=no ]
+    )
+if test "$ENABLED_PKCS11V3_2" = "yes"
+then
+    if test "$ENABLED_PKCS11V3_0" = "no"
+    then
+        ENABLED_PKCS11V3_0=yes
+    fi
+    AM_CFLAGS="$AM_CFLAGS -DWOLFPKCS11_PKCS11_V3_2"
+fi
+
 
 AM_CONDITIONAL([BUILD_STATIC],[test "x$enable_shared" = "xno"])
 
@@ -668,3 +682,4 @@ echo "   * HKDF:                       $ENABLED_HKDF"
 echo "   * NSS modifications:          $ENABLED_NSS"
 echo "   * Default token path:         $WOLFPKCS11_DEFAULT_TOKEN_PATH"
 echo "   * PKCS#11 Version 3.0:        $ENABLED_PKCS11V3_0"
+echo "   * PKCS#11 Version 3.2:        $ENABLED_PKCS11V3_2"

src/crypto.c

@@ -8306,3 +8306,99 @@ CK_RV C_MessageVerifyFinal(CK_SESSION_HANDLE hSession)
 }
 
 #endif /* defined WOLFPKCS11_PKCS11_V3_0 */
+
+#if defined (WOLFPKCS11_PKCS11_V3_2)
+
+CK_RV C_EncapsulateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                       CK_OBJECT_HANDLE hPublicKey, CK_ATTRIBUTE_PTR pTemplate,
+                       CK_ULONG ulAttributeCount, CK_OBJECT_HANDLE_PTR phKey,
+                       CK_BYTE_PTR pCiphertext, CK_ULONG_PTR pulCiphertextLen)
+{
+    if (!WP11_Library_IsInitialized())
+        return CKR_CRYPTOKI_NOT_INITIALIZED;
+
+    (void)hSession;
+    (void)pMechanism;
+    (void)hPublicKey;
+    (void)pTemplate;
+    (void)ulAttributeCount;
+    (void)phKey;
+    (void)pCiphertext;
+    (void)pulCiphertextLen;
+
+    return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV C_DecapsulateKey(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                       CK_OBJECT_HANDLE hPrivateKey, CK_BYTE_PTR pCiphertext,
+                       CK_ULONG ulCiphertextLen, CK_ATTRIBUTE_PTR pTemplate,
+                       CK_ULONG ulAttributeCount, CK_OBJECT_HANDLE_PTR phKey)
+{
+    if (!WP11_Library_IsInitialized())
+        return CKR_CRYPTOKI_NOT_INITIALIZED;
+
+    (void)hSession;
+    (void)pMechanism;
+    (void)hPrivateKey;
+    (void)pCiphertext;
+    (void)ulCiphertextLen;
+    (void)pTemplate;
+    (void)ulAttributeCount;
+    (void)phKey;
+
+    return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV C_VerifySignatureInit(CK_SESSION_HANDLE hSession, CK_MECHANISM_PTR pMechanism,
+                            CK_OBJECT_HANDLE hKey, CK_BYTE_PTR pSignature,
+                            CK_ULONG ulSignatureLen)
+{
+    if (!WP11_Library_IsInitialized())
+        return CKR_CRYPTOKI_NOT_INITIALIZED;
+
+    (void)hSession;
+    (void)pMechanism;
+    (void)hKey;
+    (void)pSignature;
+    (void)ulSignatureLen;
+
+    return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV C_VerifySignature(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pData,
+                        CK_ULONG ulDataLen)
+{
+    if (!WP11_Library_IsInitialized())
+        return CKR_CRYPTOKI_NOT_INITIALIZED;
+
+    (void)hSession;
+    (void)pData;
+    (void)ulDataLen;
+
+    return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV C_VerifySignatureUpdate(CK_SESSION_HANDLE hSession, CK_BYTE_PTR pPart,
+                              CK_ULONG ulPartLen)
+{
+    if (!WP11_Library_IsInitialized())
+        return CKR_CRYPTOKI_NOT_INITIALIZED;
+
+    (void)hSession;
+    (void)pPart;
+    (void)ulPartLen;
+
+    return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV C_VerifySignatureFinal(CK_SESSION_HANDLE hSession)
+{
+    if (!WP11_Library_IsInitialized())
+        return CKR_CRYPTOKI_NOT_INITIALIZED;
+
+    (void)hSession;
+
+    return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+#endif /* defined WOLFPKCS11_PKCS11_V3_2 */

src/slot.c

@@ -2047,3 +2047,61 @@ CK_RV C_SessionCancel(CK_SESSION_HANDLE hSession, CK_FLAGS flags)
 }
 
 #endif /* defined WOLFPKCS11_PKCS11_V3_0 */
+
+#if defined (WOLFPKCS11_PKCS11_V3_2)
+
+CK_RV C_GetSessionValidationFlags(CK_SESSION_HANDLE hSession, CK_ULONG type,
+                                  CK_FLAGS * pFlags)
+{
+    if (!WP11_Library_IsInitialized())
+        return CKR_CRYPTOKI_NOT_INITIALIZED;
+
+    (void)hSession;
+    (void)type;
+    (void)pFlags;
+
+    return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV C_AsyncComplete(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pFunctionName,
+                      CK_ASYNC_DATA_PTR pResult)
+{
+    if (!WP11_Library_IsInitialized())
+        return CKR_CRYPTOKI_NOT_INITIALIZED;
+
+    (void)hSession;
+    (void)pFunctionName;
+    (void)pResult;
+
+    return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV C_AsyncGetID(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pFunctionName,
+                   CK_ULONG_PTR pulID)
+{
+    if (!WP11_Library_IsInitialized())
+        return CKR_CRYPTOKI_NOT_INITIALIZED;
+
+    (void)hSession;
+    (void)pFunctionName;
+    (void)pulID;
+
+    return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+CK_RV C_AsyncJoin(CK_SESSION_HANDLE hSession, CK_UTF8CHAR_PTR pFunctionName,
+                  CK_ULONG ulID, CK_BYTE_PTR pData, CK_ULONG ulData)
+{
+    if (!WP11_Library_IsInitialized())
+        return CKR_CRYPTOKI_NOT_INITIALIZED;
+
+    (void)hSession;
+    (void)pFunctionName;
+    (void)ulID;
+    (void)pData;
+    (void)ulData;
+
+    return CKR_FUNCTION_NOT_SUPPORTED;
+}
+
+#endif /* defined WOLFPKCS11_PKCS11_V3_2 */