From e6ef86f7ebee4db5dccb351ff7ef7729de6dea42 Mon Sep 17 00:00:00 2001
From: Torben Hansen <50673096+torben-hansen@users.noreply.github.com>
Date: Wed, 15 Nov 2023 15:18:45 -0800
Subject: [PATCH] Avoid duplicate labels in ed25519 x86 implementation

---
 x86/curve25519/edwards25519_scalarmuldouble.S         | 8 ++++----
 x86/curve25519/edwards25519_scalarmuldouble_alt.S     | 8 ++++----
 x86_att/curve25519/edwards25519_scalarmuldouble.S     | 8 ++++----
 x86_att/curve25519/edwards25519_scalarmuldouble_alt.S | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/x86/curve25519/edwards25519_scalarmuldouble.S b/x86/curve25519/edwards25519_scalarmuldouble.S
index f26f5e6a..50f80245 100644
--- a/x86/curve25519/edwards25519_scalarmuldouble.S
+++ b/x86/curve25519/edwards25519_scalarmuldouble.S
@@ -2072,8 +2072,8 @@ edwards25519_scalarmuldouble_loop:
         mov     [rsp+0x78], rax
         mov     QWORD PTR [rsp+0x90], 0xa
         mov     QWORD PTR [rsp+0x98], 0x1
-        jmp     curve25519_x25519_midloop
-curve25519_x25519_inverseloop:
+        jmp     edwards25519_scalarmuldouble_midloop
+edwards25519_scalarmuldouble_inverseloop:
         mov     r9, r8
         sar     r9, 0x3f
         xor     r8, r9
@@ -2364,7 +2364,7 @@ curve25519_x25519_inverseloop:
         shl     rax, 0x3f
         add     rsi, rax
         mov     [rsp+0x78], rsi
-curve25519_x25519_midloop:
+edwards25519_scalarmuldouble_midloop:
         mov     rsi, [rsp+0x98]
         mov     rdx, [rsp]
         mov     rcx, [rsp+0x20]
@@ -3265,7 +3265,7 @@ curve25519_x25519_midloop:
         lea     r12, [rax+rdx]
         mov     [rsp+0x98], rsi
         dec     QWORD PTR [rsp+0x90]
-        jne     curve25519_x25519_inverseloop
+        jne     edwards25519_scalarmuldouble_inverseloop
         mov     rax, [rsp]
         mov     rcx, [rsp+0x20]
         imul    rax, r8
diff --git a/x86/curve25519/edwards25519_scalarmuldouble_alt.S b/x86/curve25519/edwards25519_scalarmuldouble_alt.S
index aa9675bf..7b96fd83 100644
--- a/x86/curve25519/edwards25519_scalarmuldouble_alt.S
+++ b/x86/curve25519/edwards25519_scalarmuldouble_alt.S
@@ -2189,8 +2189,8 @@ edwards25519_scalarmuldouble_alt_loop:
         mov     [rsp+0x78], rax
         mov     QWORD PTR [rsp+0x90], 0xa
         mov     QWORD PTR [rsp+0x98], 0x1
-        jmp     curve25519_x25519_midloop
-curve25519_x25519_inverseloop:
+        jmp     edwards25519_scalarmuldouble_alt_midloop
+edwards25519_scalarmuldouble_alt_inverseloop:
         mov     r9, r8
         sar     r9, 0x3f
         xor     r8, r9
@@ -2481,7 +2481,7 @@ curve25519_x25519_inverseloop:
         shl     rax, 0x3f
         add     rsi, rax
         mov     [rsp+0x78], rsi
-curve25519_x25519_midloop:
+edwards25519_scalarmuldouble_alt_midloop:
         mov     rsi, [rsp+0x98]
         mov     rdx, [rsp]
         mov     rcx, [rsp+0x20]
@@ -3382,7 +3382,7 @@ curve25519_x25519_midloop:
         lea     r12, [rax+rdx]
         mov     [rsp+0x98], rsi
         dec     QWORD PTR [rsp+0x90]
-        jne     curve25519_x25519_inverseloop
+        jne     edwards25519_scalarmuldouble_alt_inverseloop
         mov     rax, [rsp]
         mov     rcx, [rsp+0x20]
         imul    rax, r8
diff --git a/x86_att/curve25519/edwards25519_scalarmuldouble.S b/x86_att/curve25519/edwards25519_scalarmuldouble.S
index 35fd7f4f..7e5fd2b4 100644
--- a/x86_att/curve25519/edwards25519_scalarmuldouble.S
+++ b/x86_att/curve25519/edwards25519_scalarmuldouble.S
@@ -2072,8 +2072,8 @@ edwards25519_scalarmuldouble_loop:
         movq    %rax, 0x78(%rsp)
         movq    $0xa,  0x90(%rsp)
         movq    $0x1,  0x98(%rsp)
-        jmp     curve25519_x25519_midloop
-curve25519_x25519_inverseloop:
+        jmp     edwards25519_scalarmuldouble_midloop
+edwards25519_scalarmuldouble_inverseloop:
         movq    %r8, %r9
         sarq    $0x3f, %r9
         xorq    %r9, %r8
@@ -2364,7 +2364,7 @@ curve25519_x25519_inverseloop:
         shlq    $0x3f, %rax
         addq    %rax, %rsi
         movq    %rsi, 0x78(%rsp)
-curve25519_x25519_midloop:
+edwards25519_scalarmuldouble_midloop:
         movq    0x98(%rsp), %rsi
         movq    (%rsp), %rdx
         movq    0x20(%rsp), %rcx
@@ -3265,7 +3265,7 @@ curve25519_x25519_midloop:
         leaq    (%rax,%rdx), %r12
         movq    %rsi, 0x98(%rsp)
         decq     0x90(%rsp)
-        jne     curve25519_x25519_inverseloop
+        jne     edwards25519_scalarmuldouble_inverseloop
         movq    (%rsp), %rax
         movq    0x20(%rsp), %rcx
         imulq   %r8, %rax
diff --git a/x86_att/curve25519/edwards25519_scalarmuldouble_alt.S b/x86_att/curve25519/edwards25519_scalarmuldouble_alt.S
index e17d10b4..4cd5d1e6 100644
--- a/x86_att/curve25519/edwards25519_scalarmuldouble_alt.S
+++ b/x86_att/curve25519/edwards25519_scalarmuldouble_alt.S
@@ -2189,8 +2189,8 @@ edwards25519_scalarmuldouble_alt_loop:
         movq    %rax, 0x78(%rsp)
         movq    $0xa,  0x90(%rsp)
         movq    $0x1,  0x98(%rsp)
-        jmp     curve25519_x25519_midloop
-curve25519_x25519_inverseloop:
+        jmp     edwards25519_scalarmuldouble_alt_midloop
+edwards25519_scalarmuldouble_alt_inverseloop:
         movq    %r8, %r9
         sarq    $0x3f, %r9
         xorq    %r9, %r8
@@ -2481,7 +2481,7 @@ curve25519_x25519_inverseloop:
         shlq    $0x3f, %rax
         addq    %rax, %rsi
         movq    %rsi, 0x78(%rsp)
-curve25519_x25519_midloop:
+edwards25519_scalarmuldouble_alt_midloop:
         movq    0x98(%rsp), %rsi
         movq    (%rsp), %rdx
         movq    0x20(%rsp), %rcx
@@ -3382,7 +3382,7 @@ curve25519_x25519_midloop:
         leaq    (%rax,%rdx), %r12
         movq    %rsi, 0x98(%rsp)
         decq     0x90(%rsp)
-        jne     curve25519_x25519_inverseloop
+        jne     edwards25519_scalarmuldouble_alt_inverseloop
         movq    (%rsp), %rax
         movq    0x20(%rsp), %rcx
         imulq   %r8, %rax