Changes in 4.9.203 ax88172a: fix information leak on short answers slip: Fix memory leak in slip_open error path ALSA: usb-audio: Fix missing error check at mixer resolution test ALSA: usb-audio: not submit urb for stopped endpoint Input: ff-memless - kill timer in destroy() Input: synaptics-rmi4 - fix video buffer size Input: synaptics-rmi4 - clear IRQ enables for F54 Input: synaptics-rmi4 - destroy F54 poller workqueue when removing IB/hfi1: Ensure full Gen3 speed in a Gen4 system ecryptfs_lookup_interpose(): lower_dentry->d_inode is not stable ecryptfs_lookup_interpose(): lower_dentry->d_parent is not stable either iommu/vt-d: Fix QI_DEV_IOTLB_PFSID and QI_DEV_EIOTLB_PFSID macros mm: memcg: switch to css_tryget() in get_mem_cgroup_from_mm() mm: hugetlb: switch to css_tryget() in hugetlb_cgroup_charge_cgroup() mmc: sdhci-of-at91: fix quirk2 overwrite ath10k: fix kernel panic by moving pci flush after napi_disable iio: dac: mcp4922: fix error handling in mcp4922_write_raw ALSA: pcm: signedness bug in snd_pcm_plug_alloc() arm64: dts: tegra210-p2180: Correct sdmmc4 vqmmc-supply ARM: dts: at91/trivial: Fix USART1 definition for at91sam9g45 cfg80211: Avoid regulatory restore when COUNTRY_IE_IGNORE is set ALSA: seq: Do error checks at creating system ports ath9k: fix tx99 with monitor mode interface gfs2: Don't set GFS2_RDF_UPTODATE when the lvb is updated ASoC: dpcm: Properly initialise hw->rate_max MIPS: BCM47XX: Enable USB power on Netgear WNDR3400v3 ARM: dts: exynos: Fix sound in Snow-rev5 Chromebook ARM: dts: exynos: Fix regulators configuration on Peach Pi/Pit Chromebooks i40e: use correct length for strncpy i40e: hold the rtnl lock on clearing interrupt scheme i40e: Prevent deleting MAC address from VF when set by PF IB/rxe: fixes for rdma read retry iwlwifi: mvm: avoid sending too many BARs ARM: dts: pxa: fix power i2c base address rtl8187: Fix warning generated when strncpy() destination length matches the sixe argument net: lan78xx: Bail out if lan78xx_get_endpoints fails ASoC: sgtl5000: avoid division by zero if lo_vag is zero ARM: dts: exynos: Disable pull control for S5M8767 PMIC ath10k: wmi: disable softirq's while calling ieee80211_rx mips: txx9: fix iounmap related issue ASoC: Intel: hdac_hdmi: Limit sampling rates at dai creation of: make PowerMac cache node search conditional on CONFIG_PPC_PMAC ARM: dts: omap3-gta04: give spi_lcd node a label so that we can overwrite in other DTS files ARM: dts: omap3-gta04: fixes for tvout / venc ARM: dts: omap3-gta04: tvout: enable as display1 alias ARM: dts: omap3-gta04: fix touchscreen tsc2007 ARM: dts: omap3-gta04: make NAND partitions compatible with recent U-Boot ARM: dts: omap3-gta04: keep vpll2 always on dmaengine: dma-jz4780: Don't depend on MACH_JZ4780 dmaengine: dma-jz4780: Further residue status fix ath9k: add back support for using active monitor interfaces for tx99 signal: Always ignore SIGKILL and SIGSTOP sent to the global init signal: Properly deliver SIGILL from uprobes signal: Properly deliver SIGSEGV from x86 uprobes f2fs: fix memory leak of percpu counter in fill_super() scsi: sym53c8xx: fix NULL pointer dereference panic in sym_int_sir() ARM: imx6: register pm_power_off handler if "fsl,pmic-stby-poweroff" is set scsi: pm80xx: Corrected dma_unmap_sg() parameter scsi: pm80xx: Fixed system hang issue during kexec boot kprobes: Don't call BUG_ON() if there is a kprobe in use on free list nvmem: core: return error code instead of NULL from nvmem_device_get media: fix: media: pci: meye: validate offset to avoid arbitrary access media: dvb: fix compat ioctl translation ALSA: intel8x0m: Register irq handler after register initializations pinctrl: at91-pio4: fix has_config check in atmel_pctl_dt_subnode_to_map() llc: avoid blocking in llc_sap_close() ARM: dts: qcom: ipq4019: fix cpu0's qcom,saw2 reg value powerpc/vdso: Correct call frame information ARM: dts: socfpga: Fix I2C bus unit-address error pinctrl: at91: don't use the same irqchip with multiple gpiochips cxgb4: Fix endianness issue in t4_fwcache() power: supply: ab8500_fg: silence uninitialized variable warnings power: reset: at91-poweroff: do not procede if at91_shdwc is allocated power: supply: max8998-charger: Fix platform data retrieval component: fix loop condition to call unbind() if bind() fails kernfs: Fix range checks in kernfs_get_target_path ip_gre: fix parsing gre header in ipgre_err ARM: dts: rockchip: Fix erroneous SPI bus dtc warnings on rk3036 ath9k: Fix a locking bug in ath9k_add_interface() s390/qeth: invoke softirqs after napi_schedule() PCI/ACPI: Correct error message for ASPM disabling serial: mxs-auart: Fix potential infinite loop powerpc/iommu: Avoid derefence before pointer check powerpc/64s/hash: Fix stab_rr off by one initialization powerpc/pseries: Disable CPU hotplug across migrations RDMA/i40iw: Fix incorrect iterator type libfdt: Ensure INT_MAX is defined in libfdt_env.h power: supply: twl4030_charger: fix charging current out-of-bounds power: supply: twl4030_charger: disable eoc interrupt on linear charge net: toshiba: fix return type of ndo_start_xmit function net: xilinx: fix return type of ndo_start_xmit function net: broadcom: fix return type of ndo_start_xmit function net: amd: fix return type of ndo_start_xmit function usb: chipidea: imx: enable OTG overcurrent in case USB subsystem is already started usb: chipidea: Fix otg event handler mlxsw: spectrum: Init shaper for TCs 8..15 ARM: dts: am335x-evm: fix number of cpsw f2fs: fix to recover inode's uid/gid during POR ARM: dts: ux500: Correct SCU unit address ARM: dts: ux500: Fix LCDA clock line muxing ARM: dts: ste: Fix SPI controller node names spi: pic32: Use proper enum in dmaengine_prep_slave_rg cpufeature: avoid warning when compiling with clang ARM: dts: marvell: Fix SPI and I2C bus warnings bnx2x: Ignore bandwidth attention in single function mode net: micrel: fix return type of ndo_start_xmit function x86/CPU: Use correct macros for Cyrix calls MIPS: kexec: Relax memory restriction media: pci: ivtv: Fix a sleep-in-atomic-context bug in ivtv_yuv_init() media: au0828: Fix incorrect error messages media: davinci: Fix implicit enum conversion warning usb: gadget: uvc: configfs: Drop leaked references to config items usb: gadget: uvc: configfs: Prevent format changes after linking header phy: phy-twl4030-usb: fix denied runtime access usb: gadget: uvc: Factor out video USB request queueing usb: gadget: uvc: Only halt video streaming endpoint in bulk mode coresight: Fix handling of sinks coresight: etm4x: Configure EL2 exception level when kernel is running in HYP coresight: tmc: Fix byte-address alignment for RRP misc: kgdbts: Fix restrict error misc: genwqe: should return proper error value. vfio/pci: Fix potential memory leak in vfio_msi_cap_len vfio/pci: Mask buggy SR-IOV VF INTx support scsi: libsas: always unregister the old device if going to discover new ARM: dts: tegra30: fix xcvr-setup-use-fuses ARM: tegra: apalis_t30: fix mmc1 cmd pull-up ARM: dts: paz00: fix wakeup gpio keycode net: smsc: fix return type of ndo_start_xmit function EDAC: Raise the maximum number of memory controllers ARM: dts: realview: Fix SPI controller node names Bluetooth: L2CAP: Detect if remote is not able to use the whole MPS crypto: s5p-sss: Fix Fix argument list alignment crypto: fix a memory leak in rsa-kcs1pad's encryption mode scsi: NCR5380: Clear all unissued commands on host reset scsi: NCR5380: Use DRIVER_SENSE to indicate valid sense data scsi: NCR5380: Check for invalid reselection target scsi: NCR5380: Don't clear busy flag when abort fails scsi: NCR5380: Don't call dsprintk() following reselection interrupt scsi: NCR5380: Handle BUS FREE during reselection arm64: dts: amd: Fix SPI bus warnings arm64: dts: lg: Fix SPI controller node names ARM: dts: lpc32xx: Fix SPI controller node names usb: xhci-mtk: fix ISOC error when interval is zero fuse: use READ_ONCE on congestion_threshold and max_background IB/iser: Fix possible NULL deref at iser_inv_desc() memfd: Use radix_tree_deref_slot_protected to avoid the warning. slcan: Fix memory leak in error path net: cdc_ncm: Signedness bug in cdc_ncm_set_dgram_size() x86/atomic: Fix smp_mb__{before,after}_atomic() kprobes/x86: Prohibit probing on exception masking instructions uprobes/x86: Prohibit probing on MOV SS instruction fbdev: Ditch fb_edid_add_monspecs block: introduce blk_rq_is_passthrough libata: have ata_scsi_rw_xlat() fail invalid passthrough requests net: ovs: fix return type of ndo_start_xmit function net: xen-netback: fix return type of ndo_start_xmit function ARM: dts: omap5: enable OTG role for DWC3 controller f2fs: return correct errno in f2fs_gc SUNRPC: Fix priority queue fairness kvm: arm/arm64: Fix stage2_flush_memslot for 4 level page table arm64/numa: Report correct memblock range for the dummy node ath10k: fix vdev-start timeout on error ata: ahci_brcm: Allow using driver or DSL SoCs ath9k: fix reporting calculated new FFT upper max usb: gadget: udc: fotg210-udc: Fix a sleep-in-atomic-context bug in fotg210_get_status() nl80211: Fix a GET_KEY reply attribute dmaengine: ep93xx: Return proper enum in ep93xx_dma_chan_direction dmaengine: timb_dma: Use proper enum in td_prep_slave_sg mei: samples: fix a signedness bug in amt_host_if_call() cxgb4: Use proper enum in cxgb4_dcb_handle_fw_update cxgb4: Use proper enum in IEEE_FAUX_SYNC powerpc/pseries: Fix DTL buffer registration powerpc/pseries: Fix how we iterate over the DTL entries mtd: rawnand: sh_flctl: Use proper enum for flctl_dma_fifo0_transfer ixgbe: Fix crash with VFs and flow director on interface flap IB/mthca: Fix error return code in __mthca_init_one() IB/mlx4: Avoid implicit enumerated type conversion ACPICA: Never run _REG on system_memory and system_IO ata: ep93xx: Use proper enums for directions media: pxa_camera: Fix check for pdev->dev.of_node ALSA: hda/sigmatel - Disable automute for Elo VuPoint KVM: PPC: Book3S PR: Exiting split hack mode needs to fixup both PC and LR USB: serial: cypress_m8: fix interrupt-out transfer length mtd: physmap_of: Release resources on error cpu/SMT: State SMT is disabled even with nosmt and without "=force" brcmfmac: reduce timeout for action frame scan brcmfmac: fix full timeout waiting for action frame on-channel tx clk: samsung: Use clk_hw API for calling clk framework from clk notifiers i2c: brcmstb: Allow enabling the driver on DSL SoCs NFSv4.x: fix lock recovery during delegation recall dmaengine: ioat: fix prototype of ioat_enumerate_channels Input: st1232 - set INPUT_PROP_DIRECT property Input: silead - try firmware reload after unsuccessful resume x86/olpc: Fix build error with CONFIG_MFD_CS5535=m crypto: mxs-dcp - Fix SHA null hashes and output length crypto: mxs-dcp - Fix AES issues ACPI / SBS: Fix rare oops when removing modules iwlwifi: mvm: don't send keys when entering D3 fbdev: sbuslib: use checked version of put_user() fbdev: sbuslib: integer overflow in sbusfb_ioctl_helper() reset: Fix potential use-after-free in __of_reset_control_get() bcache: recal cached_dev_sectors on detach s390/kasan: avoid vdso instrumentation proc/vmcore: Fix i386 build error of missing copy_oldmem_page_encrypted() backlight: lm3639: Unconditionally call led_classdev_unregister mfd: ti_am335x_tscadc: Keep ADC interface on if child is wakeup capable printk: Give error on attempt to set log buffer length to over 2G media: isif: fix a NULL pointer dereference bug GFS2: Flush the GFS2 delete workqueue before stopping the kernel threads media: cx231xx: fix potential sign-extension overflow on large shift x86/kexec: Correct KEXEC_BACKUP_SRC_END off-by-one error gpio: syscon: Fix possible NULL ptr usage spi: spidev: Fix OF tree warning logic ARM: 8802/1: Call syscall_trace_exit even when system call skipped orangefs: rate limit the client not running info message hwmon: (pwm-fan) Silence error on probe deferral hwmon: (ina3221) Fix INA3221_CONFIG_MODE macros misc: cxl: Fix possible null pointer dereference mac80211: minstrel: fix CCK rate group streams value spi: rockchip: initialize dma_slave_config properly ARM: dts: omap5: Fix dual-role mode on Super-Speed port arm64: uaccess: Ensure PAN is re-enabled after unhandled uaccess fault Linux 4.9.203 Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
694 lines
17 KiB
C
694 lines
17 KiB
C
/*
|
|
* RSA padding templates.
|
|
*
|
|
* Copyright (c) 2015 Intel Corporation
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify it
|
|
* under the terms of the GNU General Public License as published by the Free
|
|
* Software Foundation; either version 2 of the License, or (at your option)
|
|
* any later version.
|
|
*/
|
|
|
|
#include <crypto/algapi.h>
|
|
#include <crypto/akcipher.h>
|
|
#include <crypto/internal/akcipher.h>
|
|
#include <linux/err.h>
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/module.h>
|
|
#include <linux/random.h>
|
|
|
|
/*
|
|
* Hash algorithm OIDs plus ASN.1 DER wrappings [RFC4880 sec 5.2.2].
|
|
*/
|
|
static const u8 rsa_digest_info_md5[] = {
|
|
0x30, 0x20, 0x30, 0x0c, 0x06, 0x08,
|
|
0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x02, 0x05, /* OID */
|
|
0x05, 0x00, 0x04, 0x10
|
|
};
|
|
|
|
static const u8 rsa_digest_info_sha1[] = {
|
|
0x30, 0x21, 0x30, 0x09, 0x06, 0x05,
|
|
0x2b, 0x0e, 0x03, 0x02, 0x1a,
|
|
0x05, 0x00, 0x04, 0x14
|
|
};
|
|
|
|
static const u8 rsa_digest_info_rmd160[] = {
|
|
0x30, 0x21, 0x30, 0x09, 0x06, 0x05,
|
|
0x2b, 0x24, 0x03, 0x02, 0x01,
|
|
0x05, 0x00, 0x04, 0x14
|
|
};
|
|
|
|
static const u8 rsa_digest_info_sha224[] = {
|
|
0x30, 0x2d, 0x30, 0x0d, 0x06, 0x09,
|
|
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x04,
|
|
0x05, 0x00, 0x04, 0x1c
|
|
};
|
|
|
|
static const u8 rsa_digest_info_sha256[] = {
|
|
0x30, 0x31, 0x30, 0x0d, 0x06, 0x09,
|
|
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01,
|
|
0x05, 0x00, 0x04, 0x20
|
|
};
|
|
|
|
static const u8 rsa_digest_info_sha384[] = {
|
|
0x30, 0x41, 0x30, 0x0d, 0x06, 0x09,
|
|
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x02,
|
|
0x05, 0x00, 0x04, 0x30
|
|
};
|
|
|
|
static const u8 rsa_digest_info_sha512[] = {
|
|
0x30, 0x51, 0x30, 0x0d, 0x06, 0x09,
|
|
0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x03,
|
|
0x05, 0x00, 0x04, 0x40
|
|
};
|
|
|
|
static const struct rsa_asn1_template {
|
|
const char *name;
|
|
const u8 *data;
|
|
size_t size;
|
|
} rsa_asn1_templates[] = {
|
|
#define _(X) { #X, rsa_digest_info_##X, sizeof(rsa_digest_info_##X) }
|
|
_(md5),
|
|
_(sha1),
|
|
_(rmd160),
|
|
_(sha256),
|
|
_(sha384),
|
|
_(sha512),
|
|
_(sha224),
|
|
{ NULL }
|
|
#undef _
|
|
};
|
|
|
|
static const struct rsa_asn1_template *rsa_lookup_asn1(const char *name)
|
|
{
|
|
const struct rsa_asn1_template *p;
|
|
|
|
for (p = rsa_asn1_templates; p->name; p++)
|
|
if (strcmp(name, p->name) == 0)
|
|
return p;
|
|
return NULL;
|
|
}
|
|
|
|
struct pkcs1pad_ctx {
|
|
struct crypto_akcipher *child;
|
|
unsigned int key_size;
|
|
};
|
|
|
|
struct pkcs1pad_inst_ctx {
|
|
struct crypto_akcipher_spawn spawn;
|
|
const struct rsa_asn1_template *digest_info;
|
|
};
|
|
|
|
struct pkcs1pad_request {
|
|
struct scatterlist in_sg[2], out_sg[1];
|
|
uint8_t *in_buf, *out_buf;
|
|
struct akcipher_request child_req;
|
|
};
|
|
|
|
static int pkcs1pad_set_pub_key(struct crypto_akcipher *tfm, const void *key,
|
|
unsigned int keylen)
|
|
{
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
int err;
|
|
|
|
ctx->key_size = 0;
|
|
|
|
err = crypto_akcipher_set_pub_key(ctx->child, key, keylen);
|
|
if (err)
|
|
return err;
|
|
|
|
/* Find out new modulus size from rsa implementation */
|
|
err = crypto_akcipher_maxsize(ctx->child);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (err > PAGE_SIZE)
|
|
return -ENOTSUPP;
|
|
|
|
ctx->key_size = err;
|
|
return 0;
|
|
}
|
|
|
|
static int pkcs1pad_set_priv_key(struct crypto_akcipher *tfm, const void *key,
|
|
unsigned int keylen)
|
|
{
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
int err;
|
|
|
|
ctx->key_size = 0;
|
|
|
|
err = crypto_akcipher_set_priv_key(ctx->child, key, keylen);
|
|
if (err)
|
|
return err;
|
|
|
|
/* Find out new modulus size from rsa implementation */
|
|
err = crypto_akcipher_maxsize(ctx->child);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (err > PAGE_SIZE)
|
|
return -ENOTSUPP;
|
|
|
|
ctx->key_size = err;
|
|
return 0;
|
|
}
|
|
|
|
static int pkcs1pad_get_max_size(struct crypto_akcipher *tfm)
|
|
{
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
|
|
/*
|
|
* The maximum destination buffer size for the encrypt/sign operations
|
|
* will be the same as for RSA, even though it's smaller for
|
|
* decrypt/verify.
|
|
*/
|
|
|
|
return ctx->key_size ?: -EINVAL;
|
|
}
|
|
|
|
static void pkcs1pad_sg_set_buf(struct scatterlist *sg, void *buf, size_t len,
|
|
struct scatterlist *next)
|
|
{
|
|
int nsegs = next ? 2 : 1;
|
|
|
|
sg_init_table(sg, nsegs);
|
|
sg_set_buf(sg, buf, len);
|
|
|
|
if (next)
|
|
sg_chain(sg, nsegs, next);
|
|
}
|
|
|
|
static int pkcs1pad_encrypt_sign_complete(struct akcipher_request *req, int err)
|
|
{
|
|
struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
struct pkcs1pad_request *req_ctx = akcipher_request_ctx(req);
|
|
unsigned int pad_len;
|
|
unsigned int len;
|
|
u8 *out_buf;
|
|
|
|
if (err)
|
|
goto out;
|
|
|
|
len = req_ctx->child_req.dst_len;
|
|
pad_len = ctx->key_size - len;
|
|
|
|
/* Four billion to one */
|
|
if (likely(!pad_len))
|
|
goto out;
|
|
|
|
out_buf = kzalloc(ctx->key_size, GFP_ATOMIC);
|
|
err = -ENOMEM;
|
|
if (!out_buf)
|
|
goto out;
|
|
|
|
sg_copy_to_buffer(req->dst, sg_nents_for_len(req->dst, len),
|
|
out_buf + pad_len, len);
|
|
sg_copy_from_buffer(req->dst,
|
|
sg_nents_for_len(req->dst, ctx->key_size),
|
|
out_buf, ctx->key_size);
|
|
kzfree(out_buf);
|
|
|
|
out:
|
|
req->dst_len = ctx->key_size;
|
|
|
|
kfree(req_ctx->in_buf);
|
|
|
|
return err;
|
|
}
|
|
|
|
static void pkcs1pad_encrypt_sign_complete_cb(
|
|
struct crypto_async_request *child_async_req, int err)
|
|
{
|
|
struct akcipher_request *req = child_async_req->data;
|
|
struct crypto_async_request async_req;
|
|
|
|
if (err == -EINPROGRESS)
|
|
return;
|
|
|
|
async_req.data = req->base.data;
|
|
async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req));
|
|
async_req.flags = child_async_req->flags;
|
|
req->base.complete(&async_req,
|
|
pkcs1pad_encrypt_sign_complete(req, err));
|
|
}
|
|
|
|
static int pkcs1pad_encrypt(struct akcipher_request *req)
|
|
{
|
|
struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
struct pkcs1pad_request *req_ctx = akcipher_request_ctx(req);
|
|
int err;
|
|
unsigned int i, ps_end;
|
|
|
|
if (!ctx->key_size)
|
|
return -EINVAL;
|
|
|
|
if (req->src_len > ctx->key_size - 11)
|
|
return -EOVERFLOW;
|
|
|
|
if (req->dst_len < ctx->key_size) {
|
|
req->dst_len = ctx->key_size;
|
|
return -EOVERFLOW;
|
|
}
|
|
|
|
req_ctx->in_buf = kmalloc(ctx->key_size - 1 - req->src_len,
|
|
GFP_KERNEL);
|
|
if (!req_ctx->in_buf)
|
|
return -ENOMEM;
|
|
|
|
ps_end = ctx->key_size - req->src_len - 2;
|
|
req_ctx->in_buf[0] = 0x02;
|
|
for (i = 1; i < ps_end; i++)
|
|
req_ctx->in_buf[i] = 1 + prandom_u32_max(255);
|
|
req_ctx->in_buf[ps_end] = 0x00;
|
|
|
|
pkcs1pad_sg_set_buf(req_ctx->in_sg, req_ctx->in_buf,
|
|
ctx->key_size - 1 - req->src_len, req->src);
|
|
|
|
akcipher_request_set_tfm(&req_ctx->child_req, ctx->child);
|
|
akcipher_request_set_callback(&req_ctx->child_req, req->base.flags,
|
|
pkcs1pad_encrypt_sign_complete_cb, req);
|
|
|
|
/* Reuse output buffer */
|
|
akcipher_request_set_crypt(&req_ctx->child_req, req_ctx->in_sg,
|
|
req->dst, ctx->key_size - 1, req->dst_len);
|
|
|
|
err = crypto_akcipher_encrypt(&req_ctx->child_req);
|
|
if (err != -EINPROGRESS &&
|
|
(err != -EBUSY ||
|
|
!(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
|
|
return pkcs1pad_encrypt_sign_complete(req, err);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int pkcs1pad_decrypt_complete(struct akcipher_request *req, int err)
|
|
{
|
|
struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
struct pkcs1pad_request *req_ctx = akcipher_request_ctx(req);
|
|
unsigned int dst_len;
|
|
unsigned int pos;
|
|
u8 *out_buf;
|
|
|
|
if (err)
|
|
goto done;
|
|
|
|
err = -EINVAL;
|
|
dst_len = req_ctx->child_req.dst_len;
|
|
if (dst_len < ctx->key_size - 1)
|
|
goto done;
|
|
|
|
out_buf = req_ctx->out_buf;
|
|
if (dst_len == ctx->key_size) {
|
|
if (out_buf[0] != 0x00)
|
|
/* Decrypted value had no leading 0 byte */
|
|
goto done;
|
|
|
|
dst_len--;
|
|
out_buf++;
|
|
}
|
|
|
|
if (out_buf[0] != 0x02)
|
|
goto done;
|
|
|
|
for (pos = 1; pos < dst_len; pos++)
|
|
if (out_buf[pos] == 0x00)
|
|
break;
|
|
if (pos < 9 || pos == dst_len)
|
|
goto done;
|
|
pos++;
|
|
|
|
err = 0;
|
|
|
|
if (req->dst_len < dst_len - pos)
|
|
err = -EOVERFLOW;
|
|
req->dst_len = dst_len - pos;
|
|
|
|
if (!err)
|
|
sg_copy_from_buffer(req->dst,
|
|
sg_nents_for_len(req->dst, req->dst_len),
|
|
out_buf + pos, req->dst_len);
|
|
|
|
done:
|
|
kzfree(req_ctx->out_buf);
|
|
|
|
return err;
|
|
}
|
|
|
|
static void pkcs1pad_decrypt_complete_cb(
|
|
struct crypto_async_request *child_async_req, int err)
|
|
{
|
|
struct akcipher_request *req = child_async_req->data;
|
|
struct crypto_async_request async_req;
|
|
|
|
if (err == -EINPROGRESS)
|
|
return;
|
|
|
|
async_req.data = req->base.data;
|
|
async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req));
|
|
async_req.flags = child_async_req->flags;
|
|
req->base.complete(&async_req, pkcs1pad_decrypt_complete(req, err));
|
|
}
|
|
|
|
static int pkcs1pad_decrypt(struct akcipher_request *req)
|
|
{
|
|
struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
struct pkcs1pad_request *req_ctx = akcipher_request_ctx(req);
|
|
int err;
|
|
|
|
if (!ctx->key_size || req->src_len != ctx->key_size)
|
|
return -EINVAL;
|
|
|
|
req_ctx->out_buf = kmalloc(ctx->key_size, GFP_KERNEL);
|
|
if (!req_ctx->out_buf)
|
|
return -ENOMEM;
|
|
|
|
pkcs1pad_sg_set_buf(req_ctx->out_sg, req_ctx->out_buf,
|
|
ctx->key_size, NULL);
|
|
|
|
akcipher_request_set_tfm(&req_ctx->child_req, ctx->child);
|
|
akcipher_request_set_callback(&req_ctx->child_req, req->base.flags,
|
|
pkcs1pad_decrypt_complete_cb, req);
|
|
|
|
/* Reuse input buffer, output to a new buffer */
|
|
akcipher_request_set_crypt(&req_ctx->child_req, req->src,
|
|
req_ctx->out_sg, req->src_len,
|
|
ctx->key_size);
|
|
|
|
err = crypto_akcipher_decrypt(&req_ctx->child_req);
|
|
if (err != -EINPROGRESS &&
|
|
(err != -EBUSY ||
|
|
!(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
|
|
return pkcs1pad_decrypt_complete(req, err);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int pkcs1pad_sign(struct akcipher_request *req)
|
|
{
|
|
struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
struct pkcs1pad_request *req_ctx = akcipher_request_ctx(req);
|
|
struct akcipher_instance *inst = akcipher_alg_instance(tfm);
|
|
struct pkcs1pad_inst_ctx *ictx = akcipher_instance_ctx(inst);
|
|
const struct rsa_asn1_template *digest_info = ictx->digest_info;
|
|
int err;
|
|
unsigned int ps_end, digest_size = 0;
|
|
|
|
if (!ctx->key_size)
|
|
return -EINVAL;
|
|
|
|
digest_size = digest_info->size;
|
|
|
|
if (req->src_len + digest_size > ctx->key_size - 11)
|
|
return -EOVERFLOW;
|
|
|
|
if (req->dst_len < ctx->key_size) {
|
|
req->dst_len = ctx->key_size;
|
|
return -EOVERFLOW;
|
|
}
|
|
|
|
req_ctx->in_buf = kmalloc(ctx->key_size - 1 - req->src_len,
|
|
GFP_KERNEL);
|
|
if (!req_ctx->in_buf)
|
|
return -ENOMEM;
|
|
|
|
ps_end = ctx->key_size - digest_size - req->src_len - 2;
|
|
req_ctx->in_buf[0] = 0x01;
|
|
memset(req_ctx->in_buf + 1, 0xff, ps_end - 1);
|
|
req_ctx->in_buf[ps_end] = 0x00;
|
|
|
|
memcpy(req_ctx->in_buf + ps_end + 1, digest_info->data,
|
|
digest_info->size);
|
|
|
|
pkcs1pad_sg_set_buf(req_ctx->in_sg, req_ctx->in_buf,
|
|
ctx->key_size - 1 - req->src_len, req->src);
|
|
|
|
akcipher_request_set_tfm(&req_ctx->child_req, ctx->child);
|
|
akcipher_request_set_callback(&req_ctx->child_req, req->base.flags,
|
|
pkcs1pad_encrypt_sign_complete_cb, req);
|
|
|
|
/* Reuse output buffer */
|
|
akcipher_request_set_crypt(&req_ctx->child_req, req_ctx->in_sg,
|
|
req->dst, ctx->key_size - 1, req->dst_len);
|
|
|
|
err = crypto_akcipher_sign(&req_ctx->child_req);
|
|
if (err != -EINPROGRESS &&
|
|
(err != -EBUSY ||
|
|
!(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
|
|
return pkcs1pad_encrypt_sign_complete(req, err);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int pkcs1pad_verify_complete(struct akcipher_request *req, int err)
|
|
{
|
|
struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
struct pkcs1pad_request *req_ctx = akcipher_request_ctx(req);
|
|
struct akcipher_instance *inst = akcipher_alg_instance(tfm);
|
|
struct pkcs1pad_inst_ctx *ictx = akcipher_instance_ctx(inst);
|
|
const struct rsa_asn1_template *digest_info = ictx->digest_info;
|
|
unsigned int dst_len;
|
|
unsigned int pos;
|
|
u8 *out_buf;
|
|
|
|
if (err)
|
|
goto done;
|
|
|
|
err = -EINVAL;
|
|
dst_len = req_ctx->child_req.dst_len;
|
|
if (dst_len < ctx->key_size - 1)
|
|
goto done;
|
|
|
|
out_buf = req_ctx->out_buf;
|
|
if (dst_len == ctx->key_size) {
|
|
if (out_buf[0] != 0x00)
|
|
/* Decrypted value had no leading 0 byte */
|
|
goto done;
|
|
|
|
dst_len--;
|
|
out_buf++;
|
|
}
|
|
|
|
err = -EBADMSG;
|
|
if (out_buf[0] != 0x01)
|
|
goto done;
|
|
|
|
for (pos = 1; pos < dst_len; pos++)
|
|
if (out_buf[pos] != 0xff)
|
|
break;
|
|
|
|
if (pos < 9 || pos == dst_len || out_buf[pos] != 0x00)
|
|
goto done;
|
|
pos++;
|
|
|
|
if (crypto_memneq(out_buf + pos, digest_info->data, digest_info->size))
|
|
goto done;
|
|
|
|
pos += digest_info->size;
|
|
|
|
err = 0;
|
|
|
|
if (req->dst_len < dst_len - pos)
|
|
err = -EOVERFLOW;
|
|
req->dst_len = dst_len - pos;
|
|
|
|
if (!err)
|
|
sg_copy_from_buffer(req->dst,
|
|
sg_nents_for_len(req->dst, req->dst_len),
|
|
out_buf + pos, req->dst_len);
|
|
done:
|
|
kzfree(req_ctx->out_buf);
|
|
|
|
return err;
|
|
}
|
|
|
|
static void pkcs1pad_verify_complete_cb(
|
|
struct crypto_async_request *child_async_req, int err)
|
|
{
|
|
struct akcipher_request *req = child_async_req->data;
|
|
struct crypto_async_request async_req;
|
|
|
|
if (err == -EINPROGRESS)
|
|
return;
|
|
|
|
async_req.data = req->base.data;
|
|
async_req.tfm = crypto_akcipher_tfm(crypto_akcipher_reqtfm(req));
|
|
async_req.flags = child_async_req->flags;
|
|
req->base.complete(&async_req, pkcs1pad_verify_complete(req, err));
|
|
}
|
|
|
|
/*
|
|
* The verify operation is here for completeness similar to the verification
|
|
* defined in RFC2313 section 10.2 except that block type 0 is not accepted,
|
|
* as in RFC2437. RFC2437 section 9.2 doesn't define any operation to
|
|
* retrieve the DigestInfo from a signature, instead the user is expected
|
|
* to call the sign operation to generate the expected signature and compare
|
|
* signatures instead of the message-digests.
|
|
*/
|
|
static int pkcs1pad_verify(struct akcipher_request *req)
|
|
{
|
|
struct crypto_akcipher *tfm = crypto_akcipher_reqtfm(req);
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
struct pkcs1pad_request *req_ctx = akcipher_request_ctx(req);
|
|
int err;
|
|
|
|
if (!ctx->key_size || req->src_len < ctx->key_size)
|
|
return -EINVAL;
|
|
|
|
req_ctx->out_buf = kmalloc(ctx->key_size, GFP_KERNEL);
|
|
if (!req_ctx->out_buf)
|
|
return -ENOMEM;
|
|
|
|
pkcs1pad_sg_set_buf(req_ctx->out_sg, req_ctx->out_buf,
|
|
ctx->key_size, NULL);
|
|
|
|
akcipher_request_set_tfm(&req_ctx->child_req, ctx->child);
|
|
akcipher_request_set_callback(&req_ctx->child_req, req->base.flags,
|
|
pkcs1pad_verify_complete_cb, req);
|
|
|
|
/* Reuse input buffer, output to a new buffer */
|
|
akcipher_request_set_crypt(&req_ctx->child_req, req->src,
|
|
req_ctx->out_sg, req->src_len,
|
|
ctx->key_size);
|
|
|
|
err = crypto_akcipher_verify(&req_ctx->child_req);
|
|
if (err != -EINPROGRESS &&
|
|
(err != -EBUSY ||
|
|
!(req->base.flags & CRYPTO_TFM_REQ_MAY_BACKLOG)))
|
|
return pkcs1pad_verify_complete(req, err);
|
|
|
|
return err;
|
|
}
|
|
|
|
static int pkcs1pad_init_tfm(struct crypto_akcipher *tfm)
|
|
{
|
|
struct akcipher_instance *inst = akcipher_alg_instance(tfm);
|
|
struct pkcs1pad_inst_ctx *ictx = akcipher_instance_ctx(inst);
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
struct crypto_akcipher *child_tfm;
|
|
|
|
child_tfm = crypto_spawn_akcipher(&ictx->spawn);
|
|
if (IS_ERR(child_tfm))
|
|
return PTR_ERR(child_tfm);
|
|
|
|
ctx->child = child_tfm;
|
|
return 0;
|
|
}
|
|
|
|
static void pkcs1pad_exit_tfm(struct crypto_akcipher *tfm)
|
|
{
|
|
struct pkcs1pad_ctx *ctx = akcipher_tfm_ctx(tfm);
|
|
|
|
crypto_free_akcipher(ctx->child);
|
|
}
|
|
|
|
static void pkcs1pad_free(struct akcipher_instance *inst)
|
|
{
|
|
struct pkcs1pad_inst_ctx *ctx = akcipher_instance_ctx(inst);
|
|
struct crypto_akcipher_spawn *spawn = &ctx->spawn;
|
|
|
|
crypto_drop_akcipher(spawn);
|
|
kfree(inst);
|
|
}
|
|
|
|
static int pkcs1pad_create(struct crypto_template *tmpl, struct rtattr **tb)
|
|
{
|
|
const struct rsa_asn1_template *digest_info;
|
|
struct crypto_attr_type *algt;
|
|
struct akcipher_instance *inst;
|
|
struct pkcs1pad_inst_ctx *ctx;
|
|
struct crypto_akcipher_spawn *spawn;
|
|
struct akcipher_alg *rsa_alg;
|
|
const char *rsa_alg_name;
|
|
const char *hash_name;
|
|
int err;
|
|
|
|
algt = crypto_get_attr_type(tb);
|
|
if (IS_ERR(algt))
|
|
return PTR_ERR(algt);
|
|
|
|
if ((algt->type ^ CRYPTO_ALG_TYPE_AKCIPHER) & algt->mask)
|
|
return -EINVAL;
|
|
|
|
rsa_alg_name = crypto_attr_alg_name(tb[1]);
|
|
if (IS_ERR(rsa_alg_name))
|
|
return PTR_ERR(rsa_alg_name);
|
|
|
|
hash_name = crypto_attr_alg_name(tb[2]);
|
|
if (IS_ERR(hash_name))
|
|
return PTR_ERR(hash_name);
|
|
|
|
digest_info = rsa_lookup_asn1(hash_name);
|
|
if (!digest_info)
|
|
return -EINVAL;
|
|
|
|
inst = kzalloc(sizeof(*inst) + sizeof(*ctx), GFP_KERNEL);
|
|
if (!inst)
|
|
return -ENOMEM;
|
|
|
|
ctx = akcipher_instance_ctx(inst);
|
|
spawn = &ctx->spawn;
|
|
ctx->digest_info = digest_info;
|
|
|
|
crypto_set_spawn(&spawn->base, akcipher_crypto_instance(inst));
|
|
err = crypto_grab_akcipher(spawn, rsa_alg_name, 0,
|
|
crypto_requires_sync(algt->type, algt->mask));
|
|
if (err)
|
|
goto out_free_inst;
|
|
|
|
rsa_alg = crypto_spawn_akcipher_alg(spawn);
|
|
|
|
err = -ENAMETOOLONG;
|
|
|
|
if (snprintf(inst->alg.base.cra_name, CRYPTO_MAX_ALG_NAME,
|
|
"pkcs1pad(%s,%s)", rsa_alg->base.cra_name, hash_name) >=
|
|
CRYPTO_MAX_ALG_NAME ||
|
|
snprintf(inst->alg.base.cra_driver_name, CRYPTO_MAX_ALG_NAME,
|
|
"pkcs1pad(%s,%s)",
|
|
rsa_alg->base.cra_driver_name, hash_name) >=
|
|
CRYPTO_MAX_ALG_NAME)
|
|
goto out_drop_alg;
|
|
|
|
inst->alg.base.cra_flags = rsa_alg->base.cra_flags & CRYPTO_ALG_ASYNC;
|
|
inst->alg.base.cra_priority = rsa_alg->base.cra_priority;
|
|
inst->alg.base.cra_ctxsize = sizeof(struct pkcs1pad_ctx);
|
|
|
|
inst->alg.init = pkcs1pad_init_tfm;
|
|
inst->alg.exit = pkcs1pad_exit_tfm;
|
|
|
|
inst->alg.encrypt = pkcs1pad_encrypt;
|
|
inst->alg.decrypt = pkcs1pad_decrypt;
|
|
inst->alg.sign = pkcs1pad_sign;
|
|
inst->alg.verify = pkcs1pad_verify;
|
|
inst->alg.set_pub_key = pkcs1pad_set_pub_key;
|
|
inst->alg.set_priv_key = pkcs1pad_set_priv_key;
|
|
inst->alg.max_size = pkcs1pad_get_max_size;
|
|
inst->alg.reqsize = sizeof(struct pkcs1pad_request) + rsa_alg->reqsize;
|
|
|
|
inst->free = pkcs1pad_free;
|
|
|
|
err = akcipher_register_instance(tmpl, inst);
|
|
if (err)
|
|
goto out_drop_alg;
|
|
|
|
return 0;
|
|
|
|
out_drop_alg:
|
|
crypto_drop_akcipher(spawn);
|
|
out_free_inst:
|
|
kfree(inst);
|
|
return err;
|
|
}
|
|
|
|
struct crypto_template rsa_pkcs1pad_tmpl = {
|
|
.name = "pkcs1pad",
|
|
.create = pkcs1pad_create,
|
|
.module = THIS_MODULE,
|
|
};
|