diff --git a/arm/ecc-secp192r1-modp.asm b/arm/ecc-secp192r1-modp.asm index dbaae2e38922ae52134f0c70338e1a95cb0e041b..4680336f1bc750e6a14c954e5f10f10d6b6a511c 100644 --- a/arm/ecc-secp192r1-modp.asm +++ b/arm/ecc-secp192r1-modp.asm @@ -53,7 +53,7 @@ define(<C4>, <r12>) .text .align 2 -PROLOGUE(nettle_ecc_192_modp) +PROLOGUE(_nettle_ecc_192_modp) push {r4,r5,r6,r7,r8,r10} C Reduce two words at a time add HP, RP, #48 @@ -103,4 +103,4 @@ PROLOGUE(nettle_ecc_192_modp) pop {r4,r5,r6,r7,r8,r10} bx lr -EPILOGUE(nettle_ecc_192_modp) +EPILOGUE(_nettle_ecc_192_modp) diff --git a/arm/ecc-secp224r1-modp.asm b/arm/ecc-secp224r1-modp.asm index 2c86755a7c9a37555681a56810a5094b3e346210..400b7a815c2c0a4310ee96b9bc3b3f6b7029d8bf 100644 --- a/arm/ecc-secp224r1-modp.asm +++ b/arm/ecc-secp224r1-modp.asm @@ -52,7 +52,7 @@ define(<L2>, <lr>) .text .align 2 -PROLOGUE(nettle_ecc_224_modp) +PROLOGUE(_nettle_ecc_224_modp) push {r4,r5,r6,r7,r8,r10,r11,lr} add L2, RP, #28 @@ -121,4 +121,4 @@ PROLOGUE(nettle_ecc_224_modp) stmdb RP, {T0,T1,T2,T3,T4,T5,T6} pop {r4,r5,r6,r7,r8,r10,r11,pc} -EPILOGUE(nettle_ecc_224_modp) +EPILOGUE(_nettle_ecc_224_modp) diff --git a/arm/ecc-secp256r1-redc.asm b/arm/ecc-secp256r1-redc.asm index 9c20062a44e4541387da43f1fbeea927861bedcf..7b117de43fbce9db27ade435273eee98843145ee 100644 --- a/arm/ecc-secp256r1-redc.asm +++ b/arm/ecc-secp256r1-redc.asm @@ -52,7 +52,7 @@ define(<F3>, <lr>) .text .align 2 -PROLOGUE(nettle_ecc_256_redc) +PROLOGUE(_nettle_ecc_256_redc) push {r4,r5,r6,r7,r8,r10,r11,lr} ldm RP!, {T0,T1,T2,T3,T4,T5,T6,T7} @@ -170,4 +170,4 @@ PROLOGUE(nettle_ecc_256_redc) stm RP, {T0,T1,T2,T3,T4,T5,T6,T7} pop {r4,r5,r6,r7,r8,r10,r11,pc} -EPILOGUE(nettle_ecc_256_redc) +EPILOGUE(_nettle_ecc_256_redc) diff --git a/arm/ecc-secp384r1-modp.asm b/arm/ecc-secp384r1-modp.asm index dbedbdf8d32ee9916f947922cef403cdd720ca00..dd9a325b09de3e15921f03a291afa0db6372cec4 100644 --- a/arm/ecc-secp384r1-modp.asm +++ b/arm/ecc-secp384r1-modp.asm @@ -50,7 +50,7 @@ define(<H>, <lr>) .text .align 2 -PROLOGUE(nettle_ecc_384_modp) +PROLOGUE(_nettle_ecc_384_modp) push {r4,r5,r6,r7,r8,r10,lr} add RP, RP, #80 @@ -267,4 +267,4 @@ PROLOGUE(nettle_ecc_384_modp) adcs T3, T3, H stm RP!, {T0,T1,T2,T3} C 8-11 pop {r4,r5,r6,r7,r8,r10,pc} -EPILOGUE(nettle_ecc_384_modp) +EPILOGUE(_nettle_ecc_384_modp) diff --git a/arm/ecc-secp521r1-modp.asm b/arm/ecc-secp521r1-modp.asm index 2b4f79192a2e7a557b951234fb27f38b473ba7f4..f11967634689f54f03094cdaf7b7150784a6092f 100644 --- a/arm/ecc-secp521r1-modp.asm +++ b/arm/ecc-secp521r1-modp.asm @@ -52,7 +52,7 @@ define(<N>, <lr>) .align 2 -PROLOGUE(nettle_ecc_521_modp) +PROLOGUE(_nettle_ecc_521_modp) push {r4,r5,r6,r7,r8,lr} C Use that B^17 = 2^23 (mod p) @@ -124,4 +124,4 @@ PROLOGUE(nettle_ecc_521_modp) stm RP, {T0,T1,T2,F0,F1,F2,F3,H} C 9-16 pop {r4,r5,r6,r7,r8,pc} -EPILOGUE(nettle_ecc_521_modp) +EPILOGUE(_nettle_ecc_521_modp) diff --git a/ecc-curve25519.c b/ecc-curve25519.c index 73d72765dce82b255426be9737a36a4dc5862cf9..65843a57ee5a3e11db2a57472b4641735ea4933e 100644 --- a/ecc-curve25519.c +++ b/ecc-curve25519.c @@ -48,7 +48,7 @@ #if HAVE_NATIVE_ecc_25519_modp -#define ecc_25519_modp nettle_ecc_25519_modp +#define ecc_25519_modp _nettle_ecc_25519_modp void ecc_25519_modp (const struct ecc_modulo *m, mp_limb_t *rp); #else diff --git a/ecc-curve448.c b/ecc-curve448.c index 7020e3e8f6aa1b94247d171ba5d9b5fa7b9e74d8..981dc53f279e7e6d2bf5ff42828c5fae895bf4b8 100644 --- a/ecc-curve448.c +++ b/ecc-curve448.c @@ -46,7 +46,7 @@ #include "ecc-curve448.h" #if HAVE_NATIVE_ecc_curve448_modp -#define ecc_448_modp nettle_ecc_curve448_modp +#define ecc_448_modp _nettle_ecc_curve448_modp void ecc_448_modp (const struct ecc_modulo *m, mp_limb_t *rp); #elif GMP_NUMB_BITS == 64 diff --git a/ecc-secp192r1.c b/ecc-secp192r1.c index 858a1b7554ce9a025df6b3671f0e601879381c41..15f5f1fa4c04f19b5641d3d1a0b52cb060d4ed37 100644 --- a/ecc-secp192r1.c +++ b/ecc-secp192r1.c @@ -50,7 +50,7 @@ #if HAVE_NATIVE_ecc_192_modp -#define ecc_192_modp nettle_ecc_192_modp +#define ecc_192_modp _nettle_ecc_192_modp void ecc_192_modp (const struct ecc_modulo *m, mp_limb_t *rp); diff --git a/ecc-secp224r1.c b/ecc-secp224r1.c index 4d82f54b57fd777b1f785e9db36a9e5713ab3841..28b938fa3282e8fad845cd893444785f01a8dcd2 100644 --- a/ecc-secp224r1.c +++ b/ecc-secp224r1.c @@ -43,7 +43,7 @@ #if HAVE_NATIVE_ecc_224_modp #define USE_REDC 0 -#define ecc_224_modp nettle_ecc_224_modp +#define ecc_224_modp _nettle_ecc_224_modp void ecc_224_modp (const struct ecc_modulo *m, mp_limb_t *rp); diff --git a/ecc-secp256r1.c b/ecc-secp256r1.c index 835c91d302395b2e017d3cc7124929279a1ab7ac..160a047957f8628451d78dc54a9d0b503c0c0f84 100644 --- a/ecc-secp256r1.c +++ b/ecc-secp256r1.c @@ -51,7 +51,7 @@ #include "ecc-secp256r1.h" #if HAVE_NATIVE_ecc_256_redc -# define ecc_256_redc nettle_ecc_256_redc +# define ecc_256_redc _nettle_ecc_256_redc void ecc_256_redc (const struct ecc_modulo *p, mp_limb_t *rp); #else /* !HAVE_NATIVE_ecc_256_redc */ diff --git a/ecc-secp384r1.c b/ecc-secp384r1.c index 248b1cf3ef2be28b8e8458bcf65b500e80f9cf8c..32f75fb618bae8fa0775ff49ce14c23a75012a7d 100644 --- a/ecc-secp384r1.c +++ b/ecc-secp384r1.c @@ -47,7 +47,7 @@ #include "ecc-secp384r1.h" #if HAVE_NATIVE_ecc_384_modp -#define ecc_384_modp nettle_ecc_384_modp +#define ecc_384_modp _nettle_ecc_384_modp void ecc_384_modp (const struct ecc_modulo *m, mp_limb_t *rp); #elif GMP_NUMB_BITS == 32 diff --git a/ecc-secp521r1.c b/ecc-secp521r1.c index cc7473035cffcad5f76617e9e47f3176511e230e..d952d77e444e47763a8411d6047ff3f725a7a0f5 100644 --- a/ecc-secp521r1.c +++ b/ecc-secp521r1.c @@ -45,7 +45,7 @@ #include "ecc-secp521r1.h" #if HAVE_NATIVE_ecc_521_modp -#define ecc_521_modp nettle_ecc_521_modp +#define ecc_521_modp _nettle_ecc_521_modp void ecc_521_modp (const struct ecc_modulo *m, mp_limb_t *rp); diff --git a/x86_64/ecc-curve25519-modp.asm b/x86_64/ecc-curve25519-modp.asm index 58c14fe0958eede88f6f6b68f639c227b12fc9b0..0374db12ab44afb6af14fd40706a711cb8f46b61 100644 --- a/x86_64/ecc-curve25519-modp.asm +++ b/x86_64/ecc-curve25519-modp.asm @@ -41,7 +41,7 @@ define(<T0>, <%r10>) define(<T1>, <%r11>) define(<M>, <%rbx>) -PROLOGUE(nettle_ecc_25519_modp) +PROLOGUE(_nettle_ecc_25519_modp) W64_ENTRY(2, 0) push %rbx @@ -91,4 +91,4 @@ PROLOGUE(nettle_ecc_25519_modp) pop %rbx W64_EXIT(2, 0) ret -EPILOGUE(nettle_ecc_25519_modp) +EPILOGUE(_nettle_ecc_25519_modp) diff --git a/x86_64/ecc-curve448-modp.asm b/x86_64/ecc-curve448-modp.asm index 1ca05a190e1ad51c11c1d8f4e5efffa44596d502..ea2e78861bc5302ef26820f4a352f796941b1e78 100644 --- a/x86_64/ecc-curve448-modp.asm +++ b/x86_64/ecc-curve448-modp.asm @@ -45,7 +45,7 @@ define(<T0>, <%r10>) define(<T1>, <%r11>) define(<T2>, <%r12>) -PROLOGUE(nettle_ecc_curve448_modp) +PROLOGUE(_nettle_ecc_curve448_modp) W64_ENTRY(2, 0) push %rbx @@ -141,4 +141,4 @@ PROLOGUE(nettle_ecc_curve448_modp) W64_EXIT(2, 0) ret -EPILOGUE(nettle_ecc_curve448_modp) +EPILOGUE(_nettle_ecc_curve448_modp) diff --git a/x86_64/ecc-secp192r1-modp.asm b/x86_64/ecc-secp192r1-modp.asm index 644ed60c6fabdf37d97846472c50a7622faf14a8..ad8dca7186e43e59f5381c9af30e3ed236bd03fb 100644 --- a/x86_64/ecc-secp192r1-modp.asm +++ b/x86_64/ecc-secp192r1-modp.asm @@ -44,7 +44,7 @@ define(<C2>, <%r11>) C ecc_192_modp (const struct ecc_modulo *m, mp_limb_t *rp) .text ALIGN(16) -PROLOGUE(nettle_ecc_192_modp) +PROLOGUE(_nettle_ecc_192_modp) W64_ENTRY(2, 0) mov 16(RP), T2 mov 24(RP), T3 @@ -85,4 +85,4 @@ PROLOGUE(nettle_ecc_192_modp) W64_EXIT(2, 0) ret -EPILOGUE(nettle_ecc_192_modp) +EPILOGUE(_nettle_ecc_192_modp) diff --git a/x86_64/ecc-secp224r1-modp.asm b/x86_64/ecc-secp224r1-modp.asm index ca164ac7d63759f8c7d2c2c22113e6c8db6c4109..e44b5418e5dd874011cb840f85c2678bf68d6e87 100644 --- a/x86_64/ecc-secp224r1-modp.asm +++ b/x86_64/ecc-secp224r1-modp.asm @@ -45,7 +45,7 @@ define(<F1>, <%r10>) define(<F2>, <%r11>) C ecc_224_modp (const struct ecc_modulo *m, mp_limb_t *rp) -PROLOGUE(nettle_ecc_224_modp) +PROLOGUE(_nettle_ecc_224_modp) W64_ENTRY(2, 0) mov 48(RP), H0 mov 56(RP), H1 @@ -128,4 +128,4 @@ PROLOGUE(nettle_ecc_224_modp) W64_EXIT(2, 0) ret -EPILOGUE(nettle_ecc_224_modp) +EPILOGUE(_nettle_ecc_224_modp) diff --git a/x86_64/ecc-secp256r1-redc.asm b/x86_64/ecc-secp256r1-redc.asm index ee689cd6d192a2364ab95b555edcc67957c1b49c..533a1766d4bc5f74a626522d09e47787c344fa41 100644 --- a/x86_64/ecc-secp256r1-redc.asm +++ b/x86_64/ecc-secp256r1-redc.asm @@ -58,7 +58,7 @@ define(<FOLD>, < sbb $1, F2 sbb <$>0, F3 >) -PROLOGUE(nettle_ecc_256_redc) +PROLOGUE(_nettle_ecc_256_redc) W64_ENTRY(2, 0) C save all registers that need to be saved push %rbx @@ -126,4 +126,4 @@ PROLOGUE(nettle_ecc_256_redc) pop %rbx W64_EXIT(2, 0) ret -EPILOGUE(nettle_ecc_256_redc) +EPILOGUE(_nettle_ecc_256_redc) diff --git a/x86_64/ecc-secp384r1-modp.asm b/x86_64/ecc-secp384r1-modp.asm index 3c8ec3f446c08870ff3ab137ea54f37ce4d9ffba..13f469b164e4439a17c11384fdd56f76cba71ac9 100644 --- a/x86_64/ecc-secp384r1-modp.asm +++ b/x86_64/ecc-secp384r1-modp.asm @@ -51,7 +51,7 @@ define(<C0>, H5) C Overlap define(<TMP>, RP) C Overlap -PROLOGUE(nettle_ecc_384_modp) +PROLOGUE(_nettle_ecc_384_modp) W64_ENTRY(2, 0) push %rbx @@ -231,4 +231,4 @@ PROLOGUE(nettle_ecc_384_modp) W64_EXIT(2, 0) ret -EPILOGUE(nettle_ecc_384_modp) +EPILOGUE(_nettle_ecc_384_modp) diff --git a/x86_64/ecc-secp521r1-modp.asm b/x86_64/ecc-secp521r1-modp.asm index 43a8cb8c9cfea0b167fccb574c0ce54141f85e55..6f4f7d90714def3d137335c67f5a0220437bd18b 100644 --- a/x86_64/ecc-secp521r1-modp.asm +++ b/x86_64/ecc-secp521r1-modp.asm @@ -48,7 +48,7 @@ define(<U9>, <%r11>) define(<T0>, <%r12>) define(<T1>, <%r13>) -PROLOGUE(nettle_ecc_521_modp) +PROLOGUE(_nettle_ecc_521_modp) W64_ENTRY(2, 0) push %rbx push %rbp @@ -155,4 +155,4 @@ PROLOGUE(nettle_ecc_521_modp) pop %rbx W64_EXIT(2, 0) ret -EPILOGUE(nettle_ecc_521_modp) +EPILOGUE(_nettle_ecc_521_modp)