The vector (vx) implementation has been updated to read in the state and update it - as opposed to being a single shot function. This has allowed the new MAC interface can be implemented. For performance reasons s390x uses a larger buffer than the generic implementation. There is a relatively high fixed cost to read the state, calculate the key coefficients and serialize the state, so it makes sense to buffer more blocks before calling it. For now I've had to remove the faster VMSL implementation. It is too complex for me to update in time for Go 1.15. At some point I'd like to revisit it but for now it looks like using the MAC interface is more of a win than using VMSL. The benchmarks show considerable improvements when using the MAC interface. The Sum benchmarks show slowdown due to a combination of the removal of the VMSL implementation and also the added overhead from splitting the summation function into multiple parts. poly1305: name old speed new speed delta 64 1.33GB/s ± 0% 0.80GB/s ± 1% -39.51% (p=0.000 n=16+20) 1K 4.04GB/s ± 0% 2.97GB/s ± 0% -26.46% (p=0.000 n=19+19) 2M 5.32GB/s ± 1% 3.63GB/s ± 0% -31.76% (p=0.000 n=20+19) 64Unaligned 1.33GB/s ± 0% 0.80GB/s ± 0% -39.80% (p=0.000 n=19+18) 1KUnaligned 4.09GB/s ± 1% 2.94GB/s ± 0% -28.23% (p=0.000 n=19+18) 2MUnaligned 5.33GB/s ± 1% 3.52GB/s ± 0% -34.04% (p=0.000 n=20+19) Write64 1.03GB/s ± 1% 1.49GB/s ± 1% +44.34% (p=0.000 n=20+20) Write1K 1.21GB/s ± 0% 3.24GB/s ± 0% +169.02% (p=0.000 n=20+17) Write2M 1.24GB/s ± 1% 3.63GB/s ± 0% +192.36% (p=0.000 n=20+19) Write64Unaligned 1.04GB/s ± 1% 1.50GB/s ± 0% +44.16% (p=0.000 n=19+14) Write1KUnaligned 1.21GB/s ± 0% 3.20GB/s ± 0% +164.55% (p=0.000 n=20+16) Write2MUnaligned 1.24GB/s ± 1% 3.51GB/s ± 0% +183.96% (p=0.000 n=20+19) chacha20poly1305 (this vs. using generic MAC interface - post CL 206977): name old speed new speed delta Open-64 147MB/s ± 2% 156MB/s ± 1% +6.15% (p=0.000 n=20+19) Seal-64 151MB/s ± 0% 164MB/s ± 1% +8.86% (p=0.000 n=19+16) Open-64-X 104MB/s ± 2% 111MB/s ± 1% +6.24% (p=0.000 n=20+20) Seal-64-X 109MB/s ± 2% 111MB/s ± 1% +2.11% (p=0.000 n=20+19) Open-1350 555MB/s ± 0% 751MB/s ± 1% +35.19% (p=0.000 n=20+20) Seal-1350 557MB/s ± 0% 759MB/s ± 0% +36.23% (p=0.000 n=20+20) Open-1350-X 517MB/s ± 1% 683MB/s ± 1% +31.97% (p=0.000 n=20+20) Seal-1350-X 511MB/s ± 0% 683MB/s ± 0% +33.77% (p=0.000 n=18+19) Open-8192 672MB/s ± 0% 1013MB/s ± 0% +50.65% (p=0.000 n=19+19) Seal-8192 674MB/s ± 0% 1018MB/s ± 0% +50.98% (p=0.000 n=18+20) Open-8192-X 663MB/s ± 0% 979MB/s ± 0% +47.57% (p=0.000 n=20+20) Seal-8192-X 658MB/s ± 0% 985MB/s ± 0% +49.62% (p=0.000 n=18+20) name old allocs/op new allocs/op delta Open-64 0.00 0.00 ~ (all equal) Seal-64 0.00 0.00 ~ (all equal) Open-64-X 0.00 0.00 ~ (all equal) Seal-64-X 0.00 0.00 ~ (all equal) Open-1350 0.00 0.00 ~ (all equal) Seal-1350 0.00 0.00 ~ (all equal) Open-1350-X 0.00 0.00 ~ (all equal) Seal-1350-X 0.00 0.00 ~ (all equal) Open-8192 0.00 0.00 ~ (all equal) Seal-8192 0.00 0.00 ~ (all equal) Open-8192-X 0.00 0.00 ~ (all equal) Seal-8192-X 0.00 0.00 ~ (all equal) chacha20poly1305 (this vs. using asm Sum interface - pre CL 206977): name old speed new speed delta Open-64 144MB/s ± 0% 156MB/s ± 1% +8.16% (p=0.000 n=20+19) Seal-64 150MB/s ± 0% 164MB/s ± 1% +9.35% (p=0.000 n=20+16) Open-64-X 104MB/s ± 1% 111MB/s ± 1% +6.15% (p=0.000 n=19+20) Seal-64-X 109MB/s ± 1% 111MB/s ± 1% +1.43% (p=0.000 n=19+19) Open-1350 702MB/s ± 1% 751MB/s ± 1% +6.98% (p=0.000 n=20+20) Seal-1350 715MB/s ± 0% 759MB/s ± 0% +6.09% (p=0.000 n=19+20) Open-1350-X 642MB/s ± 0% 683MB/s ± 1% +6.37% (p=0.000 n=19+20) Seal-1350-X 639MB/s ± 0% 683MB/s ± 0% +6.98% (p=0.000 n=20+19) Open-8192 994MB/s ± 0% 1013MB/s ± 0% +1.85% (p=0.000 n=20+19) Seal-8192 1.00GB/s ± 0% 1.02GB/s ± 0% +1.90% (p=0.000 n=20+20) Open-8192-X 965MB/s ± 0% 979MB/s ± 0% +1.43% (p=0.000 n=19+20) Seal-8192-X 962MB/s ± 0% 985MB/s ± 0% +2.39% (p=0.000 n=20+20) name old allocs/op new allocs/op delta Open-64 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Seal-64 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Open-64-X 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Seal-64-X 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Open-1350 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Seal-1350 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Open-1350-X 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Seal-1350-X 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Open-8192 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Seal-8192 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Open-8192-X 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Seal-8192-X 1.00 ± 0% 0.00 -100.00% (p=0.000 n=20+20) Updates golang/go#25219. Change-Id: Ib491e3a47b6b3ec8bbbe1f41f7bf42ad82f5c249 Reviewed-on: https://go-review.googlesource.com/c/crypto/+/219057 Run-TryBot: Michael Munday <mike.munday@ibm.com> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Filippo Valsorda <filippo@golang.org>
100 lines
3.3 KiB
Go
100 lines
3.3 KiB
Go
// Copyright 2012 The Go Authors. All rights reserved.
|
|
// Use of this source code is governed by a BSD-style
|
|
// license that can be found in the LICENSE file.
|
|
|
|
// Package poly1305 implements Poly1305 one-time message authentication code as
|
|
// specified in https://cr.yp.to/mac/poly1305-20050329.pdf.
|
|
//
|
|
// Poly1305 is a fast, one-time authentication function. It is infeasible for an
|
|
// attacker to generate an authenticator for a message without the key. However, a
|
|
// key must only be used for a single message. Authenticating two different
|
|
// messages with the same key allows an attacker to forge authenticators for other
|
|
// messages with the same key.
|
|
//
|
|
// Poly1305 was originally coupled with AES in order to make Poly1305-AES. AES was
|
|
// used with a fixed key in order to generate one-time keys from an nonce.
|
|
// However, in this package AES isn't used and the one-time key is specified
|
|
// directly.
|
|
package poly1305 // import "golang.org/x/crypto/poly1305"
|
|
|
|
import "crypto/subtle"
|
|
|
|
// TagSize is the size, in bytes, of a poly1305 authenticator.
|
|
const TagSize = 16
|
|
|
|
// Sum generates an authenticator for msg using a one-time key and puts the
|
|
// 16-byte result into out. Authenticating two different messages with the same
|
|
// key allows an attacker to forge messages at will.
|
|
func Sum(out *[16]byte, m []byte, key *[32]byte) {
|
|
h := New(key)
|
|
h.Write(m)
|
|
h.Sum(out[:0])
|
|
}
|
|
|
|
// Verify returns true if mac is a valid authenticator for m with the given key.
|
|
func Verify(mac *[16]byte, m []byte, key *[32]byte) bool {
|
|
var tmp [16]byte
|
|
Sum(&tmp, m, key)
|
|
return subtle.ConstantTimeCompare(tmp[:], mac[:]) == 1
|
|
}
|
|
|
|
// New returns a new MAC computing an authentication
|
|
// tag of all data written to it with the given key.
|
|
// This allows writing the message progressively instead
|
|
// of passing it as a single slice. Common users should use
|
|
// the Sum function instead.
|
|
//
|
|
// The key must be unique for each message, as authenticating
|
|
// two different messages with the same key allows an attacker
|
|
// to forge messages at will.
|
|
func New(key *[32]byte) *MAC {
|
|
m := &MAC{}
|
|
initialize(key, &m.macState)
|
|
return m
|
|
}
|
|
|
|
// MAC is an io.Writer computing an authentication tag
|
|
// of the data written to it.
|
|
//
|
|
// MAC cannot be used like common hash.Hash implementations,
|
|
// because using a poly1305 key twice breaks its security.
|
|
// Therefore writing data to a running MAC after calling
|
|
// Sum or Verify causes it to panic.
|
|
type MAC struct {
|
|
mac // platform-dependent implementation
|
|
|
|
finalized bool
|
|
}
|
|
|
|
// Size returns the number of bytes Sum will return.
|
|
func (h *MAC) Size() int { return TagSize }
|
|
|
|
// Write adds more data to the running message authentication code.
|
|
// It never returns an error.
|
|
//
|
|
// It must not be called after the first call of Sum or Verify.
|
|
func (h *MAC) Write(p []byte) (n int, err error) {
|
|
if h.finalized {
|
|
panic("poly1305: write to MAC after Sum or Verify")
|
|
}
|
|
return h.mac.Write(p)
|
|
}
|
|
|
|
// Sum computes the authenticator of all data written to the
|
|
// message authentication code.
|
|
func (h *MAC) Sum(b []byte) []byte {
|
|
var mac [TagSize]byte
|
|
h.mac.Sum(&mac)
|
|
h.finalized = true
|
|
return append(b, mac[:]...)
|
|
}
|
|
|
|
// Verify returns whether the authenticator of all data written to
|
|
// the message authentication code matches the expected value.
|
|
func (h *MAC) Verify(expected []byte) bool {
|
|
var mac [TagSize]byte
|
|
h.mac.Sum(&mac)
|
|
h.finalized = true
|
|
return subtle.ConstantTimeCompare(expected, mac[:]) == 1
|
|
}
|