Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
- remove broken dt bindings in inside-secure
- fix authencesn crash when used with digest_null
- fix cavium/nitrox firmware path
- fix SHA3 failure in brcm
- fix Kconfig dependency for brcm
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: authencesn - Fix digest_null crash
crypto: brcm - remove BCM_PDC_MBOX dependency in Kconfig
Documentation/bindings: crypto: remove the dma-mask property
crypto: inside-secure - do not parse the dma mask from dt
crypto: cavium/nitrox - Change in firmware path.
crypto: brcm - Fix SHA3-512 algorithm failure
+10
-8
-2
Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt
-2
Documentation/devicetree/bindings/crypto/inside-secure-safexcel.txt
···
8
8
9
9
Optional properties:
10
10
- clocks: Reference to the crypto engine clock.
11
-
- dma-mask: The address mask limitation. Defaults to 64.
12
11
13
12
Example:
14
13
···
23
24
interrupt-names = "mem", "ring0", "ring1", "ring2", "ring3",
24
25
"eip";
25
26
clocks = <&cpm_syscon0 1 26>;
26
-
dma-mask = <0xff 0xffffffff>;
27
27
status = "disabled";
28
28
};
+5
crypto/authencesn.c
+5
crypto/authencesn.c
···
248
248
u8 *ihash = ohash + crypto_ahash_digestsize(auth);
249
249
u32 tmp[2];
250
250
251
+
if (!authsize)
252
+
goto decrypt;
253
+
251
254
/* Move high-order bits of sequence number back. */
252
255
scatterwalk_map_and_copy(tmp, dst, 4, 4, 0);
253
256
scatterwalk_map_and_copy(tmp + 1, dst, assoclen + cryptlen, 4, 0);
···
258
255
259
256
if (crypto_memneq(ihash, ohash, authsize))
260
257
return -EBADMSG;
258
+
259
+
decrypt:
261
260
262
261
sg_init_table(areq_ctx->dst, 2);
263
262
dst = scatterwalk_ffwd(areq_ctx->dst, dst, assoclen);
+1
-1
drivers/crypto/Kconfig
+1
-1
drivers/crypto/Kconfig
+1
drivers/crypto/bcm/spu2.c
+1
drivers/crypto/bcm/spu2.c
+2
-1
drivers/crypto/cavium/nitrox/nitrox_main.c
+2
-1
drivers/crypto/cavium/nitrox/nitrox_main.c
+1
-4
drivers/crypto/inside-secure/safexcel.c
+1
-4
drivers/crypto/inside-secure/safexcel.c
···
773
773
struct device *dev = &pdev->dev;
774
774
struct resource *res;
775
775
struct safexcel_crypto_priv *priv;
776
-
u64 dma_mask;
777
776
int i, ret;
778
777
779
778
priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
···
801
802
return -EPROBE_DEFER;
802
803
}
803
804
804
-
if (of_property_read_u64(dev->of_node, "dma-mask", &dma_mask))
805
-
dma_mask = DMA_BIT_MASK(64);
806
-
ret = dma_set_mask_and_coherent(dev, dma_mask);
805
+
ret = dma_set_mask_and_coherent(dev, DMA_BIT_MASK(64));
807
806
if (ret)
808
807
goto err_clk;
809
808