Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 04443808 authored by Jussi Kivilinna's avatar Jussi Kivilinna Committed by Herbert Xu
Browse files

crypto: x86/salsa20 - assembler cleanup, use ENTRY/ENDPROC for assember... 


crypto: x86/salsa20 - assembler cleanup, use ENTRY/ENDPROC for assember functions and rename ECRYPT_* to salsa20_*

Signed-off-by: default avatarJussi Kivilinna <jussi.kivilinna@mbnet.fi>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarHerbert Xu <herbert@gondor.apana.org.au>
parent b05d3f37

arch/x86/crypto/salsa20-i586-asm_32.S

+14 −14
Original line number Diff line number Diff line
@@ -2,11 +2,12 @@ 
# D. J. Bernstein

# Public domain.



# enter ECRYPT_encrypt_bytes

#include <linux/linkage.h>



.text

.p2align 5

.globl ECRYPT_encrypt_bytes

ECRYPT_encrypt_bytes:



# enter salsa20_encrypt_bytes

ENTRY(salsa20_encrypt_bytes)

	mov	%esp,%eax

	and	$31,%eax

	add	$256,%eax
@@ -933,11 +934,10 @@ ECRYPT_encrypt_bytes: 
	add	$64,%esi

	# goto bytesatleast1

	jmp	._bytesatleast1

# enter ECRYPT_keysetup

.text

.p2align 5

.globl ECRYPT_keysetup

ECRYPT_keysetup:

ENDPROC(salsa20_encrypt_bytes)



# enter salsa20_keysetup

ENTRY(salsa20_keysetup)

	mov	%esp,%eax

	and	$31,%eax

	add	$256,%eax
@@ -1060,11 +1060,10 @@ ECRYPT_keysetup: 
	# leave

	add	%eax,%esp

	ret

# enter ECRYPT_ivsetup

.text

.p2align 5

.globl ECRYPT_ivsetup

ECRYPT_ivsetup:

ENDPROC(salsa20_keysetup)



# enter salsa20_ivsetup

ENTRY(salsa20_ivsetup)

	mov	%esp,%eax

	and	$31,%eax

	add	$256,%eax
@@ -1112,3 +1111,4 @@ ECRYPT_ivsetup: 
	# leave

	add	%eax,%esp

	ret

ENDPROC(salsa20_ivsetup)

arch/x86/crypto/salsa20-x86_64-asm_64.S

+13 −15
Original line number Diff line number Diff line 
# enter ECRYPT_encrypt_bytes

.text

.p2align 5

.globl ECRYPT_encrypt_bytes

ECRYPT_encrypt_bytes:

#include <linux/linkage.h>



# enter salsa20_encrypt_bytes

ENTRY(salsa20_encrypt_bytes)

	mov	%rsp,%r11

	and	$31,%r11

	add	$256,%r11
@@ -802,11 +801,10 @@ ECRYPT_encrypt_bytes: 
	# comment:fp stack unchanged by jump

	# goto bytesatleast1

	jmp	._bytesatleast1

# enter ECRYPT_keysetup

.text

.p2align 5

.globl ECRYPT_keysetup

ECRYPT_keysetup:

ENDPROC(salsa20_encrypt_bytes)



# enter salsa20_keysetup

ENTRY(salsa20_keysetup)

	mov	%rsp,%r11

	and	$31,%r11

	add	$256,%r11
@@ -892,11 +890,10 @@ ECRYPT_keysetup: 
	mov	%rdi,%rax

	mov	%rsi,%rdx

	ret

# enter ECRYPT_ivsetup

.text

.p2align 5

.globl ECRYPT_ivsetup

ECRYPT_ivsetup:

ENDPROC(salsa20_keysetup)



# enter salsa20_ivsetup

ENTRY(salsa20_ivsetup)

	mov	%rsp,%r11

	and	$31,%r11

	add	$256,%r11
@@ -918,3 +915,4 @@ ECRYPT_ivsetup: 
	mov	%rdi,%rax

	mov	%rsi,%rdx

	ret

ENDPROC(salsa20_ivsetup)

arch/x86/crypto/salsa20_glue.c

+0 −5
Original line number Diff line number Diff line
@@ -26,11 +26,6 @@ 
#define SALSA20_MIN_KEY_SIZE  16U

#define SALSA20_MAX_KEY_SIZE  32U



// use the ECRYPT_* function names

#define salsa20_keysetup        ECRYPT_keysetup

#define salsa20_ivsetup         ECRYPT_ivsetup

#define salsa20_encrypt_bytes   ECRYPT_encrypt_bytes



struct salsa20_ctx

{

	u32 input[16];