vendor/golang_org/x/crypto/chacha20poly1305: revendor to pick up fix for #18154

Fixes #18154.

Change-Id: I1836b63a380b7fc2f9965e909859b1a89a3ae5d5
Reviewed-on: https://go-review.googlesource.com/33856
Run-TryBot: Minux Ma <minux@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>

diff --git a/src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.s b/src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.s
index ac9584481d50ded5b6bd03776ece5a2266fd2c05..2fa9b555a89aa27f8fa3b937ba6af0921db026aa 100644 (file)
--- a/src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.s
+++ b/src/vendor/golang_org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.s
@@ -209,7 +209,7 @@ GLOBL ·andMask<>(SB), (NOPTR+RODATA), $240
 #define polyMul polyMulStage1; polyMulStage2; polyMulStage3; polyMulReduceStage
 #define polyMulAVX2 polyMulStage1_AVX2; polyMulStage2_AVX2; polyMulStage3_AVX2; polyMulReduceStage
 // ----------------------------------------------------------------------------
-TEXT polyHashADInternal(SB), NOSPLIT, $0
+TEXT polyHashADInternal<>(SB), NOSPLIT, $0
        // adp points to beginning of additional data
        // itr2 holds ad length
        XORQ acc0, acc0
@@ -315,7 +315,7 @@ openSSEPreparePolyKey:
 
        // Hash AAD
        MOVQ ad_len+80(FP), itr2
-       CALL polyHashADInternal(SB)
+       CALL polyHashADInternal<>(SB)
 
 openSSEMainLoop:
        CMPQ inl, $256
@@ -476,7 +476,7 @@ openSSE128InnerCipherLoop:
 
        // Hash
        MOVQ ad_len+80(FP), itr2
-       CALL polyHashADInternal(SB)
+       CALL polyHashADInternal<>(SB)
 
 openSSE128Open:
        CMPQ inl, $16
@@ -822,7 +822,7 @@ openAVX2PreparePolyKey:
 
        // Hash AD + first 64 bytes
        MOVQ ad_len+80(FP), itr2
-       CALL polyHashADInternal(SB)
+       CALL polyHashADInternal<>(SB)
        XORQ itr1, itr1
 
 openAVX2InitialHash64:
@@ -1014,7 +1014,7 @@ openAVX2192InnerCipherLoop:
 openAVX2ShortOpen:
        // Hash
        MOVQ ad_len+80(FP), itr2
-       CALL polyHashADInternal(SB)
+       CALL polyHashADInternal<>(SB)
 
 openAVX2ShortOpenLoop:
        CMPQ inl, $32
@@ -1547,7 +1547,7 @@ sealSSEIntroLoop:
 
        // Hash AAD
        MOVQ ad_len+80(FP), itr2
-       CALL polyHashADInternal(SB)
+       CALL polyHashADInternal<>(SB)
 
        MOVOU (0*16)(inp), A0; MOVOU (1*16)(inp), B0; MOVOU (2*16)(inp), C0; MOVOU (3*16)(inp), D0
        PXOR  A0, A1; PXOR B0, B1; PXOR C0, C1; PXOR D0, D1
@@ -1852,7 +1852,7 @@ sealSSE128InnerCipherLoop:
 
        // Hash
        MOVQ ad_len+80(FP), itr2
-       CALL polyHashADInternal(SB)
+       CALL polyHashADInternal<>(SB)
        XORQ itr1, itr1
 
 sealSSE128SealHash:
@@ -2027,7 +2027,7 @@ sealAVX2IntroLoop:
 
        // Hash AD
        MOVQ ad_len+80(FP), itr2
-       CALL polyHashADInternal(SB)
+       CALL polyHashADInternal<>(SB)
 
        // Can store at least 320 bytes
        VPXOR   (0*32)(inp), AA0, AA0
@@ -2290,7 +2290,7 @@ sealAVX2192InnerCipherLoop:
 sealAVX2ShortSeal:
        // Hash aad
        MOVQ ad_len+80(FP), itr2
-       CALL polyHashADInternal(SB)
+       CALL polyHashADInternal<>(SB)
        XORQ itr1, itr1
 
 sealAVX2SealHash: