* x86/aes-decrypt.asm: Use C_NAME(_nettle_aes_decrypt_table) when

using the AES_SUBST_BYTE macro. Use PROLOGUE and EPILOGUE.
* x86/sha1-compress.asm: Use PROLOGUE and EPILOGUE.
* x86/arcfour-crypt.asm: Likewise.
* x86/aes-encrypt.asm: Likewise.

Rev: src/nettle/x86/aes-encrypt.asm:1.22
Rev: src/nettle/x86/arcfour-crypt.asm:1.13
Rev: src/nettle/x86/sha1-compress.asm:1.11

diff --git a/x86/aes-encrypt.asm b/x86/aes-encrypt.asm
index 346ddf5cf20a57133964bc3df3a138cbcebbe8db..ddc4f262906db55f57dfa4ce404ee728cf9bdae5 100644 (file)
--- a/x86/aes-encrypt.asm
+++ b/x86/aes-encrypt.asm
@@ -35,9 +35,7 @@ C %edi is a temporary, often used as an accumulator.
        C             uint8_t *src)
        .text
        .align 16
-       .globl C_NAME(nettle_aes_encrypt)
-       .type  C_NAME(nettle_aes_encrypt),@function
-C_NAME(nettle_aes_encrypt):
+PROLOGUE(nettle_aes_encrypt)
        C save all registers that need to be saved
        pushl   %ebx            C  16(%esp)
        pushl   %ebp            C  12(%esp)
@@ -136,5 +134,4 @@ C_NAME(nettle_aes_encrypt):
        popl    %ebp
        popl    %ebx
        ret
-.Leord:
-       .size   C_NAME(nettle_aes_encrypt),.Leord-C_NAME(nettle_aes_encrypt)
+EPILOGUE(nettle_aes_encrypt)

diff --git a/x86/arcfour-crypt.asm b/x86/arcfour-crypt.asm
index 7f97640620833f1d60d56bbd631f28d1827ec550..74a65a9474d0984978207bacce0252a2a0e6407e 100644 (file)
--- a/x86/arcfour-crypt.asm
+++ b/x86/arcfour-crypt.asm
@@ -24,9 +24,7 @@ C MA 02111-1307, USA.
        C               const uint8_t *src)
        .text
        .align 16
-       .globl C_NAME(nettle_arcfour_crypt)
-       .type  C_NAME(nettle_arcfour_crypt),@function
-C_NAME(nettle_arcfour_crypt):
+PROLOGUE(nettle_arcfour_crypt)
        C save all registers that need to be saved
        pushl   %ebx            C  12(%esp)
        pushl   %ebp            C  8(%esp)
@@ -90,5 +88,4 @@ C     andl    $0xff, %ebx
        popl    %ebp
        popl    %ebx
        ret
-.Leord:
-       .size   C_NAME(nettle_arcfour_crypt),.Leord-C_NAME(nettle_arcfour_crypt)
+EPILOGUE(nettle_arcfour_crypt)

diff --git a/x86/sha1-compress.asm b/x86/sha1-compress.asm
index cbab41221622d39ff218bad9c7044aa082018fa6..e3f496c436d886920a4f7f07df42d9833e8318a7 100644 (file)
--- a/x86/sha1-compress.asm
+++ b/x86/sha1-compress.asm
@@ -124,9 +124,7 @@ C adding, and then rotating back.
        
        .text
        .align 16
-       .globl C_NAME(_nettle_sha1_compress)
-       .type  C_NAME(_nettle_sha1_compress),@function
-C_NAME(_nettle_sha1_compress):
+PROLOGUE(_nettle_sha1_compress)
        C save all registers that need to be saved
        
        pushl   %ebx            C  80(%esp)
@@ -268,9 +266,7 @@ C_NAME(_nettle_sha1_compress):
        popl    %ebp
        popl    %ebx
        ret
-
-.Leord:
-       .size   _nettle_sha1_compress,.Leord-_nettle_sha1_compress
+EPILOGUE(_nettle_sha1_compress)
 
 C  It's possible to shave of half of the stores to tmp in the evaluation of f3,
 C  although it's probably not worth the effort. This is the trick: