Normalize asm names

7 files changed, 13 insertions, 13 deletions

diff --git a/src/hash/md4_ia32/md4.cpp b/src/hash/md4_ia32/md4.cpp
index e3dc79012..12466e86e 100644
--- a/src/hash/md4_ia32/md4.cpp
+++ b/src/hash/md4_ia32/md4.cpp
@@ -8,7 +8,7 @@
 
 namespace Botan {
 
-extern "C" void md4_core(u32bit[4], const byte[64], u32bit[16]);
+extern "C" void botan_md4_core_asm(u32bit[4], const byte[64], u32bit[16]);
 
 /*************************************************
 * MD4 Compression Function                       *
diff --git a/src/hash/md4_ia32/md4core.S b/src/hash/md4_ia32/md4_ia32.S
index 662e9924a..410c540e9 100644
--- a/src/hash/md4_ia32/md4core.S
+++ b/src/hash/md4_ia32/md4_ia32.S
@@ -5,9 +5,9 @@
 
 #include <botan/asm_macr.h>
 
-START_LISTING(md4core.S)
+START_LISTING(md4_ia32.S)
 
-START_FUNCTION(md4_core)
+START_FUNCTION(botan_md4_core_asm)
    SPILL_REGS()
 
 #define PUSHED 4
@@ -132,4 +132,4 @@ LOOP_UNTIL_EQ(ESI, 16, .LOAD_INPUT)
    ADD(ARRAY4(EBP, 3), EDX)
 
    RESTORE_REGS()
-END_FUNCTION(md4_core)
+END_FUNCTION(botan_md4_core_asm)
diff --git a/src/hash/md5_ia32/md5.cpp b/src/hash/md5_ia32/md5.cpp
index cfe48e7e9..04e7673c1 100644
--- a/src/hash/md5_ia32/md5.cpp
+++ b/src/hash/md5_ia32/md5.cpp
@@ -8,7 +8,7 @@
 
 namespace Botan {
 
-extern "C" void md5_core(u32bit[4], const byte[64], u32bit[16]);
+extern "C" void botan_md5_core_asm(u32bit[4], const byte[64], u32bit[16]);
 
 /*************************************************
 * MD5 Compression Function                       *
diff --git a/src/hash/md5_ia32/md5core.S b/src/hash/md5_ia32/md5_ia32.S
index 8ebe469f3..8e1ec2e79 100644
--- a/src/hash/md5_ia32/md5core.S
+++ b/src/hash/md5_ia32/md5_ia32.S
@@ -5,9 +5,9 @@
 
 #include <botan/asm_macr.h>
 
-START_LISTING(md5core.S)
+START_LISTING(md5_ia32.S)
 
-START_FUNCTION(md5_core)
+START_FUNCTION(botan_md5_core_asm)
    SPILL_REGS()
 
 #define PUSHED 4
@@ -161,4 +161,4 @@ LOOP_UNTIL_EQ(ESI, 16, .LOAD_INPUT)
    ADD(ARRAY4(EBP, 3), EDX)
 
    RESTORE_REGS()
-END_FUNCTION(md5_core)
+END_FUNCTION(botan_md5_core_asm)
diff --git a/src/hash/sha1_amd64/sha160.cpp b/src/hash/sha1_amd64/sha160.cpp
index cfac02f45..c7fbea25a 100644
--- a/src/hash/sha1_amd64/sha160.cpp
+++ b/src/hash/sha1_amd64/sha160.cpp
@@ -8,7 +8,7 @@
 
 namespace Botan {
 
-extern "C" void botan_sha160_asm_amd64(u32bit[5], const byte[64], u32bit[80]);
+extern "C" void botan_sha160_core_asm(u32bit[5], const byte[64], u32bit[80]);
 
 /*************************************************
 * SHA-160 Compression Function                   *
diff --git a/src/hash/sha1_amd64/sha1_asm.S b/src/hash/sha1_amd64/sha1_asm.S
index ecf4a18ce..b94dfbadc 100644
--- a/src/hash/sha1_amd64/sha1_asm.S
+++ b/src/hash/sha1_amd64/sha1_asm.S
@@ -7,7 +7,7 @@
 
 START_LISTING(sha1_asm.S)
 
-START_FUNCTION(botan_sha160_asm_amd64)
+START_FUNCTION(botan_sha160_core_asm)
 
 #define DIGEST_ARR %rdi
 #define INPUT %rsi
@@ -255,4 +255,4 @@ ALIGN;
    ADD(ARRAY4(DIGEST_ARR, 3), B)
    ADD(ARRAY4(DIGEST_ARR, 4), C)
 
-END_FUNCTION(botan_sha160_asm_amd64)
+END_FUNCTION(botan_core_sha160_asm)
diff --git a/src/hash/sha1_ia32/sha1_asm.S b/src/hash/sha1_ia32/sha1_ia32.S
index 85bc9dc2c..ddd72e316 100644
--- a/src/hash/sha1_ia32/sha1_asm.S
+++ b/src/hash/sha1_ia32/sha1_ia32.S
@@ -7,7 +7,7 @@
 
 START_LISTING(sha1_asm.S)
 
-START_FUNCTION(botan_sha160_asm_ia32)
+START_FUNCTION(botan_sha160_core_asm)
    SPILL_REGS()
 
 #define PUSHED 4
@@ -239,4 +239,4 @@ LOOP_UNTIL_EQ(ESI, 80, .EXPANSION)
    ADD(ARRAY4(EBP, 4), ECX)
 
    RESTORE_REGS()
-END_FUNCTION(botan_sha160_asm_ia32)
+END_FUNCTION(botan_sha160_core_asm)