* x86/machine.m4 (OFFSET): Moved macro, used to be in...

* x86/sha1-compress.asm (OFFSET): ... removed macro.

Rev: src/nettle/x86/machine.m4:1.8
Rev: src/nettle/x86/sha1-compress.asm:1.12

diff --git a/x86/machine.m4 b/x86/machine.m4
index dd87b33c4c39948b826657e47dbd26eafb0de876..3296482c6c70b59a00d896d3f2805a1a083ae872 100644 (file)
--- a/x86/machine.m4
+++ b/x86/machine.m4
@@ -92,3 +92,7 @@ define(<AES_SUBST_BYTE>, <
        andl    <$>0x000000ff,%ebp
        movb    AES_SBOX + $1 (%ebp),%dl
        roll    <$>8,%edx>)dnl
+
+C OFFSET(i)
+C Expands to 4*i, or to the empty string if i is zero
+define(<OFFSET>, <ifelse($1,0,,eval(4*$1))>)

diff --git a/x86/sha1-compress.asm b/x86/sha1-compress.asm
index e3f496c436d886920a4f7f07df42d9833e8318a7..b37ace371cebaf2399a9295b4033385414f84da0 100644 (file)
--- a/x86/sha1-compress.asm
+++ b/x86/sha1-compress.asm
@@ -33,10 +33,6 @@ define(<K1VALUE>, <<$>0x5A827999>)           C  Rounds  0-19
 define(<K2VALUE>, <<$>0x6ED9EBA1>)             C  Rounds 20-39
 define(<K3VALUE>, <<$>0x8F1BBCDC>)             C  Rounds 40-59
 define(<K4VALUE>, <<$>0xCA62C1D6>)             C  Rounds 60-79
-
-C OFFSET(i)
-C Expands to 4*i, or to the empty string if i is zero
-define(<OFFSET>, <ifelse($1,0,,eval(4*$1))>)
        
 C Reads the input via TMP2 into register, byteswaps it, and stores it in the DATA array.
 C SWAP(index, register)
@@ -120,7 +116,7 @@ C adding, and then rotating back.
 
        .file "sha1-compress.asm"
 
-       C sha1_compress(uint32_t *state, uint8_t *data)
+       C _nettle_sha1_compress(uint32_t *state, uint8_t *data)
        
        .text
        .align 16