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:
"This fixes a compiler warning introduced by a previous fix, as well as
two crash bugs on ARM"
* 'linus' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6:
crypto: sha512/arm - fix crash bug in Thumb2 build
crypto: sha256/arm - fix crash bug in Thumb2 build
crypto: ccree - add missing inline qualifier
+9
-5
+2
-1
arch/arm/crypto/sha256-armv4.pl
+2
-1
arch/arm/crypto/sha256-armv4.pl
···
212
212
.global sha256_block_data_order
213
213
.type sha256_block_data_order,%function
214
214
sha256_block_data_order:
215
+
.Lsha256_block_data_order:
215
216
#if __ARM_ARCH__<7
216
217
sub r3,pc,#8 @ sha256_block_data_order
217
218
#else
218
-
adr r3,sha256_block_data_order
219
+
adr r3,.Lsha256_block_data_order
219
220
#endif
220
221
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
221
222
ldr r12,.LOPENSSL_armcap
+2
-1
arch/arm/crypto/sha256-core.S_shipped
+2
-1
arch/arm/crypto/sha256-core.S_shipped
···
93
93
.global sha256_block_data_order
94
94
.type sha256_block_data_order,%function
95
95
sha256_block_data_order:
96
+
.Lsha256_block_data_order:
96
97
#if __ARM_ARCH__<7
97
98
sub r3,pc,#8 @ sha256_block_data_order
98
99
#else
99
-
adr r3,sha256_block_data_order
100
+
adr r3,.Lsha256_block_data_order
100
101
#endif
101
102
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
102
103
ldr r12,.LOPENSSL_armcap
+2
-1
arch/arm/crypto/sha512-armv4.pl
+2
-1
arch/arm/crypto/sha512-armv4.pl
···
274
274
.global sha512_block_data_order
275
275
.type sha512_block_data_order,%function
276
276
sha512_block_data_order:
277
+
.Lsha512_block_data_order:
277
278
#if __ARM_ARCH__<7
278
279
sub r3,pc,#8 @ sha512_block_data_order
279
280
#else
280
-
adr r3,sha512_block_data_order
281
+
adr r3,.Lsha512_block_data_order
281
282
#endif
282
283
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
283
284
ldr r12,.LOPENSSL_armcap
+2
-1
arch/arm/crypto/sha512-core.S_shipped
+2
-1
arch/arm/crypto/sha512-core.S_shipped
···
141
141
.global sha512_block_data_order
142
142
.type sha512_block_data_order,%function
143
143
sha512_block_data_order:
144
+
.Lsha512_block_data_order:
144
145
#if __ARM_ARCH__<7
145
146
sub r3,pc,#8 @ sha512_block_data_order
146
147
#else
147
-
adr r3,sha512_block_data_order
148
+
adr r3,.Lsha512_block_data_order
148
149
#endif
149
150
#if __ARM_MAX_ARCH__>=7 && !defined(__KERNEL__)
150
151
ldr r12,.LOPENSSL_armcap