From 750c6a9860f0f7006036a266f25db51a7b70550e Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Fri, 21 Sep 2012 00:36:01 -0400 Subject: [PATCH] go.crypto: match asm variable names to Go func declarations R=golang-dev, r CC=golang-dev https://golang.org/cl/6544048 --- curve25519/mont25519_amd64.go | 4 ++-- curve25519/square_amd64.s | 4 ++-- salsa20/salsa/salsa2020_amd64.s | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/curve25519/mont25519_amd64.go b/curve25519/mont25519_amd64.go index 1cbf0c3..996b087 100644 --- a/curve25519/mont25519_amd64.go +++ b/curve25519/mont25519_amd64.go @@ -7,8 +7,8 @@ package curve25519 // These functions are implemented in the .s files. The names of the functions // in the rest of the file are also taken from the SUPERCOP sources to help // people following along. -func cswap(*[5]uint64, uint64) -func ladderstep(*[5][5]uint64) +func cswap(inout *[5]uint64, v uint64) +func ladderstep(inout *[5][5]uint64) func freeze(inout *[5]uint64) func mul(dest, a, b *[5]uint64) func square(out, in *[5]uint64) diff --git a/curve25519/square_amd64.s b/curve25519/square_amd64.s index 8bfe30f..9aaf355 100644 --- a/curve25519/square_amd64.s +++ b/curve25519/square_amd64.s @@ -7,8 +7,8 @@ // func square(dest, src *[5]uint64) TEXT ·square(SB),7,$96-16 - MOVQ dest+0(FP), DI - MOVQ src+8(FP), SI + MOVQ out+0(FP), DI + MOVQ in+8(FP), SI MOVQ SP,R11 MOVQ $31,CX diff --git a/salsa20/salsa/salsa2020_amd64.s b/salsa20/salsa/salsa2020_amd64.s index d0abf57..28850b4 100644 --- a/salsa20/salsa/salsa2020_amd64.s +++ b/salsa20/salsa/salsa2020_amd64.s @@ -9,7 +9,7 @@ TEXT ·salsa2020XORKeyStream(SB),0,$512-40 MOVQ out+0(FP),DI MOVQ in+8(FP),SI - MOVQ inlen+16(FP),DX + MOVQ n+16(FP),DX MOVQ nonce+24(FP),CX MOVQ key+32(FP),R8