[openssl] master update

tmraz at fedoraproject.org tmraz at fedoraproject.org
Thu Oct 29 16:19:44 UTC 2020


The branch master has been updated
       via  fcf6e9d056162d5af64c6f7209388a5c3be2ce57 (commit)
      from  728d03b576f360e72bbddc7e751433575430af3b (commit)


- Log -----------------------------------------------------------------
commit fcf6e9d056162d5af64c6f7209388a5c3be2ce57
Author: Ard Biesheuvel <ard.biesheuvel at arm.com>
Date:   Tue Oct 27 18:02:40 2020 +0100

    crypto/poly1305/asm: fix armv8 pointer authentication
    
    PAC pointer authentication signs the return address against the value
    of the stack pointer, to prevent stack overrun exploits from corrupting
    the control flow. However, this requires that the AUTIASP is issued with
    SP holding the same value as it held when the PAC value was generated.
    The Poly1305 armv8 code got this wrong, resulting in crashes on PAC
    capable hardware.
    
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/13256)

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

Summary of changes:
 crypto/poly1305/asm/poly1305-armv8.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/poly1305/asm/poly1305-armv8.pl b/crypto/poly1305/asm/poly1305-armv8.pl
index d2d875ad6c..113a2151b6 100755
--- a/crypto/poly1305/asm/poly1305-armv8.pl
+++ b/crypto/poly1305/asm/poly1305-armv8.pl
@@ -866,8 +866,8 @@ poly1305_blocks_neon:
 	st1	{$ACC4}[0],[$ctx]
 
 .Lno_data_neon:
-	.inst	0xd50323bf		// autiasp
 	ldr	x29,[sp],#80
+	.inst	0xd50323bf		// autiasp
 	ret
 .size	poly1305_blocks_neon,.-poly1305_blocks_neon
 


More information about the openssl-commits mailing list