From 26e2c4bf4d053c2497933ced4ee7488ea02db392 Mon Sep 17 00:00:00 2001
From: karthic rao <kartronics85@gmail.com>
Date: Wed, 11 May 2016 02:50:11 +0530
Subject: [PATCH] Replacing fastsha256 with crypto/sha256 package from golang
 standard package (#1584)

---
 auth-handler.go                      |   5 ++---
 object-handlers.go                   |   7 +++----
 pkg/.DS_Store                        | Bin 0 -> 6148 bytes
 pkg/crypto/sha1/sha1_sse3_amd64.syso | Bin 0 -> 4322 bytes
 signature-v4-utils.go                |   5 ++---
 signature-v4.go                      |   3 +--
 6 files changed, 8 insertions(+), 12 deletions(-)
 create mode 100644 pkg/.DS_Store
 create mode 100644 pkg/crypto/sha1/sha1_sse3_amd64.syso

diff --git a/auth-handler.go b/auth-handler.go
index cc602a26b..e9bb62d0b 100644
--- a/auth-handler.go
+++ b/auth-handler.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)
 }
diff --git a/object-handlers.go b/object-handlers.go
index 50b3ef165..ae81688b5 100644
--- a/object-handlers.go
+++ b/object-handlers.go
@@ -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)
diff --git a/pkg/.DS_Store b/pkg/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..6425e2134ff694eb39f1c46425b50cef08de9d65
GIT binary patch
literal 6148
zcmeHKK~BRk5FD4#265?;qmNwqK~xnauJ8d!S_wo;N@x$<@(dou1NaThuB|Fg;EDk4
zO6y6SS$jQ>vM~TR+bzz3DS(_VI67kUg~@aAfsJC%gy?jPE$YivU6rf49I&n9H!2`|
zH%5g9FW4a6KY1zM=%*iQntp}_?(vL=&OVdpu6n#N*5s|RB)?3#I_7I<%!zUzamV?$
z*raS7xywFeo(*c0SoWCj%pqkyVaF`0ezv$^#(5`$G3ULNRWaYDH!4?_a8(9tOaW8C
z6!_B$ux5+p#{sQ11xx``V6T9DA3R;Kh}Z_yPX`-40uVEHtMOWX8zsg^EF!i6`Gn>|
zC^3Y(c*Jlaoc%uXiimB%5Dpg)A1==9;t9p+>>S@K9j*vyttns%qzW8_+o{z5^Y739
zX^`ES0;a&fQov>N>-mgJinVpHIH|RsenS@%UK?;9!V4|M<Vq<%p{udq%LTEB*al<|
P&3*(_25U@#A64KJ@sDLV

literal 0
HcmV?d00001

diff --git a/pkg/crypto/sha1/sha1_sse3_amd64.syso b/pkg/crypto/sha1/sha1_sse3_amd64.syso
new file mode 100644
index 0000000000000000000000000000000000000000..9af681c9524d2e0ab3a1115ab1c6620864c687b3
GIT binary patch
literal 4322
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
F{{isQc|HID

literal 0
HcmV?d00001

diff --git a/signature-v4-utils.go b/signature-v4-utils.go
index 33b695213..86c11a117 100644
--- a/signature-v4-utils.go
+++ b/signature-v4-utils.go
@@ -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)
 }
diff --git a/signature-v4.go b/signature-v4.go
index 2959b7002..e33b5eaff 100644
--- a/signature-v4.go
+++ b/signature-v4.go
@@ -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.