add: md5 function

crypto/md5.go

@@ -0,0 +1,13 @@
+package crypto
+
+import (
+ "crypto/md5"
+ "encoding/hex"
+)
+
+// Md5 Calculate the md5 hash of str and return the hex string of the result.
+func Md5(str string) string {
+ h := md5.New()
+ h.Write([]byte(str))
+ return hex.EncodeToString(h.Sum(nil))
+}

crypto/md5_test.go

@@ -0,0 +1,9 @@
+package crypto
+
+import "testing"
+
+func TestMd5(t *testing.T) {
+ if Md5("xvrzhao") != "6452adf3f17e11c592f0c3e7e0afa302" {
+ t.Error("md5 failed")
+ }
+}

password/salt_hash.go

@@ -1,8 +1,7 @@
 package password
 
 import (
- "crypto/md5"
- "encoding/hex"
+ "github.com/micro-stacks/utils/crypto"
  "github.com/micro-stacks/utils/strings"
 )
 
@@ -11,23 +10,13 @@ import (
 // saltHashPassword = md5(md5(password) + salt)
 func SaltHashPwd(password string, saltLen int) (saltHashPassword, salt string) {
  salt = strings.RandLetterNum(saltLen)
- h := md5.New()
- h.Write([]byte(password))
- saltHashPassword = hex.EncodeToString(h.Sum(nil)) + salt
- h.Reset()
- h.Write([]byte(saltHashPassword))
- saltHashPassword = hex.EncodeToString(h.Sum(nil))
+ saltHashPassword = crypto.Md5(crypto.Md5(password) + salt)
  return
 }
 
 // VerifySaltHashPwd verifies whether saltHashPassword was generated from password and salt.
 func VerifySaltHashPwd(password, salt, saltHashPassword string) bool {
- h := md5.New()
- h.Write([]byte(password))
- p := hex.EncodeToString(h.Sum(nil)) + salt
- h.Reset()
- h.Write([]byte(p))
- if p = hex.EncodeToString(h.Sum(nil)); p != saltHashPassword {
+ if crypto.Md5(crypto.Md5(password)+salt) != saltHashPassword {
  return false
  }
  return true

password/salt_hash_test.go

@@ -8,7 +8,7 @@ func TestVerifySaltHashPwd(t *testing.T) {
 
  t.Log(p, s, sp)
 
- if b := VerifySaltHashPwd(p, s, sp); b != true {
+ if b := VerifySaltHashPwd(p, s, sp); !b {
  t.Fail()
  return
  }