MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-07 04:42:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Move from fmt.Errorf to errors.New

Browse Source 
In many cases fmt.Errorf is good enough, but since
error is an interface, you can use arbitrary data
structures as error values, to allow callers to
inspect the details of the error.
This commit is contained in:
Harshavardhana
2015-03-15 19:40:30 -07:00
parent a737246f92
commit 596eeb097e
4 changed files with 29 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/utils/crypto/signers/signers.go
View File

@@ -21,6 +21,7 @@ import (
"crypto/hmac"
"crypto/sha1"
"encoding/base64"
"errors"
"fmt"
"io"
"net"
@@ -55,7 +56,7 @@ func ValidateRequest(user config.User, req *http.Request) (bool, error) {
// Verify if date headers are set, if not reject the request
if req.Header.Get("x-amz-date") == "" {
if req.Header.Get("Date") == "" {
return false, fmt.Errorf("Date should be set")
return false, errors.New("Date should be set")
}
}
hm := hmac.New(sha1.New, []byte(user.SecretKey))
@@ -73,7 +74,7 @@ func ValidateRequest(user config.User, req *http.Request) (bool, error) {
// fmt.Println("Header calculated: ", authHeader.String())
// fmt.Printf("%q : %x", ss, ss)
if req.Header.Get("Authorization") != authHeader.String() {
return false, fmt.Errorf("Authorization header mismatch")
return false, errors.New("Authorization header mismatch")
}
return true, nil
}

22
pkg/utils/crypto/x509/generator.go
View File

@@ -17,6 +17,13 @@
package x509
import (
"errors"
"fmt"
"math/big"
"net"
"os"
"time"
"crypto/ecdsa"
"crypto/elliptic"
"crypto/rand"
@@ -24,11 +31,6 @@ import (
"crypto/x509"
"crypto/x509/pkix"
"encoding/pem"
"fmt"
"math/big"
"net"
"os"
"time"
)
// Certificates - based on http://golang.org/src/crypto/tls/generate_cert.go
@@ -91,11 +93,11 @@ func (tls *Certificates) GenerateCertificates(params Params) error {
case "P521":
priv, err = ecdsa.GenerateKey(elliptic.P521(), rand.Reader)
default:
return fmt.Errorf("Unrecognized elliptic curve: %q", params.EcdsaCurve)
return errors.New("Unrecognized elliptic curve: %q", params.EcdsaCurve)
}
if err != nil {
return fmt.Errorf("failed to generate private key: %s", err)
return errors.New("failed to generate private key: %s", err)
}
var notBefore time.Time
@@ -104,7 +106,7 @@ func (tls *Certificates) GenerateCertificates(params Params) error {
} else {
notBefore, err = time.Parse("Jan 2 15:04:05 2006", params.ValidFrom)
if err != nil {
return fmt.Errorf("Failed to parse creation date: %s", err)
return errors.New("Failed to parse creation date: %s", err)
}
}
notAfter := notBefore.Add(time.Duration(params.ValidFor))
@@ -112,7 +114,7 @@ func (tls *Certificates) GenerateCertificates(params Params) error {
serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
if err != nil {
return fmt.Errorf("failed to generate serial number: %s", err)
return errors.New("failed to generate serial number: %s", err)
}
orgName := pkix.Name{
Organization: []string{"Minio"},
@@ -140,7 +142,7 @@ func (tls *Certificates) GenerateCertificates(params Params) error {
derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, publicKey(priv), priv)
if err != nil {
return fmt.Errorf("Failed to create certificate: %s", err)
return errors.New("Failed to create certificate: %s", err)
}
tls.CertPemBlock = pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: derBytes})