From c8bab9db9409dc31becc0537dcb8f33c324e7eac Mon Sep 17 00:00:00 2001
From: mirefly <mirefly@gmail.com>
Date: Mon, 1 Feb 2021 22:06:43 -0700
Subject: [PATCH] fix: decrypt password in firefox

---
 core/data/parse.go            |  4 +++-
 core/decrypt/decrypt_linux.go | 22 ++++++++++++++++------
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/core/data/parse.go b/core/data/parse.go
index b7756bd..0398320 100644
--- a/core/data/parse.go
+++ b/core/data/parse.go
@@ -613,11 +613,13 @@ func (p *passwords) FirefoxParse() error {
 		log.Debug("password-check success")
 		m := bytes.Compare(nssA102, keyLin)
 		if m == 0 {
-			nss, err := decrypt.DecodeNss(nssA11)
+			var nss interface{}
+			nss, err = decrypt.DecodeNss(nssA11)
 			if err != nil {
 				log.Error("decode firefox nssA11 bytes failed", err)
 				return err
 			}
+
 			finallyKey, err := decrypt.Nss(globalSalt, masterPwd, nss)
 			finallyKey = finallyKey[:24]
 			if err != nil {
diff --git a/core/decrypt/decrypt_linux.go b/core/decrypt/decrypt_linux.go
index d78726e..2ca2db8 100644
--- a/core/decrypt/decrypt_linux.go
+++ b/core/decrypt/decrypt_linux.go
@@ -6,6 +6,7 @@ import (
 	"crypto/sha256"
 	"encoding/asn1"
 	"encoding/hex"
+	"errors"
 
 	"hack-browser-data/log"
 
@@ -100,21 +101,30 @@ func DecodeMeta(decodeItem []byte) (pbe MetaPBE, err error) {
 	return
 }
 
-func DecodeNss(nssA11Bytes []byte) (pbe NssPBE, err error) {
+func DecodeNss(nssA11Bytes []byte) (nss interface{}, err error) {
+	var pbe NssPBE
 	_, err = asn1.Unmarshal(nssA11Bytes, &pbe)
+
 	if err != nil {
-		log.Error(err)
-		return
+		return DecodeMeta(nssA11Bytes)
 	}
-	return
+
+	return pbe, err
 }
 
 func Meta(globalSalt, masterPwd []byte, pbe MetaPBE) ([]byte, error) {
 	return decryptMeta(globalSalt, masterPwd, pbe.EntrySalt, pbe.Encrypted)
 }
 
-func Nss(globalSalt, masterPwd []byte, pbe NssPBE) ([]byte, error) {
-	return decryptNss(globalSalt, masterPwd, pbe.IV, pbe.EntrySalt, pbe.Encrypted, pbe.IterationCount, pbe.KeySize)
+func Nss(globalSalt, masterPwd []byte, pbe interface{}) ([]byte, error) {
+	switch pbe.(type) {
+	case NssPBE:
+		return decryptNss(globalSalt, masterPwd, pbe.(NssPBE).IV, pbe.(NssPBE).EntrySalt, pbe.(NssPBE).Encrypted, pbe.(NssPBE).IterationCount, pbe.(NssPBE).KeySize)
+	case MetaPBE:
+		return decryptMeta(globalSalt, masterPwd, pbe.(MetaPBE).EntrySalt, pbe.(MetaPBE).Encrypted)
+	default:
+		return nil, errors.New("decrypt nss failed")
+	}
 }
 
 func decryptMeta(globalSalt, masterPwd, entrySalt, encrypted []byte) ([]byte, error) {