This commit is contained in:
number571 2024-07-05 05:40:16 +07:00
parent 954c48c637
commit 015658eaa2
8 changed files with 39822 additions and 39822 deletions

File diff suppressed because it is too large Load Diff

View File

@ -31,7 +31,7 @@ func InitApp(pArgs []string, pDefaultPath, pDefaultKey string, pDefaultParallel
}
inputKey := flag.GetFlagValue(pArgs, "key", pDefaultKey)
privKey, err := initapp.GetPrivKey(cfg.GetSettings().GetKeySizeBits(), inputKey)
privKey, err := initapp.GetPrivKey(inputKey, cfg.GetSettings().GetKeySizeBits())
if err != nil {
return nil, utils.MergeErrors(ErrGetPrivateKey, err)
}

View File

@ -32,7 +32,7 @@ func InitApp(pArgs []string, pDefaultPath, pDefaultKey string, pDefaultParallel
}
inputKey := flag.GetFlagValue(pArgs, "key", pDefaultKey)
privKey, err := initapp.GetPrivKey(cfg.GetSettings().GetKeySizeBits(), inputKey)
privKey, err := initapp.GetPrivKey(inputKey, cfg.GetSettings().GetKeySizeBits())
if err != nil {
return nil, utils.MergeErrors(ErrGetPrivateKey, err)
}

View File

@ -63,7 +63,7 @@ func TestGetPrivKey(t *testing.T) {
testDeleteFile(tcTmpPrivKey512Path)
defer testDeleteFile(tcTmpPrivKey512Path)
privKey, err := GetPrivKey(1024, tcPrivKey1024Path)
privKey, err := GetPrivKey(tcPrivKey1024Path, 1024)
if err != nil {
t.Error(err)
return
@ -73,29 +73,29 @@ func TestGetPrivKey(t *testing.T) {
return
}
if _, err := GetPrivKey(1024, tcInvalidPrivKey1024Path); err == nil {
if _, err := GetPrivKey(tcInvalidPrivKey1024Path, 1024); err == nil {
t.Error("success get invalid private key")
return
}
if _, err := GetPrivKey(2048, tcPrivKey1024Path); err == nil {
if _, err := GetPrivKey(tcPrivKey1024Path, 2048); err == nil {
t.Error("success get private key with diff size")
return
}
if _, err := GetPrivKey(512, "./random/not_exist/path/57199u140291724y121291d1/priv.key"); err == nil {
if _, err := GetPrivKey("./random/not_exist/path/57199u140291724y121291d1/priv.key", 512); err == nil {
t.Error("success get private key with not exist directory")
return
}
if _, err := GetPrivKey(512, tcTestdataDirPath); err == nil {
if _, err := GetPrivKey(tcTestdataDirPath, 512); err == nil {
t.Error("success get private key as directory")
return
}
tmpPrivKey, err := GetPrivKey(512, tcTmpPrivKey512Path)
tmpPrivKey, err := GetPrivKey(tcTmpPrivKey512Path, 512)
if err != nil {
t.Error(err)
return
}
tmpPrivKeyX, err := GetPrivKey(512, tcTmpPrivKey512Path)
tmpPrivKeyX, err := GetPrivKey(tcTmpPrivKey512Path, 512)
if err != nil {
t.Error(err)
return

View File

@ -7,7 +7,7 @@ import (
"github.com/number571/go-peer/pkg/utils"
)
func GetPrivKey(pKeySize uint64, pKeyPath string) (asymmetric.IPrivKey, error) {
func GetPrivKey(pKeyPath string, pKeySize uint64) (asymmetric.IPrivKey, error) {
if _, err := os.Stat(pKeyPath); os.IsNotExist(err) {
privKey := asymmetric.NewRSAPrivKey(pKeySize)
if err := os.WriteFile(pKeyPath, []byte(privKey.ToString()), 0o600); err != nil {

File diff suppressed because it is too large Load Diff