mirror of
https://github.com/moonD4rk/HackBrowserData.git
synced 2026-08-17 23:57:12 +02:00
refactor: remove unused err message
This commit is contained in:
@@ -17,8 +17,8 @@ import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
var (
|
var (
|
||||||
ErrWrongSecurityCommand = errors.New("macOS wrong security command")
|
errWrongSecurityCommand = errors.New("wrong security command")
|
||||||
ErrCouldNotFindInKeychain = errors.New("macOS could not find in keychain")
|
errCouldNotFindInKeychain = errors.New("could not be find in keychain")
|
||||||
)
|
)
|
||||||
|
|
||||||
func (c *chromium) GetMasterKey() ([]byte, error) {
|
func (c *chromium) GetMasterKey() ([]byte, error) {
|
||||||
@@ -39,19 +39,19 @@ func (c *chromium) GetMasterKey() ([]byte, error) {
|
|||||||
}
|
}
|
||||||
if stderr.Len() > 0 {
|
if stderr.Len() > 0 {
|
||||||
if strings.Contains(stderr.String(), "could not be found") {
|
if strings.Contains(stderr.String(), "could not be found") {
|
||||||
return nil, ErrCouldNotFindInKeychain
|
return nil, errCouldNotFindInKeychain
|
||||||
}
|
}
|
||||||
return nil, errors.New(stderr.String())
|
return nil, errors.New(stderr.String())
|
||||||
}
|
}
|
||||||
chromeSecret := bytes.TrimSpace(stdout.Bytes())
|
chromeSecret := bytes.TrimSpace(stdout.Bytes())
|
||||||
if chromeSecret == nil {
|
if chromeSecret == nil {
|
||||||
return nil, ErrWrongSecurityCommand
|
return nil, errWrongSecurityCommand
|
||||||
}
|
}
|
||||||
chromeSalt := []byte("saltysalt")
|
chromeSalt := []byte("saltysalt")
|
||||||
// @https://source.chromium.org/chromium/chromium/src/+/master:components/os_crypt/os_crypt_mac.mm;l=157
|
// @https://source.chromium.org/chromium/chromium/src/+/master:components/os_crypt/os_crypt_mac.mm;l=157
|
||||||
key := pbkdf2.Key(chromeSecret, chromeSalt, 1003, 16, sha1.New)
|
key := pbkdf2.Key(chromeSecret, chromeSalt, 1003, 16, sha1.New)
|
||||||
if key == nil {
|
if key == nil {
|
||||||
return nil, ErrWrongSecurityCommand
|
return nil, errWrongSecurityCommand
|
||||||
}
|
}
|
||||||
c.masterKey = key
|
c.masterKey = key
|
||||||
log.Infof("%s initialized master key success", c.name)
|
log.Infof("%s initialized master key success", c.name)
|
||||||
|
|||||||
@@ -1,20 +1,9 @@
|
|||||||
package decrypter
|
package decrypter
|
||||||
|
|
||||||
import (
|
|
||||||
"errors"
|
|
||||||
)
|
|
||||||
|
|
||||||
var (
|
|
||||||
errSecurityKeyIsEmpty = errors.New("input [security find-generic-password -wa 'Chrome'] in terminal")
|
|
||||||
)
|
|
||||||
|
|
||||||
func Chromium(key, encryptPass []byte) ([]byte, error) {
|
func Chromium(key, encryptPass []byte) ([]byte, error) {
|
||||||
if len(encryptPass) <= 3 {
|
if len(encryptPass) <= 3 {
|
||||||
return nil, errPasswordIsEmpty
|
return nil, errPasswordIsEmpty
|
||||||
}
|
}
|
||||||
if len(key) == 0 {
|
|
||||||
return nil, errSecurityKeyIsEmpty
|
|
||||||
}
|
|
||||||
|
|
||||||
iv := []byte{32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32}
|
iv := []byte{32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32, 32}
|
||||||
return aes128CBCDecrypt(key, iv, encryptPass[3:])
|
return aes128CBCDecrypt(key, iv, encryptPass[3:])
|
||||||
|
|||||||
@@ -11,9 +11,6 @@ func Chromium(key, encryptPass []byte) ([]byte, error) {
|
|||||||
if len(encryptPass) < 3 {
|
if len(encryptPass) < 3 {
|
||||||
return nil, errPasswordIsEmpty
|
return nil, errPasswordIsEmpty
|
||||||
}
|
}
|
||||||
if len(key) == 0 {
|
|
||||||
return nil, errSecurityKeyIsEmpty
|
|
||||||
}
|
|
||||||
|
|
||||||
return aesGCMDecrypt(encryptPass[15:], key, encryptPass[3:15])
|
return aesGCMDecrypt(encryptPass[15:], key, encryptPass[3:15])
|
||||||
}
|
}
|
||||||
@@ -22,9 +19,6 @@ func ChromiumForYandex(key, encryptPass []byte) ([]byte, error) {
|
|||||||
if len(encryptPass) < 3 {
|
if len(encryptPass) < 3 {
|
||||||
return nil, errPasswordIsEmpty
|
return nil, errPasswordIsEmpty
|
||||||
}
|
}
|
||||||
if len(key) == 0 {
|
|
||||||
return nil, errSecurityKeyIsEmpty
|
|
||||||
}
|
|
||||||
// remove Prefix 'v10'
|
// remove Prefix 'v10'
|
||||||
// gcmBlockSize = 16
|
// gcmBlockSize = 16
|
||||||
// gcmTagSize = 16
|
// gcmTagSize = 16
|
||||||
|
|||||||
Reference in New Issue
Block a user