diff options
| author | Linus Torvalds <[email protected]> | 2017-08-09 17:33:49 +0000 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2017-08-09 17:33:49 +0000 |
| commit | d555eb6b363455997f1e3ab8604e323c28972ad5 (patch) | |
| tree | aa35459d6c71b5887698ae7f1a0a5c7dd860dfe8 /net/ipv4/tcp_timer.c | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net (diff) | |
| parent | crypto: inside-secure - fix the sha state length in hmac_sha1_setkey (diff) | |
| download | kernel-d555eb6b363455997f1e3ab8604e323c28972ad5.tar.gz kernel-d555eb6b363455997f1e3ab8604e323c28972ad5.zip | |
Merge branch 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6
Pull crypto fixes from Herbert Xu:
"Fix two regressions in the inside-secure driver with respect to
hmac(sha1)"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: inside-secure - fix the sha state length in hmac_sha1_setkey
crypto: inside-secure - fix invalidation check in hmac_sha1_setkey
Diffstat (limited to 'net/ipv4/tcp_timer.c')
0 files changed, 0 insertions, 0 deletions