[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  b238e78fe897dd22400e0353a9f43318397c2f98 (commit)
      from  1f085af02cc80fa0cb62eb81a49dcb00917b9d30 (commit)


- Log -----------------------------------------------------------------
commit b238e78fe897dd22400e0353a9f43318397c2f98
Author: Andrey Matyukov <andrey.matyukov at intel.com>
Date:   Tue Mar 23 20:47:28 2021 +0300

    Rearranged .pdata entries in rsaz-avx512.pl to make them properly ordered.
    
    Fixes #14660: Windows linking error
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14665)

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

Summary of changes:
 crypto/bn/asm/rsaz-avx512.pl | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/crypto/bn/asm/rsaz-avx512.pl b/crypto/bn/asm/rsaz-avx512.pl
index 063b9d6b5e..04effabffa 100644
--- a/crypto/bn/asm/rsaz-avx512.pl
+++ b/crypto/bn/asm/rsaz-avx512.pl
@@ -690,28 +690,28 @@ rsaz_def_handler:
     .rva    .LSEH_end_RSAZ_amm52x20_x1_256
     .rva    .LSEH_info_RSAZ_amm52x20_x1_256
 
-    .rva    .LSEH_begin_extract_multiplier_2x20_win5
-    .rva    .LSEH_end_extract_multiplier_2x20_win5
-    .rva    .LSEH_info_extract_multiplier_2x20_win5
-
     .rva    .LSEH_begin_RSAZ_amm52x20_x2_256
     .rva    .LSEH_end_RSAZ_amm52x20_x2_256
     .rva    .LSEH_info_RSAZ_amm52x20_x2_256
 
+    .rva    .LSEH_begin_extract_multiplier_2x20_win5
+    .rva    .LSEH_end_extract_multiplier_2x20_win5
+    .rva    .LSEH_info_extract_multiplier_2x20_win5
+
 .section    .xdata
 .align  8
 .LSEH_info_RSAZ_amm52x20_x1_256:
     .byte   9,0,0,0
     .rva    rsaz_def_handler
     .rva    .Lrsaz_amm52x20_x1_256_body,.Lrsaz_amm52x20_x1_256_epilogue
-.LSEH_info_extract_multiplier_2x20_win5:
-    .byte   9,0,0,0
-    .rva    rsaz_def_handler
-    .rva    .LSEH_begin_extract_multiplier_2x20_win5,.LSEH_begin_extract_multiplier_2x20_win5
 .LSEH_info_RSAZ_amm52x20_x2_256:
     .byte   9,0,0,0
     .rva    rsaz_def_handler
     .rva    .Lrsaz_amm52x20_x2_256_body,.Lrsaz_amm52x20_x2_256_epilogue
+.LSEH_info_extract_multiplier_2x20_win5:
+    .byte   9,0,0,0
+    .rva    rsaz_def_handler
+    .rva    .LSEH_begin_extract_multiplier_2x20_win5,.LSEH_begin_extract_multiplier_2x20_win5
 ___
 }
 }}} else {{{                # fallback for old assembler