Commit ea993de1 authored by zhenwei pi's avatar zhenwei pi Committed by Michael S. Tsirkin
Browse files

virtio-crypto: rename skcipher algs 



Suggested by Gonglei, rename virtio_crypto_algs.c to
virtio_crypto_skcipher_algs.c. Also minor changes for function name.
Thus the function of source files get clear: skcipher services in
virtio_crypto_skcipher_algs.c and akcipher services in
virtio_crypto_akcipher_algs.c.

Signed-off-by: default avatarzhenwei pi <pizhenwei@bytedance.com>
Link: https://lore.kernel.org/r/20220302033917.1295334-5-pizhenwei@bytedance.com


Signed-off-by: default avatarMichael S. Tsirkin <mst@redhat.com>
Reviewed-by: default avatarGonglei <arei.gonglei@huawei.com>
parent 59ca6c93

drivers/crypto/virtio/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

obj-$(CONFIG_CRYPTO_DEV_VIRTIO) += virtio_crypto.o

virtio_crypto-objs := \

	virtio_crypto_algs.o \

	virtio_crypto_skcipher_algs.o \

	virtio_crypto_akcipher_algs.o \

	virtio_crypto_mgr.o \

	virtio_crypto_core.o

drivers/crypto/virtio/virtio_crypto_common.h

+2 −2
Original line number Diff line number Diff line
@@ -130,8 +130,8 @@ static inline int virtio_crypto_get_current_node(void) 
	return node;

}



int virtio_crypto_algs_register(struct virtio_crypto *vcrypto);

void virtio_crypto_algs_unregister(struct virtio_crypto *vcrypto);

int virtio_crypto_skcipher_algs_register(struct virtio_crypto *vcrypto);

void virtio_crypto_skcipher_algs_unregister(struct virtio_crypto *vcrypto);

int virtio_crypto_akcipher_algs_register(struct virtio_crypto *vcrypto);

void virtio_crypto_akcipher_algs_unregister(struct virtio_crypto *vcrypto);

drivers/crypto/virtio/virtio_crypto_mgr.c

+4 −4
Original line number Diff line number Diff line
@@ -237,14 +237,14 @@ struct virtio_crypto *virtcrypto_get_dev_node(int node, uint32_t service, 
 */

int virtcrypto_dev_start(struct virtio_crypto *vcrypto)

{

	if (virtio_crypto_algs_register(vcrypto)) {

		pr_err("virtio_crypto: Failed to register crypto algs\n");

	if (virtio_crypto_skcipher_algs_register(vcrypto)) {

		pr_err("virtio_crypto: Failed to register crypto skcipher algs\n");

		return -EFAULT;

	}



	if (virtio_crypto_akcipher_algs_register(vcrypto)) {

		pr_err("virtio_crypto: Failed to register crypto akcipher algs\n");

		virtio_crypto_algs_unregister(vcrypto);

		virtio_crypto_skcipher_algs_unregister(vcrypto);

		return -EFAULT;

	}
@@ -263,7 +263,7 @@ int virtcrypto_dev_start(struct virtio_crypto *vcrypto) 
 */

void virtcrypto_dev_stop(struct virtio_crypto *vcrypto)

{

	virtio_crypto_algs_unregister(vcrypto);

	virtio_crypto_skcipher_algs_unregister(vcrypto);

	virtio_crypto_akcipher_algs_unregister(vcrypto);

}

drivers/crypto/virtio/virtio_crypto_algs.c→drivers/crypto/virtio/virtio_crypto_skcipher_algs.c

+2 −2
Original line number Diff line number Diff line
@@ -613,7 +613,7 @@ static struct virtio_crypto_algo virtio_crypto_algs[] = { { 
	},

} };



int virtio_crypto_algs_register(struct virtio_crypto *vcrypto)

int virtio_crypto_skcipher_algs_register(struct virtio_crypto *vcrypto)

{

	int ret = 0;

	int i = 0;
@@ -644,7 +644,7 @@ int virtio_crypto_algs_register(struct virtio_crypto *vcrypto) 
	return ret;

}



void virtio_crypto_algs_unregister(struct virtio_crypto *vcrypto)

void virtio_crypto_skcipher_algs_unregister(struct virtio_crypto *vcrypto)

{

	int i = 0;