Replacing fastsha256 with crypto/sha256 package from golang standard package (#1584)

master
karthic rao 9 years ago committed by Harshavardhana
parent b044336329
commit 26e2c4bf4d
  1. 5
      auth-handler.go
  2. 7
      object-handlers.go
  3. BIN
      pkg/.DS_Store
  4. BIN
      pkg/crypto/sha1/sha1_sse3_amd64.syso
  5. 5
      signature-v4-utils.go
  6. 3
      signature-v4.go

@ -19,13 +19,12 @@ package main
import (
"bytes"
"crypto/md5"
"crypto/sha256"
"encoding/base64"
"encoding/hex"
"io/ioutil"
"net/http"
"strings"
fastSha256 "github.com/minio/minio/pkg/crypto/sha256"
)
// Verify if request has JWT.
@ -97,7 +96,7 @@ func getRequestAuthType(r *http.Request) authType {
// sum256 calculate sha256 sum for an input byte array
func sum256(data []byte) []byte {
hash := fastSha256.New()
hash := sha256.New()
hash.Write(data)
return hash.Sum(nil)
}

@ -17,6 +17,7 @@
package main
import (
"crypto/sha256"
"encoding/hex"
"encoding/xml"
"fmt"
@ -29,8 +30,6 @@ import (
"strings"
"time"
fastSha256 "github.com/minio/minio/pkg/crypto/sha256"
mux "github.com/gorilla/mux"
)
@ -574,7 +573,7 @@ func (api objectAPIHandlers) PutObjectHandler(w http.ResponseWriter, r *http.Req
// Start writing in a routine.
go func() {
shaWriter := fastSha256.New()
shaWriter := sha256.New()
multiWriter := io.MultiWriter(shaWriter, writer)
if _, cerr := io.CopyN(multiWriter, r.Body, size); cerr != nil {
errorIf(cerr, "Unable to read HTTP body.", nil)
@ -719,7 +718,7 @@ func (api objectAPIHandlers) PutObjectPartHandler(w http.ResponseWriter, r *http
// Start writing in a routine.
go func() {
shaWriter := fastSha256.New()
shaWriter := sha256.New()
multiWriter := io.MultiWriter(shaWriter, writer)
if _, err = io.CopyN(multiWriter, r.Body, size); err != nil {
errorIf(err, "Unable to read HTTP body.", nil)

BIN
pkg/.DS_Store vendored

Binary file not shown.

@ -18,13 +18,12 @@ package main
import (
"crypto/hmac"
"crypto/sha256"
"encoding/hex"
"net/http"
"regexp"
"strings"
"unicode/utf8"
fastSha256 "github.com/minio/minio/pkg/crypto/sha256"
)
// isValidRegion - verify if incoming region value is valid with configured Region.
@ -42,7 +41,7 @@ func isValidRegion(reqRegion string, confRegion string) bool {
// sumHMAC calculate hmac between two input byte array.
func sumHMAC(key []byte, data []byte) []byte {
hash := hmac.New(fastSha256.New, key)
hash := hmac.New(sha256.New, key)
hash.Write(data)
return hash.Sum(nil)
}

@ -26,6 +26,7 @@ package main
import (
"bytes"
"crypto/sha256"
"encoding/hex"
"net/http"
"net/url"
@ -33,8 +34,6 @@ import (
"strconv"
"strings"
"time"
"github.com/minio/minio/pkg/crypto/sha256"
)
// AWS Signature Version '4' constants.

Loading…
Cancel
Save