[openssl] OpenSSL_1_1_1-stable update

[Kurt Roeckx]

The branch OpenSSL_1_1_1-stable has been updated
       via  ee617d0e020d6dd28c079fa7819d009790f2d2b9 (commit)
      from  8380f453ec81d9172b94a82c3592f78f1a612046 (commit)


- Log -----------------------------------------------------------------
commit ee617d0e020d6dd28c079fa7819d009790f2d2b9
Author: Henry N <12493969+HenryNe at users.noreply.github.com>
Date:   Thu Sep 10 23:55:28 2020 +0200

    Fix: ecp_nistz256-armv4.S bad arguments
    
    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 at fedoraproject.org>
    Reviewed-by: Kurt Roeckx <kurt at roeckx.be>
    GH: #12854
    (cherry picked from commit b5f82567afa820bac55b7dd7eb9dd510c32c3ef6)

-----------------------------------------------------------------------

Summary of changes:
 crypto/ec/asm/ecp_nistz256-armv4.pl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/crypto/ec/asm/ecp_nistz256-armv4.pl b/crypto/ec/asm/ecp_nistz256-armv4.pl
index ea538c0698..fa833ce6aa 100755
--- a/crypto/ec/asm/ecp_nistz256-armv4.pl
+++ b/crypto/ec/asm/ecp_nistz256-armv4.pl
@@ -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