Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit bcb0ad2b34daade529ce1f38eede0ea8b7309535

Authored by Herbert Xu
Committed by David S. Miller
1 parent afad2608c7
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

[CRYPTO] sha1: Fixed off-by-64 bug in sha1_update 

After a partial update, the done pointer is off to the right by 64 bytes.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>

Showing 1 changed file with 2 additions and 2 deletions Inline Diff

1 /* 1 /*
2 * Cryptographic API. 2 * Cryptographic API.
3 * 3 *
4 * SHA1 Secure Hash Algorithm. 4 * SHA1 Secure Hash Algorithm.
5 * 5 *
6 * Derived from cryptoapi implementation, adapted for in-place 6 * Derived from cryptoapi implementation, adapted for in-place
7 * scatterlist interface. 7 * scatterlist interface.
8 * 8 *
9 * Copyright (c) Alan Smithee. 9 * Copyright (c) Alan Smithee.
10 * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk> 10 * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
11 * Copyright (c) Jean-Francois Dive <jef@linuxbe.org> 11 * Copyright (c) Jean-Francois Dive <jef@linuxbe.org>
12 * 12 *
13 * This program is free software; you can redistribute it and/or modify it 13 * This program is free software; you can redistribute it and/or modify it
14 * under the terms of the GNU General Public License as published by the Free 14 * under the terms of the GNU General Public License as published by the Free
15 * Software Foundation; either version 2 of the License, or (at your option) 15 * Software Foundation; either version 2 of the License, or (at your option)
16 * any later version. 16 * any later version.
17 * 17 *
18 */ 18 */
19 #include <linux/init.h> 19 #include <linux/init.h>
20 #include <linux/module.h> 20 #include <linux/module.h>
21 #include <linux/mm.h> 21 #include <linux/mm.h>
22 #include <linux/crypto.h> 22 #include <linux/crypto.h>
23 #include <linux/cryptohash.h> 23 #include <linux/cryptohash.h>
24 #include <linux/types.h> 24 #include <linux/types.h>
25 #include <asm/scatterlist.h> 25 #include <asm/scatterlist.h>
26 #include <asm/byteorder.h> 26 #include <asm/byteorder.h>
27 27
28 #define SHA1_DIGEST_SIZE 20 28 #define SHA1_DIGEST_SIZE 20
29 #define SHA1_HMAC_BLOCK_SIZE 64 29 #define SHA1_HMAC_BLOCK_SIZE 64
30 30
31 struct sha1_ctx { 31 struct sha1_ctx {
32 u64 count; 32 u64 count;
33 u32 state[5]; 33 u32 state[5];
34 u8 buffer[64]; 34 u8 buffer[64];
35 }; 35 };
36 36
37 static void sha1_init(void *ctx) 37 static void sha1_init(void *ctx)
38 { 38 {
39 struct sha1_ctx *sctx = ctx; 39 struct sha1_ctx *sctx = ctx;
40 static const struct sha1_ctx initstate = { 40 static const struct sha1_ctx initstate = {
41 0, 41 0,
42 { 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0 }, 42 { 0x67452301, 0xEFCDAB89, 0x98BADCFE, 0x10325476, 0xC3D2E1F0 },
43 { 0, } 43 { 0, }
44 }; 44 };
45 45
46 *sctx = initstate; 46 *sctx = initstate;
47 } 47 }
48 48
49 static void sha1_update(void *ctx, const u8 *data, unsigned int len) 49 static void sha1_update(void *ctx, const u8 *data, unsigned int len)
50 { 50 {
51 struct sha1_ctx *sctx = ctx; 51 struct sha1_ctx *sctx = ctx;
52 unsigned int partial, done; 52 unsigned int partial, done;
53 const u8 *src; 53 const u8 *src;
54 54
55 partial = sctx->count & 0x3f; 55 partial = sctx->count & 0x3f;
56 sctx->count += len; 56 sctx->count += len;
57 done = 0; 57 done = 0;
58 src = data; 58 src = data;
59 59
60 if ((partial + len) > 63) { 60 if ((partial + len) > 63) {
61 u32 temp[SHA_WORKSPACE_WORDS]; 61 u32 temp[SHA_WORKSPACE_WORDS];
62 62
63 if (partial) { 63 if (partial) {
64 done = 64 - partial; 64 done = -partial;
65 memcpy(sctx->buffer + partial, data, done); 65 memcpy(sctx->buffer + partial, data, done + 64);
66 src = sctx->buffer; 66 src = sctx->buffer;
67 } 67 }
68 68
69 do { 69 do {
70 sha_transform(sctx->state, src, temp); 70 sha_transform(sctx->state, src, temp);
71 done += 64; 71 done += 64;
72 src = data + done; 72 src = data + done;
73 } while (done + 63 < len); 73 } while (done + 63 < len);
74 74
75 memset(temp, 0, sizeof(temp)); 75 memset(temp, 0, sizeof(temp));
76 partial = 0; 76 partial = 0;
77 } 77 }
78 memcpy(sctx->buffer + partial, src, len - done); 78 memcpy(sctx->buffer + partial, src, len - done);
79 } 79 }
80 80
81 81
82 /* Add padding and return the message digest. */ 82 /* Add padding and return the message digest. */
83 static void sha1_final(void* ctx, u8 *out) 83 static void sha1_final(void* ctx, u8 *out)
84 { 84 {
85 struct sha1_ctx *sctx = ctx; 85 struct sha1_ctx *sctx = ctx;
86 __be32 *dst = (__be32 *)out; 86 __be32 *dst = (__be32 *)out;
87 u32 i, index, padlen; 87 u32 i, index, padlen;
88 __be64 bits; 88 __be64 bits;
89 static const u8 padding[64] = { 0x80, }; 89 static const u8 padding[64] = { 0x80, };
90 90
91 bits = cpu_to_be64(sctx->count << 3); 91 bits = cpu_to_be64(sctx->count << 3);
92 92
93 /* Pad out to 56 mod 64 */ 93 /* Pad out to 56 mod 64 */
94 index = sctx->count & 0x3f; 94 index = sctx->count & 0x3f;
95 padlen = (index < 56) ? (56 - index) : ((64+56) - index); 95 padlen = (index < 56) ? (56 - index) : ((64+56) - index);
96 sha1_update(sctx, padding, padlen); 96 sha1_update(sctx, padding, padlen);
97 97
98 /* Append length */ 98 /* Append length */
99 sha1_update(sctx, (const u8 *)&bits, sizeof(bits)); 99 sha1_update(sctx, (const u8 *)&bits, sizeof(bits));
100 100
101 /* Store state in digest */ 101 /* Store state in digest */
102 for (i = 0; i < 5; i++) 102 for (i = 0; i < 5; i++)
103 dst[i] = cpu_to_be32(sctx->state[i]); 103 dst[i] = cpu_to_be32(sctx->state[i]);
104 104
105 /* Wipe context */ 105 /* Wipe context */
106 memset(sctx, 0, sizeof *sctx); 106 memset(sctx, 0, sizeof *sctx);
107 } 107 }
108 108
109 static struct crypto_alg alg = { 109 static struct crypto_alg alg = {
110 .cra_name = "sha1", 110 .cra_name = "sha1",
111 .cra_flags = CRYPTO_ALG_TYPE_DIGEST, 111 .cra_flags = CRYPTO_ALG_TYPE_DIGEST,
112 .cra_blocksize = SHA1_HMAC_BLOCK_SIZE, 112 .cra_blocksize = SHA1_HMAC_BLOCK_SIZE,
113 .cra_ctxsize = sizeof(struct sha1_ctx), 113 .cra_ctxsize = sizeof(struct sha1_ctx),
114 .cra_module = THIS_MODULE, 114 .cra_module = THIS_MODULE,
115 .cra_list = LIST_HEAD_INIT(alg.cra_list), 115 .cra_list = LIST_HEAD_INIT(alg.cra_list),
116 .cra_u = { .digest = { 116 .cra_u = { .digest = {
117 .dia_digestsize = SHA1_DIGEST_SIZE, 117 .dia_digestsize = SHA1_DIGEST_SIZE,
118 .dia_init = sha1_init, 118 .dia_init = sha1_init,
119 .dia_update = sha1_update, 119 .dia_update = sha1_update,
120 .dia_final = sha1_final } } 120 .dia_final = sha1_final } }
121 }; 121 };
122 122
123 static int __init init(void) 123 static int __init init(void)
124 { 124 {
125 return crypto_register_alg(&alg); 125 return crypto_register_alg(&alg);
126 } 126 }
127 127
128 static void __exit fini(void) 128 static void __exit fini(void)
129 { 129 {
130 crypto_unregister_alg(&alg); 130 crypto_unregister_alg(&alg);
131 } 131 }
132 132
133 module_init(init); 133 module_init(init);
134 module_exit(fini); 134 module_exit(fini);
135 135
136 MODULE_LICENSE("GPL"); 136 MODULE_LICENSE("GPL");
137 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm"); 137 MODULE_DESCRIPTION("SHA1 Secure Hash Algorithm");
138 138