use crypto/sha256 only for FIPS 140-2 compliance (#14983)

It would seem like the PR #11623 had chewed more
than it wanted to, non-fips build shouldn't really
be forced to use slower crypto/sha256 even for
presumed "non-performance" codepaths. In MinIO
there are really no "non-performance" codepaths.
This assumption seems to have had an adverse
effect in certain areas of CPU usage.

This PR ensures that we stick to sha256-simd
on all non-FIPS builds, our most common build
to ensure we get the best out of the CPU at
any given point in time.
This commit is contained in:
Harshavardhana 2022-05-27 06:00:19 -07:00 committed by GitHub
parent 464b9d7c80
commit 9d07cde385
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 35 additions and 24 deletions

View File

@ -19,7 +19,6 @@ package cmd
import ( import (
"bytes" "bytes"
"crypto/sha256"
"encoding/hex" "encoding/hex"
"errors" "errors"
"fmt" "fmt"
@ -27,6 +26,7 @@ import (
"io" "io"
"github.com/minio/highwayhash" "github.com/minio/highwayhash"
"github.com/minio/minio/internal/hash/sha256"
"golang.org/x/crypto/blake2b" "golang.org/x/crypto/blake2b"
xioutil "github.com/minio/minio/internal/ioutil" xioutil "github.com/minio/minio/internal/ioutil"

View File

@ -19,7 +19,6 @@ package cmd
import ( import (
"context" "context"
"crypto/sha256"
"encoding/hex" "encoding/hex"
"fmt" "fmt"
"net/http" "net/http"
@ -28,6 +27,7 @@ import (
"time" "time"
"github.com/minio/minio/internal/bucket/replication" "github.com/minio/minio/internal/bucket/replication"
"github.com/minio/minio/internal/hash/sha256"
xhttp "github.com/minio/minio/internal/http" xhttp "github.com/minio/minio/internal/http"
"github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger"
"github.com/minio/minio/internal/sync/errgroup" "github.com/minio/minio/internal/sync/errgroup"

View File

@ -19,8 +19,9 @@ package cmd
import ( import (
"crypto/md5" "crypto/md5"
"crypto/sha256"
"encoding/hex" "encoding/hex"
"github.com/minio/minio/internal/hash/sha256"
) )
// getSHA256Hash returns SHA-256 hash in hex encoding of given data. // getSHA256Hash returns SHA-256 hash in hex encoding of given data.

View File

@ -20,7 +20,6 @@ package cmd
import ( import (
"bytes" "bytes"
"crypto/hmac" "crypto/hmac"
"crypto/sha256"
"encoding/hex" "encoding/hex"
"io" "io"
"io/ioutil" "io/ioutil"
@ -29,6 +28,7 @@ import (
"strings" "strings"
"github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/auth"
"github.com/minio/minio/internal/hash/sha256"
xhttp "github.com/minio/minio/internal/http" xhttp "github.com/minio/minio/internal/http"
"github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger"
) )

View File

@ -27,7 +27,6 @@ package cmd
import ( import (
"bytes" "bytes"
"crypto/sha256"
"crypto/subtle" "crypto/subtle"
"encoding/hex" "encoding/hex"
"net/http" "net/http"
@ -40,6 +39,7 @@ import (
"github.com/minio/minio-go/v7/pkg/s3utils" "github.com/minio/minio-go/v7/pkg/s3utils"
"github.com/minio/minio-go/v7/pkg/set" "github.com/minio/minio-go/v7/pkg/set"
"github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/auth"
"github.com/minio/minio/internal/hash/sha256"
xhttp "github.com/minio/minio/internal/http" xhttp "github.com/minio/minio/internal/http"
) )

View File

@ -22,7 +22,6 @@ package cmd
import ( import (
"bufio" "bufio"
"bytes" "bytes"
"crypto/sha256"
"encoding/hex" "encoding/hex"
"errors" "errors"
"hash" "hash"
@ -32,6 +31,7 @@ import (
humanize "github.com/dustin/go-humanize" humanize "github.com/dustin/go-humanize"
"github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/auth"
"github.com/minio/minio/internal/hash/sha256"
xhttp "github.com/minio/minio/internal/http" xhttp "github.com/minio/minio/internal/http"
) )

View File

@ -20,7 +20,6 @@ package cmd
import ( import (
"bytes" "bytes"
"context" "context"
"crypto/sha256"
"crypto/x509" "crypto/x509"
"encoding/base64" "encoding/base64"
"errors" "errors"
@ -34,6 +33,7 @@ import (
"github.com/minio/madmin-go" "github.com/minio/madmin-go"
"github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/auth"
"github.com/minio/minio/internal/config/identity/openid" "github.com/minio/minio/internal/config/identity/openid"
"github.com/minio/minio/internal/hash/sha256"
xhttp "github.com/minio/minio/internal/http" xhttp "github.com/minio/minio/internal/http"
"github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger"
iampolicy "github.com/minio/pkg/iam/policy" iampolicy "github.com/minio/pkg/iam/policy"

View File

@ -20,7 +20,6 @@ package openid
import ( import (
"crypto" "crypto"
"crypto/sha1" "crypto/sha1"
"crypto/sha256"
"encoding/base64" "encoding/base64"
"errors" "errors"
"io" "io"
@ -36,6 +35,7 @@ import (
"github.com/minio/minio/internal/auth" "github.com/minio/minio/internal/auth"
"github.com/minio/minio/internal/config" "github.com/minio/minio/internal/config"
"github.com/minio/minio/internal/config/identity/openid/provider" "github.com/minio/minio/internal/config/identity/openid/provider"
"github.com/minio/minio/internal/hash/sha256"
"github.com/minio/pkg/env" "github.com/minio/pkg/env"
iampolicy "github.com/minio/pkg/iam/policy" iampolicy "github.com/minio/pkg/iam/policy"
xnet "github.com/minio/pkg/net" xnet "github.com/minio/pkg/net"

View File

@ -22,13 +22,13 @@ import (
"context" "context"
"crypto/hmac" "crypto/hmac"
"crypto/rand" "crypto/rand"
"crypto/sha256"
"encoding/binary" "encoding/binary"
"errors" "errors"
"io" "io"
"path" "path"
"github.com/minio/minio/internal/fips" "github.com/minio/minio/internal/fips"
"github.com/minio/minio/internal/hash/sha256"
"github.com/minio/minio/internal/logger" "github.com/minio/minio/internal/logger"
"github.com/minio/sio" "github.com/minio/sio"
) )

View File

@ -110,7 +110,6 @@ import (
"bytes" "bytes"
"crypto/hmac" "crypto/hmac"
"crypto/md5" "crypto/md5"
"crypto/sha256"
"encoding/base64" "encoding/base64"
"encoding/hex" "encoding/hex"
"errors" "errors"
@ -120,6 +119,7 @@ import (
"strings" "strings"
"github.com/minio/minio/internal/fips" "github.com/minio/minio/internal/fips"
"github.com/minio/minio/internal/hash/sha256"
"github.com/minio/sio" "github.com/minio/sio"
) )

View File

@ -17,11 +17,12 @@
package target package target
import ( import (
"crypto/sha256"
"crypto/sha512" "crypto/sha512"
"github.com/Shopify/sarama" "github.com/Shopify/sarama"
"github.com/xdg/scram" "github.com/xdg/scram"
"github.com/minio/minio/internal/hash/sha256"
) )
func initScramClient(args KafkaArgs, config *sarama.Config) { func initScramClient(args KafkaArgs, config *sarama.Config) {

View File

@ -26,6 +26,7 @@ import (
"io" "io"
"github.com/minio/minio/internal/etag" "github.com/minio/minio/internal/etag"
"github.com/minio/minio/internal/hash/sha256"
) )
// A Reader wraps an io.Reader and computes the MD5 checksum // A Reader wraps an io.Reader and computes the MD5 checksum
@ -122,7 +123,7 @@ func NewReader(src io.Reader, size int64, md5Hex, sha256Hex string, actualSize i
} }
var hash hash.Hash var hash hash.Hash
if len(SHA256) != 0 { if len(SHA256) != 0 {
hash = newSHA256() hash = sha256.New()
} }
return &Reader{ return &Reader{
src: src, src: src,

View File

@ -1,4 +1,4 @@
// Copyright (c) 2015-2021 MinIO, Inc. // Copyright (c) 2015-2022 MinIO, Inc.
// //
// This file is part of MinIO Object Storage stack // This file is part of MinIO Object Storage stack
// //
@ -18,15 +18,18 @@
//go:build fips //go:build fips
// +build fips // +build fips
package hash package sha256
import ( import (
"crypto/sha256" fipsha256 "crypto/sha256"
"hash" "hash"
) )
// newSHA256 returns a new hash.Hash computing the SHA256 checksum. // New returns a new hash.Hash computing the SHA256 checksum.
// The SHA256 implementation is FIPS 140-2 compliant when the // The SHA256 implementation is FIPS 140-2 compliant when the
// boringcrypto branch of Go is used. // boringcrypto branch of Go is used.
// Ref: https://github.com/golang/go/tree/dev.boringcrypto // Ref: https://github.com/golang/go/tree/dev.boringcrypto
func newSHA256() hash.Hash { return sha256.New() } func New() hash.Hash { return fipsha256.New() }
// Sum256 returns the SHA256 checksum of the data.
func Sum256(data []byte) [fipssha256.Size]byte { return fipssha256.Sum256(data) }

View File

@ -1,4 +1,4 @@
// Copyright (c) 2015-2021 MinIO, Inc. // Copyright (c) 2015-2022 MinIO, Inc.
// //
// This file is part of MinIO Object Storage stack // This file is part of MinIO Object Storage stack
// //
@ -18,14 +18,17 @@
//go:build !fips //go:build !fips
// +build !fips // +build !fips
package hash package sha256
import ( import (
"hash" "hash"
sha256 "github.com/minio/sha256-simd" nofipssha256 "github.com/minio/sha256-simd"
) )
// newSHA256 returns a new hash.Hash computing the SHA256 checksum. // New returns a new hash.Hash computing the SHA256 checksum.
// The SHA256 implementation is not FIPS 140-2 compliant. // The SHA256 implementation is not FIPS 140-2 compliant.
func newSHA256() hash.Hash { return sha256.New() } func New() hash.Hash { return nofipssha256.New() }
// Sum256 returns the SHA256 checksum of the data.
func Sum256(data []byte) [nofipssha256.Size]byte { return nofipssha256.Sum256(data) }

View File

@ -22,7 +22,6 @@ import (
"crypto/aes" "crypto/aes"
"crypto/cipher" "crypto/cipher"
"crypto/hmac" "crypto/hmac"
"crypto/sha256"
"encoding/base64" "encoding/base64"
"errors" "errors"
"fmt" "fmt"
@ -33,6 +32,8 @@ import (
"github.com/secure-io/sio-go/sioutil" "github.com/secure-io/sio-go/sioutil"
"golang.org/x/crypto/chacha20" "golang.org/x/crypto/chacha20"
"golang.org/x/crypto/chacha20poly1305" "golang.org/x/crypto/chacha20poly1305"
"github.com/minio/minio/internal/hash/sha256"
) )
// Parse parses s as single-key KMS. The given string // Parse parses s as single-key KMS. The given string

View File

@ -18,11 +18,12 @@
package kafka package kafka
import ( import (
"crypto/sha256"
"crypto/sha512" "crypto/sha512"
"github.com/Shopify/sarama" "github.com/Shopify/sarama"
"github.com/xdg/scram" "github.com/xdg/scram"
"github.com/minio/minio/internal/hash/sha256"
) )
func initScramClient(cfg Config, config *sarama.Config) { func initScramClient(cfg Config, config *sarama.Config) {