Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit f334f74575cb0d9463d39caf4a43483cfc3dd542

Authored by Herbert Xu
Committed by Greg Kroah-Hartman
1 parent 23cfecf979

crypto: sha512 - Use binary and instead of modulus 

commit 58d7d18b5268febb8b1391c6dffc8e2aaa751fcd upstream.

The previous patch used the modulus operator over a power of 2
unnecessarily which may produce suboptimal binary code.  This
patch changes changes them to binary ands instead.

Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

crypto/sha512_generic.c
Diff comments   View file @ f334f74
1 /* SHA-512 code by Jean-Luc Cooke <jlcooke@certainkey.com> 1 /* SHA-512 code by Jean-Luc Cooke <jlcooke@certainkey.com>
2 * 2 *
3 * Copyright (c) Jean-Luc Cooke <jlcooke@certainkey.com> 3 * Copyright (c) Jean-Luc Cooke <jlcooke@certainkey.com>
4 * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk> 4 * Copyright (c) Andrew McDonald <andrew@mcdonald.org.uk>
5 * Copyright (c) 2003 Kyle McMartin <kyle@debian.org> 5 * Copyright (c) 2003 Kyle McMartin <kyle@debian.org>
6 * 6 *
7 * This program is free software; you can redistribute it and/or modify it 7 * This program is free software; you can redistribute it and/or modify it
8 * under the terms of the GNU General Public License as published by the 8 * under the terms of the GNU General Public License as published by the
9 * Free Software Foundation; either version 2, or (at your option) any 9 * Free Software Foundation; either version 2, or (at your option) any
10 * later version. 10 * later version.
11 * 11 *
12 */ 12 */
13 #include <crypto/internal/hash.h> 13 #include <crypto/internal/hash.h>
14 #include <linux/kernel.h> 14 #include <linux/kernel.h>
15 #include <linux/module.h> 15 #include <linux/module.h>
16 #include <linux/mm.h> 16 #include <linux/mm.h>
17 #include <linux/init.h> 17 #include <linux/init.h>
18 #include <linux/crypto.h> 18 #include <linux/crypto.h>
19 #include <linux/types.h> 19 #include <linux/types.h>
20 #include <crypto/sha.h> 20 #include <crypto/sha.h>
21 #include <linux/percpu.h> 21 #include <linux/percpu.h>
22 #include <asm/byteorder.h> 22 #include <asm/byteorder.h>
23 23
24 static inline u64 Ch(u64 x, u64 y, u64 z) 24 static inline u64 Ch(u64 x, u64 y, u64 z)
25 { 25 {
26 return z ^ (x & (y ^ z)); 26 return z ^ (x & (y ^ z));
27 } 27 }
28 28
29 static inline u64 Maj(u64 x, u64 y, u64 z) 29 static inline u64 Maj(u64 x, u64 y, u64 z)
30 { 30 {
31 return (x & y) | (z & (x | y)); 31 return (x & y) | (z & (x | y));
32 } 32 }
33 33
34 static inline u64 RORu64(u64 x, u64 y) 34 static inline u64 RORu64(u64 x, u64 y)
35 { 35 {
36 return (x >> y) | (x << (64 - y)); 36 return (x >> y) | (x << (64 - y));
37 } 37 }
38 38
39 static const u64 sha512_K[80] = { 39 static const u64 sha512_K[80] = {
40 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL, 40 0x428a2f98d728ae22ULL, 0x7137449123ef65cdULL, 0xb5c0fbcfec4d3b2fULL,
41 0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL, 41 0xe9b5dba58189dbbcULL, 0x3956c25bf348b538ULL, 0x59f111f1b605d019ULL,
42 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, 0xd807aa98a3030242ULL, 42 0x923f82a4af194f9bULL, 0xab1c5ed5da6d8118ULL, 0xd807aa98a3030242ULL,
43 0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL, 43 0x12835b0145706fbeULL, 0x243185be4ee4b28cULL, 0x550c7dc3d5ffb4e2ULL,
44 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL, 44 0x72be5d74f27b896fULL, 0x80deb1fe3b1696b1ULL, 0x9bdc06a725c71235ULL,
45 0xc19bf174cf692694ULL, 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL, 45 0xc19bf174cf692694ULL, 0xe49b69c19ef14ad2ULL, 0xefbe4786384f25e3ULL,
46 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, 0x2de92c6f592b0275ULL, 46 0x0fc19dc68b8cd5b5ULL, 0x240ca1cc77ac9c65ULL, 0x2de92c6f592b0275ULL,
47 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL, 47 0x4a7484aa6ea6e483ULL, 0x5cb0a9dcbd41fbd4ULL, 0x76f988da831153b5ULL,
48 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL, 48 0x983e5152ee66dfabULL, 0xa831c66d2db43210ULL, 0xb00327c898fb213fULL,
49 0xbf597fc7beef0ee4ULL, 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL, 49 0xbf597fc7beef0ee4ULL, 0xc6e00bf33da88fc2ULL, 0xd5a79147930aa725ULL,
50 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, 0x27b70a8546d22ffcULL, 50 0x06ca6351e003826fULL, 0x142929670a0e6e70ULL, 0x27b70a8546d22ffcULL,
51 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL, 51 0x2e1b21385c26c926ULL, 0x4d2c6dfc5ac42aedULL, 0x53380d139d95b3dfULL,
52 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL, 52 0x650a73548baf63deULL, 0x766a0abb3c77b2a8ULL, 0x81c2c92e47edaee6ULL,
53 0x92722c851482353bULL, 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL, 53 0x92722c851482353bULL, 0xa2bfe8a14cf10364ULL, 0xa81a664bbc423001ULL,
54 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, 0xd192e819d6ef5218ULL, 54 0xc24b8b70d0f89791ULL, 0xc76c51a30654be30ULL, 0xd192e819d6ef5218ULL,
55 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL, 55 0xd69906245565a910ULL, 0xf40e35855771202aULL, 0x106aa07032bbd1b8ULL,
56 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL, 56 0x19a4c116b8d2d0c8ULL, 0x1e376c085141ab53ULL, 0x2748774cdf8eeb99ULL,
57 0x34b0bcb5e19b48a8ULL, 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL, 57 0x34b0bcb5e19b48a8ULL, 0x391c0cb3c5c95a63ULL, 0x4ed8aa4ae3418acbULL,
58 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, 0x748f82ee5defb2fcULL, 58 0x5b9cca4f7763e373ULL, 0x682e6ff3d6b2b8a3ULL, 0x748f82ee5defb2fcULL,
59 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL, 59 0x78a5636f43172f60ULL, 0x84c87814a1f0ab72ULL, 0x8cc702081a6439ecULL,
60 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL, 60 0x90befffa23631e28ULL, 0xa4506cebde82bde9ULL, 0xbef9a3f7b2c67915ULL,
61 0xc67178f2e372532bULL, 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL, 61 0xc67178f2e372532bULL, 0xca273eceea26619cULL, 0xd186b8c721c0c207ULL,
62 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, 0x06f067aa72176fbaULL, 62 0xeada7dd6cde0eb1eULL, 0xf57d4f7fee6ed178ULL, 0x06f067aa72176fbaULL,
63 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL, 63 0x0a637dc5a2c898a6ULL, 0x113f9804bef90daeULL, 0x1b710b35131c471bULL,
64 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL, 64 0x28db77f523047d84ULL, 0x32caab7b40c72493ULL, 0x3c9ebe0a15c9bebcULL,
65 0x431d67c49c100d4cULL, 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL, 65 0x431d67c49c100d4cULL, 0x4cc5d4becb3e42b6ULL, 0x597f299cfc657e2aULL,
66 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL, 66 0x5fcb6fab3ad6faecULL, 0x6c44198c4a475817ULL,
67 }; 67 };
68 68
69 #define e0(x) (RORu64(x,28) ^ RORu64(x,34) ^ RORu64(x,39)) 69 #define e0(x) (RORu64(x,28) ^ RORu64(x,34) ^ RORu64(x,39))
70 #define e1(x) (RORu64(x,14) ^ RORu64(x,18) ^ RORu64(x,41)) 70 #define e1(x) (RORu64(x,14) ^ RORu64(x,18) ^ RORu64(x,41))
71 #define s0(x) (RORu64(x, 1) ^ RORu64(x, 8) ^ (x >> 7)) 71 #define s0(x) (RORu64(x, 1) ^ RORu64(x, 8) ^ (x >> 7))
72 #define s1(x) (RORu64(x,19) ^ RORu64(x,61) ^ (x >> 6)) 72 #define s1(x) (RORu64(x,19) ^ RORu64(x,61) ^ (x >> 6))
73 73
74 static inline void LOAD_OP(int I, u64 *W, const u8 *input) 74 static inline void LOAD_OP(int I, u64 *W, const u8 *input)
75 { 75 {
76 W[I] = __be64_to_cpu( ((__be64*)(input))[I] ); 76 W[I] = __be64_to_cpu( ((__be64*)(input))[I] );
77 } 77 }
78 78
79 static inline void BLEND_OP(int I, u64 *W) 79 static inline void BLEND_OP(int I, u64 *W)
80 { 80 {
81 W[I % 16] += s1(W[(I-2) % 16]) + W[(I-7) % 16] + s0(W[(I-15) % 16]); 81 W[I & 15] += s1(W[(I-2) & 15]) + W[(I-7) & 15] + s0(W[(I-15) & 15]);
82 } 82 }
83 83
84 static void 84 static void
85 sha512_transform(u64 *state, const u8 *input) 85 sha512_transform(u64 *state, const u8 *input)
86 { 86 {
87 u64 a, b, c, d, e, f, g, h, t1, t2; 87 u64 a, b, c, d, e, f, g, h, t1, t2;
88 88
89 int i; 89 int i;
90 u64 W[16]; 90 u64 W[16];
91 91
92 /* load the input */ 92 /* load the input */
93 for (i = 0; i < 16; i++) 93 for (i = 0; i < 16; i++)
94 LOAD_OP(i, W, input); 94 LOAD_OP(i, W, input);
95 95
96 /* load the state into our registers */ 96 /* load the state into our registers */
97 a=state[0]; b=state[1]; c=state[2]; d=state[3]; 97 a=state[0]; b=state[1]; c=state[2]; d=state[3];
98 e=state[4]; f=state[5]; g=state[6]; h=state[7]; 98 e=state[4]; f=state[5]; g=state[6]; h=state[7];
99 99
100 #define SHA512_0_15(i, a, b, c, d, e, f, g, h) \ 100 #define SHA512_0_15(i, a, b, c, d, e, f, g, h) \
101 t1 = h + e1(e) + Ch(e, f, g) + sha512_K[i] + W[i]; \ 101 t1 = h + e1(e) + Ch(e, f, g) + sha512_K[i] + W[i]; \
102 t2 = e0(a) + Maj(a, b, c); \ 102 t2 = e0(a) + Maj(a, b, c); \
103 d += t1; \ 103 d += t1; \
104 h = t1 + t2 104 h = t1 + t2
105 105
106 #define SHA512_16_79(i, a, b, c, d, e, f, g, h) \ 106 #define SHA512_16_79(i, a, b, c, d, e, f, g, h) \
107 BLEND_OP(i, W); \ 107 BLEND_OP(i, W); \
108 t1 = h + e1(e) + Ch(e, f, g) + sha512_K[i] + W[(i)%16]; \ 108 t1 = h + e1(e) + Ch(e, f, g) + sha512_K[i] + W[(i)&15]; \
109 t2 = e0(a) + Maj(a, b, c); \ 109 t2 = e0(a) + Maj(a, b, c); \
110 d += t1; \ 110 d += t1; \
111 h = t1 + t2 111 h = t1 + t2
112 112
113 for (i = 0; i < 16; i += 8) { 113 for (i = 0; i < 16; i += 8) {
114 SHA512_0_15(i, a, b, c, d, e, f, g, h); 114 SHA512_0_15(i, a, b, c, d, e, f, g, h);
115 SHA512_0_15(i + 1, h, a, b, c, d, e, f, g); 115 SHA512_0_15(i + 1, h, a, b, c, d, e, f, g);
116 SHA512_0_15(i + 2, g, h, a, b, c, d, e, f); 116 SHA512_0_15(i + 2, g, h, a, b, c, d, e, f);
117 SHA512_0_15(i + 3, f, g, h, a, b, c, d, e); 117 SHA512_0_15(i + 3, f, g, h, a, b, c, d, e);
118 SHA512_0_15(i + 4, e, f, g, h, a, b, c, d); 118 SHA512_0_15(i + 4, e, f, g, h, a, b, c, d);
119 SHA512_0_15(i + 5, d, e, f, g, h, a, b, c); 119 SHA512_0_15(i + 5, d, e, f, g, h, a, b, c);
120 SHA512_0_15(i + 6, c, d, e, f, g, h, a, b); 120 SHA512_0_15(i + 6, c, d, e, f, g, h, a, b);
121 SHA512_0_15(i + 7, b, c, d, e, f, g, h, a); 121 SHA512_0_15(i + 7, b, c, d, e, f, g, h, a);
122 } 122 }
123 for (i = 16; i < 80; i += 8) { 123 for (i = 16; i < 80; i += 8) {
124 SHA512_16_79(i, a, b, c, d, e, f, g, h); 124 SHA512_16_79(i, a, b, c, d, e, f, g, h);
125 SHA512_16_79(i + 1, h, a, b, c, d, e, f, g); 125 SHA512_16_79(i + 1, h, a, b, c, d, e, f, g);
126 SHA512_16_79(i + 2, g, h, a, b, c, d, e, f); 126 SHA512_16_79(i + 2, g, h, a, b, c, d, e, f);
127 SHA512_16_79(i + 3, f, g, h, a, b, c, d, e); 127 SHA512_16_79(i + 3, f, g, h, a, b, c, d, e);
128 SHA512_16_79(i + 4, e, f, g, h, a, b, c, d); 128 SHA512_16_79(i + 4, e, f, g, h, a, b, c, d);
129 SHA512_16_79(i + 5, d, e, f, g, h, a, b, c); 129 SHA512_16_79(i + 5, d, e, f, g, h, a, b, c);
130 SHA512_16_79(i + 6, c, d, e, f, g, h, a, b); 130 SHA512_16_79(i + 6, c, d, e, f, g, h, a, b);
131 SHA512_16_79(i + 7, b, c, d, e, f, g, h, a); 131 SHA512_16_79(i + 7, b, c, d, e, f, g, h, a);
132 } 132 }
133 133
134 state[0] += a; state[1] += b; state[2] += c; state[3] += d; 134 state[0] += a; state[1] += b; state[2] += c; state[3] += d;
135 state[4] += e; state[5] += f; state[6] += g; state[7] += h; 135 state[4] += e; state[5] += f; state[6] += g; state[7] += h;
136 136
137 /* erase our data */ 137 /* erase our data */
138 a = b = c = d = e = f = g = h = t1 = t2 = 0; 138 a = b = c = d = e = f = g = h = t1 = t2 = 0;
139 } 139 }
140 140
141 static int 141 static int
142 sha512_init(struct shash_desc *desc) 142 sha512_init(struct shash_desc *desc)
143 { 143 {
144 struct sha512_state *sctx = shash_desc_ctx(desc); 144 struct sha512_state *sctx = shash_desc_ctx(desc);
145 sctx->state[0] = SHA512_H0; 145 sctx->state[0] = SHA512_H0;
146 sctx->state[1] = SHA512_H1; 146 sctx->state[1] = SHA512_H1;
147 sctx->state[2] = SHA512_H2; 147 sctx->state[2] = SHA512_H2;
148 sctx->state[3] = SHA512_H3; 148 sctx->state[3] = SHA512_H3;
149 sctx->state[4] = SHA512_H4; 149 sctx->state[4] = SHA512_H4;
150 sctx->state[5] = SHA512_H5; 150 sctx->state[5] = SHA512_H5;
151 sctx->state[6] = SHA512_H6; 151 sctx->state[6] = SHA512_H6;
152 sctx->state[7] = SHA512_H7; 152 sctx->state[7] = SHA512_H7;
153 sctx->count[0] = sctx->count[1] = 0; 153 sctx->count[0] = sctx->count[1] = 0;
154 154
155 return 0; 155 return 0;
156 } 156 }
157 157
158 static int 158 static int
159 sha384_init(struct shash_desc *desc) 159 sha384_init(struct shash_desc *desc)
160 { 160 {
161 struct sha512_state *sctx = shash_desc_ctx(desc); 161 struct sha512_state *sctx = shash_desc_ctx(desc);
162 sctx->state[0] = SHA384_H0; 162 sctx->state[0] = SHA384_H0;
163 sctx->state[1] = SHA384_H1; 163 sctx->state[1] = SHA384_H1;
164 sctx->state[2] = SHA384_H2; 164 sctx->state[2] = SHA384_H2;
165 sctx->state[3] = SHA384_H3; 165 sctx->state[3] = SHA384_H3;
166 sctx->state[4] = SHA384_H4; 166 sctx->state[4] = SHA384_H4;
167 sctx->state[5] = SHA384_H5; 167 sctx->state[5] = SHA384_H5;
168 sctx->state[6] = SHA384_H6; 168 sctx->state[6] = SHA384_H6;
169 sctx->state[7] = SHA384_H7; 169 sctx->state[7] = SHA384_H7;
170 sctx->count[0] = sctx->count[1] = 0; 170 sctx->count[0] = sctx->count[1] = 0;
171 171
172 return 0; 172 return 0;
173 } 173 }
174 174
175 static int 175 static int
176 sha512_update(struct shash_desc *desc, const u8 *data, unsigned int len) 176 sha512_update(struct shash_desc *desc, const u8 *data, unsigned int len)
177 { 177 {
178 struct sha512_state *sctx = shash_desc_ctx(desc); 178 struct sha512_state *sctx = shash_desc_ctx(desc);
179 179
180 unsigned int i, index, part_len; 180 unsigned int i, index, part_len;
181 181
182 /* Compute number of bytes mod 128 */ 182 /* Compute number of bytes mod 128 */
183 index = sctx->count[0] & 0x7f; 183 index = sctx->count[0] & 0x7f;
184 184
185 /* Update number of bytes */ 185 /* Update number of bytes */
186 if (!(sctx->count[0] += len)) 186 if (!(sctx->count[0] += len))
187 sctx->count[1]++; 187 sctx->count[1]++;
188 188
189 part_len = 128 - index; 189 part_len = 128 - index;
190 190
191 /* Transform as many times as possible. */ 191 /* Transform as many times as possible. */
192 if (len >= part_len) { 192 if (len >= part_len) {
193 memcpy(&sctx->buf[index], data, part_len); 193 memcpy(&sctx->buf[index], data, part_len);
194 sha512_transform(sctx->state, sctx->buf); 194 sha512_transform(sctx->state, sctx->buf);
195 195
196 for (i = part_len; i + 127 < len; i+=128) 196 for (i = part_len; i + 127 < len; i+=128)
197 sha512_transform(sctx->state, &data[i]); 197 sha512_transform(sctx->state, &data[i]);
198 198
199 index = 0; 199 index = 0;
200 } else { 200 } else {
201 i = 0; 201 i = 0;
202 } 202 }
203 203
204 /* Buffer remaining input */ 204 /* Buffer remaining input */
205 memcpy(&sctx->buf[index], &data[i], len - i); 205 memcpy(&sctx->buf[index], &data[i], len - i);
206 206
207 return 0; 207 return 0;
208 } 208 }
209 209
210 static int 210 static int
211 sha512_final(struct shash_desc *desc, u8 *hash) 211 sha512_final(struct shash_desc *desc, u8 *hash)
212 { 212 {
213 struct sha512_state *sctx = shash_desc_ctx(desc); 213 struct sha512_state *sctx = shash_desc_ctx(desc);
214 static u8 padding[128] = { 0x80, }; 214 static u8 padding[128] = { 0x80, };
215 __be64 *dst = (__be64 *)hash; 215 __be64 *dst = (__be64 *)hash;
216 __be64 bits[2]; 216 __be64 bits[2];
217 unsigned int index, pad_len; 217 unsigned int index, pad_len;
218 int i; 218 int i;
219 219
220 /* Save number of bits */ 220 /* Save number of bits */
221 bits[1] = cpu_to_be64(sctx->count[0] << 3); 221 bits[1] = cpu_to_be64(sctx->count[0] << 3);
222 bits[0] = cpu_to_be64(sctx->count[1] << 3 | sctx->count[0] >> 61); 222 bits[0] = cpu_to_be64(sctx->count[1] << 3 | sctx->count[0] >> 61);
223 223
224 /* Pad out to 112 mod 128. */ 224 /* Pad out to 112 mod 128. */
225 index = sctx->count[0] & 0x7f; 225 index = sctx->count[0] & 0x7f;
226 pad_len = (index < 112) ? (112 - index) : ((128+112) - index); 226 pad_len = (index < 112) ? (112 - index) : ((128+112) - index);
227 sha512_update(desc, padding, pad_len); 227 sha512_update(desc, padding, pad_len);
228 228
229 /* Append length (before padding) */ 229 /* Append length (before padding) */
230 sha512_update(desc, (const u8 *)bits, sizeof(bits)); 230 sha512_update(desc, (const u8 *)bits, sizeof(bits));
231 231
232 /* Store state in digest */ 232 /* Store state in digest */
233 for (i = 0; i < 8; i++) 233 for (i = 0; i < 8; i++)
234 dst[i] = cpu_to_be64(sctx->state[i]); 234 dst[i] = cpu_to_be64(sctx->state[i]);
235 235
236 /* Zeroize sensitive information. */ 236 /* Zeroize sensitive information. */
237 memset(sctx, 0, sizeof(struct sha512_state)); 237 memset(sctx, 0, sizeof(struct sha512_state));
238 238
239 return 0; 239 return 0;
240 } 240 }
241 241
242 static int sha384_final(struct shash_desc *desc, u8 *hash) 242 static int sha384_final(struct shash_desc *desc, u8 *hash)
243 { 243 {
244 u8 D[64]; 244 u8 D[64];
245 245
246 sha512_final(desc, D); 246 sha512_final(desc, D);
247 247
248 memcpy(hash, D, 48); 248 memcpy(hash, D, 48);
249 memset(D, 0, 64); 249 memset(D, 0, 64);
250 250
251 return 0; 251 return 0;
252 } 252 }
253 253
254 static struct shash_alg sha512 = { 254 static struct shash_alg sha512 = {
255 .digestsize = SHA512_DIGEST_SIZE, 255 .digestsize = SHA512_DIGEST_SIZE,
256 .init = sha512_init, 256 .init = sha512_init,
257 .update = sha512_update, 257 .update = sha512_update,
258 .final = sha512_final, 258 .final = sha512_final,
259 .descsize = sizeof(struct sha512_state), 259 .descsize = sizeof(struct sha512_state),
260 .base = { 260 .base = {
261 .cra_name = "sha512", 261 .cra_name = "sha512",
262 .cra_flags = CRYPTO_ALG_TYPE_SHASH, 262 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
263 .cra_blocksize = SHA512_BLOCK_SIZE, 263 .cra_blocksize = SHA512_BLOCK_SIZE,
264 .cra_module = THIS_MODULE, 264 .cra_module = THIS_MODULE,
265 } 265 }
266 }; 266 };
267 267
268 static struct shash_alg sha384 = { 268 static struct shash_alg sha384 = {
269 .digestsize = SHA384_DIGEST_SIZE, 269 .digestsize = SHA384_DIGEST_SIZE,
270 .init = sha384_init, 270 .init = sha384_init,
271 .update = sha512_update, 271 .update = sha512_update,
272 .final = sha384_final, 272 .final = sha384_final,
273 .descsize = sizeof(struct sha512_state), 273 .descsize = sizeof(struct sha512_state),
274 .base = { 274 .base = {
275 .cra_name = "sha384", 275 .cra_name = "sha384",
276 .cra_flags = CRYPTO_ALG_TYPE_SHASH, 276 .cra_flags = CRYPTO_ALG_TYPE_SHASH,
277 .cra_blocksize = SHA384_BLOCK_SIZE, 277 .cra_blocksize = SHA384_BLOCK_SIZE,
278 .cra_module = THIS_MODULE, 278 .cra_module = THIS_MODULE,
279 } 279 }
280 }; 280 };
281 281
282 static int __init sha512_generic_mod_init(void) 282 static int __init sha512_generic_mod_init(void)
283 { 283 {
284 int ret = 0; 284 int ret = 0;
285 285
286 if ((ret = crypto_register_shash(&sha384)) < 0) 286 if ((ret = crypto_register_shash(&sha384)) < 0)
287 goto out; 287 goto out;
288 if ((ret = crypto_register_shash(&sha512)) < 0) 288 if ((ret = crypto_register_shash(&sha512)) < 0)
289 crypto_unregister_shash(&sha384); 289 crypto_unregister_shash(&sha384);
290 out: 290 out:
291 return ret; 291 return ret;
292 } 292 }
293 293
294 static void __exit sha512_generic_mod_fini(void) 294 static void __exit sha512_generic_mod_fini(void)
295 { 295 {
296 crypto_unregister_shash(&sha384); 296 crypto_unregister_shash(&sha384);
297 crypto_unregister_shash(&sha512); 297 crypto_unregister_shash(&sha512);
298 } 298 }
299 299
300 module_init(sha512_generic_mod_init); 300 module_init(sha512_generic_mod_init);
301 module_exit(sha512_generic_mod_fini); 301 module_exit(sha512_generic_mod_fini);
302 302
303 MODULE_LICENSE("GPL"); 303 MODULE_LICENSE("GPL");
304 MODULE_DESCRIPTION("SHA-512 and SHA-384 Secure Hash Algorithms"); 304 MODULE_DESCRIPTION("SHA-512 and SHA-384 Secure Hash Algorithms");
305 305
306 MODULE_ALIAS("sha384"); 306 MODULE_ALIAS("sha384");
307 MODULE_ALIAS("sha512"); 307 MODULE_ALIAS("sha512");
308 308