summaryrefslogtreecommitdiff
path: root/usr/src/uts/common/crypto/api
diff options
context:
space:
mode:
Diffstat (limited to 'usr/src/uts/common/crypto/api')
-rw-r--r--usr/src/uts/common/crypto/api/kcf_cipher.c27
-rw-r--r--usr/src/uts/common/crypto/api/kcf_digest.c17
-rw-r--r--usr/src/uts/common/crypto/api/kcf_dual.c38
-rw-r--r--usr/src/uts/common/crypto/api/kcf_keys.c32
-rw-r--r--usr/src/uts/common/crypto/api/kcf_mac.c22
-rw-r--r--usr/src/uts/common/crypto/api/kcf_miscapi.c16
-rw-r--r--usr/src/uts/common/crypto/api/kcf_sign.c27
-rw-r--r--usr/src/uts/common/crypto/api/kcf_verify.c27
8 files changed, 79 insertions, 127 deletions
diff --git a/usr/src/uts/common/crypto/api/kcf_cipher.c b/usr/src/uts/common/crypto/api/kcf_cipher.c
index 04eb1e70fd..80b0cf757a 100644
--- a/usr/src/uts/common/crypto/api/kcf_cipher.c
+++ b/usr/src/uts/common/crypto/api/kcf_cipher.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -122,14 +121,12 @@ crypto_cipher_init_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
if (func == CRYPTO_FG_ENCRYPT) {
error = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(cipher_ops),
- CRYPTO_CIPHER_OFFSET(encrypt_init),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_ENCRYPT);
} else {
error = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(cipher_ops),
- CRYPTO_CIPHER_OFFSET(decrypt_init),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_DECRYPT);
}
if (error != CRYPTO_SUCCESS)
@@ -296,9 +293,8 @@ crypto_encrypt_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
error = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(cipher_ops),
- CRYPTO_CIPHER_OFFSET(encrypt_atomic),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_ENCRYPT_ATOMIC);
if (error != CRYPTO_SUCCESS)
return (error);
@@ -573,9 +569,8 @@ crypto_decrypt_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(cipher_ops),
- CRYPTO_CIPHER_OFFSET(decrypt_atomic),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_DECRYPT_ATOMIC);
if (rv != CRYPTO_SUCCESS)
return (rv);
diff --git a/usr/src/uts/common/crypto/api/kcf_digest.c b/usr/src/uts/common/crypto/api/kcf_digest.c
index 0058af01b4..f74a811a79 100644
--- a/usr/src/uts/common/crypto/api/kcf_digest.c
+++ b/usr/src/uts/common/crypto/api/kcf_digest.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -109,9 +108,8 @@ crypto_digest_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(digest_ops),
- CRYPTO_DIGEST_OFFSET(digest_atomic), CHECK_RESTRICT(crq),
- pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq),
+ pd, &real_provider, CRYPTO_FG_DIGEST_ATOMIC);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -218,9 +216,8 @@ crypto_digest_init_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
error = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(digest_ops),
- CRYPTO_DIGEST_OFFSET(digest_init),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_DIGEST);
if (error != CRYPTO_SUCCESS)
return (error);
diff --git a/usr/src/uts/common/crypto/api/kcf_dual.c b/usr/src/uts/common/crypto/api/kcf_dual.c
index 2dc8b34a66..8b0e6b79e6 100644
--- a/usr/src/uts/common/crypto/api/kcf_dual.c
+++ b/usr/src/uts/common/crypto/api/kcf_dual.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -74,9 +73,8 @@ crypto_encrypt_mac_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(encr_mech->cm_type,
- mac_mech->cm_type, CRYPTO_OPS_OFFSET(dual_cipher_mac_ops),
- CRYPTO_CIPHER_MAC_OFFSET(encrypt_mac_atomic),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ mac_mech->cm_type, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_ENCRYPT_MAC_ATOMIC);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -441,9 +439,8 @@ crypto_encrypt_mac_init_prov(crypto_provider_t provider,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(encr_mech->cm_type,
- mac_mech->cm_type, CRYPTO_OPS_OFFSET(dual_cipher_mac_ops),
- CRYPTO_CIPHER_MAC_OFFSET(encrypt_mac_init),
- CHECK_RESTRICT(cr), pd, &real_provider);
+ mac_mech->cm_type, CHECK_RESTRICT(cr), pd, &real_provider,
+ CRYPTO_FG_ENCRYPT_MAC);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -1423,19 +1420,9 @@ crypto_mac_decrypt_common_prov(crypto_provider_t provider,
ASSERT(KCF_PROV_REFHELD(pd));
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
- if (do_verify) {
- error = kcf_get_hardware_provider(decr_mech->cm_type,
- mac_mech->cm_type,
- CRYPTO_OPS_OFFSET(dual_cipher_mac_ops),
- CRYPTO_CIPHER_MAC_OFFSET(mac_verify_decrypt_atomic),
- CHECK_RESTRICT(crq), pd, &real_provider);
- } else {
- error = kcf_get_hardware_provider(decr_mech->cm_type,
- mac_mech->cm_type,
- CRYPTO_OPS_OFFSET(dual_cipher_mac_ops),
- CRYPTO_CIPHER_MAC_OFFSET(mac_decrypt_atomic),
- CHECK_RESTRICT(crq), pd, &real_provider);
- }
+ error = kcf_get_hardware_provider(decr_mech->cm_type,
+ mac_mech->cm_type, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_MAC_DECRYPT_ATOMIC);
if (error != CRYPTO_SUCCESS)
return (error);
@@ -1883,9 +1870,8 @@ crypto_mac_decrypt_init_prov(crypto_provider_t provider,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(decr_mech->cm_type,
- mac_mech->cm_type, CRYPTO_OPS_OFFSET(dual_cipher_mac_ops),
- CRYPTO_CIPHER_MAC_OFFSET(mac_decrypt_init),
- CHECK_RESTRICT(cr), pd, &real_provider);
+ mac_mech->cm_type, CHECK_RESTRICT(cr), pd, &real_provider,
+ CRYPTO_FG_MAC_DECRYPT);
if (rv != CRYPTO_SUCCESS)
return (rv);
diff --git a/usr/src/uts/common/crypto/api/kcf_keys.c b/usr/src/uts/common/crypto/api/kcf_keys.c
index c95fd9f72d..eb83dcb2f2 100644
--- a/usr/src/uts/common/crypto/api/kcf_keys.c
+++ b/usr/src/uts/common/crypto/api/kcf_keys.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -55,9 +54,8 @@ crypto_key_generate(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(key_ops),
- CRYPTO_KEY_OFFSET(key_generate), CHECK_RESTRICT(crq),
- pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq),
+ pd, &real_provider, CRYPTO_FG_GENERATE);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -95,9 +93,8 @@ crypto_key_generate_pair(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(key_ops),
- CRYPTO_KEY_OFFSET(key_generate_pair), CHECK_RESTRICT(crq),
- pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq),
+ pd, &real_provider, CRYPTO_FG_GENERATE_KEY_PAIR);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -136,9 +133,8 @@ crypto_key_wrap(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(key_ops),
- CRYPTO_KEY_OFFSET(key_wrap), CHECK_RESTRICT(crq),
- pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq),
+ pd, &real_provider, CRYPTO_FG_WRAP);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -177,9 +173,8 @@ crypto_key_unwrap(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(key_ops),
- CRYPTO_KEY_OFFSET(key_unwrap), CHECK_RESTRICT(crq),
- pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq),
+ pd, &real_provider, CRYPTO_FG_UNWRAP);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -218,9 +213,8 @@ crypto_key_derive(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(key_ops),
- CRYPTO_KEY_OFFSET(key_derive), CHECK_RESTRICT(crq),
- pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq),
+ pd, &real_provider, CRYPTO_FG_DERIVE);
if (rv != CRYPTO_SUCCESS)
return (rv);
diff --git a/usr/src/uts/common/crypto/api/kcf_mac.c b/usr/src/uts/common/crypto/api/kcf_mac.c
index 57b2a7595f..c0d28a875c 100644
--- a/usr/src/uts/common/crypto/api/kcf_mac.c
+++ b/usr/src/uts/common/crypto/api/kcf_mac.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -109,9 +108,8 @@ crypto_mac_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(mac_ops),
- CRYPTO_MAC_OFFSET(mac_atomic),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_MAC_ATOMIC);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -223,9 +221,8 @@ crypto_mac_verify_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(mac_ops),
- CRYPTO_MAC_OFFSET(mac_verify_atomic),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_MAC_ATOMIC);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -370,9 +367,8 @@ crypto_mac_init_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(mac_ops),
- CRYPTO_MAC_OFFSET(mac_init),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_MAC);
if (rv != CRYPTO_SUCCESS)
return (rv);
diff --git a/usr/src/uts/common/crypto/api/kcf_miscapi.c b/usr/src/uts/common/crypto/api/kcf_miscapi.c
index 6242df6dc8..ca84a65c32 100644
--- a/usr/src/uts/common/crypto/api/kcf_miscapi.c
+++ b/usr/src/uts/common/crypto/api/kcf_miscapi.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -595,14 +594,9 @@ crypto_key_check_prov(crypto_provider_t provider, crypto_mechanism_t *mech,
(key->ck_format == CRYPTO_KEY_REFERENCE))
return (CRYPTO_ARGUMENTS_BAD);
+ /* no logical providers currently support the key check */
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
- rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(key_ops),
- CRYPTO_KEY_OFFSET(key_check), CHECK_RESTRICT_FALSE,
- pd, &real_provider);
-
- if (rv != CRYPTO_SUCCESS)
- return (rv);
+ return (CRYPTO_NOT_SUPPORTED);
}
lmech = *mech;
diff --git a/usr/src/uts/common/crypto/api/kcf_sign.c b/usr/src/uts/common/crypto/api/kcf_sign.c
index c098f0ca10..867e3b597b 100644
--- a/usr/src/uts/common/crypto/api/kcf_sign.c
+++ b/usr/src/uts/common/crypto/api/kcf_sign.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -61,9 +60,8 @@ crypto_sign_init_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(sign_ops),
- CRYPTO_SIGN_OFFSET(sign_init),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_SIGN);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -249,9 +247,8 @@ crypto_sign_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(sign_ops),
- CRYPTO_SIGN_OFFSET(sign_atomic), CHECK_RESTRICT(crq),
- pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq),
+ pd, &real_provider, CRYPTO_FG_SIGN_ATOMIC);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -370,9 +367,8 @@ crypto_sign_recover_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(sign_ops),
- CRYPTO_SIGN_OFFSET(sign_recover_atomic),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_SIGN_RECOVER_ATOMIC);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -410,9 +406,8 @@ crypto_sign_recover_init_prov(crypto_provider_t provider,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(sign_ops),
- CRYPTO_SIGN_OFFSET(sign_recover_init),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_SIGN_RECOVER);
if (rv != CRYPTO_SUCCESS)
return (rv);
diff --git a/usr/src/uts/common/crypto/api/kcf_verify.c b/usr/src/uts/common/crypto/api/kcf_verify.c
index dee7197df2..24c35ab50b 100644
--- a/usr/src/uts/common/crypto/api/kcf_verify.c
+++ b/usr/src/uts/common/crypto/api/kcf_verify.c
@@ -2,9 +2,8 @@
* CDDL HEADER START
*
* The contents of this file are subject to the terms of the
- * Common Development and Distribution License, Version 1.0 only
- * (the "License"). You may not use this file except in compliance
- * with the License.
+ * Common Development and Distribution License (the "License").
+ * You may not use this file except in compliance with the License.
*
* You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
* or http://www.opensolaris.org/os/licensing.
@@ -20,7 +19,7 @@
* CDDL HEADER END
*/
/*
- * Copyright 2005 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -61,9 +60,8 @@ crypto_verify_init_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(verify_ops),
- CRYPTO_VERIFY_OFFSET(verify_init),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_VERIFY);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -251,9 +249,8 @@ crypto_verify_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(verify_ops),
- CRYPTO_VERIFY_OFFSET(verify_atomic), CHECK_RESTRICT(crq),
- pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq),
+ pd, &real_provider, CRYPTO_FG_VERIFY_ATOMIC);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -372,9 +369,8 @@ crypto_verify_recover_prov(crypto_provider_t provider, crypto_session_id_t sid,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(verify_ops),
- CRYPTO_VERIFY_OFFSET(verify_recover_atomic),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_VERIFY_RECOVER_ATOMIC);
if (rv != CRYPTO_SUCCESS)
return (rv);
@@ -412,9 +408,8 @@ crypto_verify_recover_init_prov(crypto_provider_t provider,
if (pd->pd_prov_type == CRYPTO_LOGICAL_PROVIDER) {
rv = kcf_get_hardware_provider(mech->cm_type,
- CRYPTO_MECH_INVALID, CRYPTO_OPS_OFFSET(verify_ops),
- CRYPTO_VERIFY_OFFSET(verify_recover_init),
- CHECK_RESTRICT(crq), pd, &real_provider);
+ CRYPTO_MECH_INVALID, CHECK_RESTRICT(crq), pd,
+ &real_provider, CRYPTO_FG_VERIFY_RECOVER);
if (rv != CRYPTO_SUCCESS)
return (rv);