]> git.ipfire.org Git - thirdparty/openssl.git/commitdiff
Fix: ecp_nistz256-armv4.S bad arguments
authorHenry N <12493969+HenryNe@users.noreply.github.com>
Thu, 10 Sep 2020 21:55:28 +0000 (23:55 +0200)
committerKurt Roeckx <kurt@roeckx.be>
Sun, 20 Sep 2020 12:22:15 +0000 (14:22 +0200)
Fix this error:

crypto/ec/ecp_nistz256-armv4.S:3853: Error: bad arguments to instruction -- `orr r11,r10'
crypto/ec/ecp_nistz256-armv4.S:3854: Error: bad arguments to instruction -- `orr r11,r12'
crypto/ec/ecp_nistz256-armv4.S:3855: Error: bad arguments to instruction -- `orrs r11,r14'

CLA: trivial

Fixes #12848

Reviewed-by: Tomas Mraz <tmraz@fedoraproject.org>
Reviewed-by: Kurt Roeckx <kurt@roeckx.be>
GH: #12854
(cherry picked from commit b5f82567afa820bac55b7dd7eb9dd510c32c3ef6)

crypto/ec/asm/ecp_nistz256-armv4.pl

index ea538c0698d5457350964b836c7cceb83f293833..fa833ce6aaf37fee422e309b53e8fceeb486bed1 100755 (executable)
@@ -1517,9 +1517,9 @@ ecp_nistz256_point_add:
        ldr     $t2,[sp,#32*18+12]      @ ~is_equal(S1,S2)
        mvn     $t0,$t0                 @ -1/0 -> 0/-1
        mvn     $t1,$t1                 @ -1/0 -> 0/-1
-       orr     $a0,$t0
-       orr     $a0,$t1
-       orrs    $a0,$t2                 @ set flags
+       orr     $a0,$a0,$t0
+       orr     $a0,$a0,$t1
+       orrs    $a0,$a0,$t2             @ set flags
 
        @ if(~is_equal(U1,U2) | in1infty | in2infty | ~is_equal(S1,S2))
        bne     .Ladd_proceed