diff options
| author | LCPD Auto Merger <lcpd_integration@list.ti.com> | 2022-11-05 07:44:29 -0500 |
|---|---|---|
| committer | LCPD Auto Merger <lcpd_integration@list.ti.com> | 2022-11-05 07:44:29 -0500 |
| commit | 486865bf90055107f23226d4dcbab5176470a4f8 (patch) | |
| tree | 0778856bc7b651145cd3c47da6f7a820d51e692f /crypto | |
| parent | 95a1aa770323b43674362fde91d6935fb4ef9252 (diff) | |
| parent | 95aa34f72132ee42ee3f632a5540c84a5ee8624f (diff) | |
Merge branch 'linux-5.10.y' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux into ti-linux-5.10.y-cicd
* 'linux-5.10.y' of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux: (812 commits)
Linux 5.10.153
serial: Deassert Transmit Enable on probe in driver-specific way
serial: core: move RS485 configuration tasks from drivers into core
can: rcar_canfd: rcar_canfd_handle_global_receive(): fix IRQ storm on global FIFO receive
arm64/kexec: Test page size support with new TGRAN range values
arm64/mm: Fix __enable_mmu() for new TGRAN range values
scsi: sd: Revert "scsi: sd: Remove a local variable"
arm64: Add AMPERE1 to the Spectre-BHB affected list
net: enetc: survive memory pressure without crashing
net/mlx5: Fix crash during sync firmware reset
net/mlx5: Fix possible use-after-free in async command interface
net/mlx5e: Do not increment ESN when updating IPsec ESN state
nh: fix scope used to find saddr when adding non gw nh
net: ehea: fix possible memory leak in ehea_register_port()
openvswitch: switch from WARN to pr_warn
ALSA: aoa: Fix I2S device accounting
ALSA: aoa: i2sbus: fix possible memory leak in i2sbus_add_dev()
net: fec: limit register access on i.MX6UL
PM: domains: Fix handling of unavailable/disabled idle states
net: ksz884x: fix missing pci_disable_device() on error in pcidev_init()
...
Signed-off-by: LCPD Auto Merger <lcpd_integration@list.ti.com>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/akcipher.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/crypto/akcipher.c b/crypto/akcipher.c index f866085c8a4a..ab975a420e1e 100644 --- a/crypto/akcipher.c +++ b/crypto/akcipher.c @@ -120,6 +120,12 @@ static int akcipher_default_op(struct akcipher_request *req) return -ENOSYS; } +static int akcipher_default_set_key(struct crypto_akcipher *tfm, + const void *key, unsigned int keylen) +{ + return -ENOSYS; +} + int crypto_register_akcipher(struct akcipher_alg *alg) { struct crypto_alg *base = &alg->base; @@ -132,6 +138,8 @@ int crypto_register_akcipher(struct akcipher_alg *alg) alg->encrypt = akcipher_default_op; if (!alg->decrypt) alg->decrypt = akcipher_default_op; + if (!alg->set_priv_key) + alg->set_priv_key = akcipher_default_set_key; akcipher_prepare_alg(alg); return crypto_register_alg(base); |