diff options
Diffstat (limited to 'usr/src/uts/common/crypto/api/kcf_dual.c')
| -rw-r--r-- | usr/src/uts/common/crypto/api/kcf_dual.c | 38 |
1 files changed, 12 insertions, 26 deletions
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); |