Also, make sure New inlines so it does not cause an allocation. With this, we have a zero allocation poly1305 flow and a zero allocation generic chacha20poly1305 composition! \o/ While at it, remove some redundant code, and prepare to drop some complexity once the last assembly implementation of sum is dropped. Benchstat with "-tags purego" on amd64 name old time/op new time/op delta Open-64-8 461ns ± 2% 415ns ± 1% -9.93% (p=0.000 n=10+8) Seal-64-8 450ns ± 3% 412ns ± 3% -8.41% (p=0.000 n=10+10) Open-64-X-8 603ns ± 2% 544ns ± 2% -9.84% (p=0.000 n=10+10) Seal-64-X-8 580ns ± 3% 553ns ± 1% -4.56% (p=0.000 n=9+8) Open-1350-8 3.98µs ± 2% 3.65µs ± 2% -8.28% (p=0.000 n=9+10) Seal-1350-8 3.95µs ± 2% 3.64µs ± 1% -7.93% (p=0.000 n=9+10) Open-1350-X-8 4.06µs ± 1% 3.68µs ± 3% -9.31% (p=0.000 n=9+10) Seal-1350-X-8 4.08µs ± 4% 3.64µs ± 1% -10.71% (p=0.000 n=9+10) Open-8192-8 21.7µs ± 3% 18.9µs ± 2% -13.10% (p=0.000 n=9+10) Seal-8192-8 21.5µs ± 3% 18.8µs ± 1% -12.51% (p=0.000 n=9+9) Open-8192-X-8 21.4µs ± 1% 19.1µs ± 2% -10.88% (p=0.000 n=10+10) Seal-8192-X-8 21.3µs ± 2% 19.0µs ± 3% -10.92% (p=0.000 n=10+10) name old speed new speed delta Open-64-8 139MB/s ± 2% 154MB/s ± 2% +11.05% (p=0.000 n=10+8) Seal-64-8 142MB/s ± 3% 155MB/s ± 3% +9.11% (p=0.000 n=10+10) Open-64-X-8 106MB/s ± 2% 118MB/s ± 2% +10.93% (p=0.000 n=10+10) Seal-64-X-8 110MB/s ± 3% 116MB/s ± 1% +4.75% (p=0.000 n=9+8) Open-1350-8 339MB/s ± 2% 370MB/s ± 2% +9.04% (p=0.000 n=9+10) Seal-1350-8 342MB/s ± 2% 371MB/s ± 1% +8.60% (p=0.000 n=9+10) Open-1350-X-8 333MB/s ± 1% 367MB/s ± 3% +10.30% (p=0.000 n=9+10) Seal-1350-X-8 331MB/s ± 4% 371MB/s ± 2% +11.96% (p=0.000 n=9+10) Open-8192-8 377MB/s ± 3% 434MB/s ± 2% +15.07% (p=0.000 n=9+10) Seal-8192-8 381MB/s ± 3% 436MB/s ± 1% +14.29% (p=0.000 n=9+9) Open-8192-X-8 383MB/s ± 1% 429MB/s ± 2% +12.21% (p=0.000 n=10+10) Seal-8192-X-8 385MB/s ± 2% 432MB/s ± 3% +12.26% (p=0.000 n=10+10) name old alloc/op new alloc/op delta Open-64-8 96.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Seal-64-8 96.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Open-64-X-8 96.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Seal-64-X-8 96.0B ± 0% 0.0B -100.00% (p=0.000 n=10+10) Open-1350-8 1.41kB ± 0% 0.00kB -100.00% (p=0.000 n=10+10) Seal-1350-8 1.41kB ± 0% 0.00kB -100.00% (p=0.000 n=10+10) Open-1350-X-8 1.41kB ± 0% 0.00kB -100.00% (p=0.000 n=10+10) Seal-1350-X-8 1.41kB ± 0% 0.00kB -100.00% (p=0.000 n=10+10) Open-8192-8 9.47kB ± 0% 0.00kB -100.00% (p=0.000 n=10+10) Seal-8192-8 9.47kB ± 0% 0.00kB -100.00% (p=0.000 n=10+10) Open-8192-X-8 9.47kB ± 0% 0.00kB -100.00% (p=0.000 n=10+10) Seal-8192-X-8 9.47kB ± 0% 0.00kB -100.00% (p=0.000 n=10+10) name old allocs/op new allocs/op delta Open-64-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Seal-64-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Open-64-X-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Seal-64-X-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Open-1350-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Seal-1350-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Open-1350-X-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Seal-1350-X-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Open-8192-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Seal-8192-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Open-8192-X-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Seal-8192-X-8 1.00 ± 0% 0.00 -100.00% (p=0.000 n=10+10) Change-Id: I2c30ddc960a889b49c8ee8ff8073ffc4e75f43af Reviewed-on: https://go-review.googlesource.com/c/crypto/+/206977 Run-TryBot: Filippo Valsorda <filippo@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org> Reviewed-by: Katie Hockman <katie@golang.org>
98 lines
3.3 KiB
Go
98 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) {
|
|
sum(out, m, key)
|
|
}
|
|
|
|
// 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
|
|
}
|