hardcoresushi/libgocryptfs
1
0
Fork 0
Code Issues Pull Requests Releases Activity

configfile: pass struct to Create 2/2

Browse Source 
Drop Create and rename Create2 to Create.
This commit is contained in:
Jakob Unterwurzacher 2021-08-21 14:04:04 +02:00
parent 4b93525249
commit b603169d2c
3 changed files with 6 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init_dir.go
View File

@ -86,7 +86,7 @@ func initDir(args *argContainer) {
fido2HmacSalt = nil
}
creator := tlog.ProgramName + " " + GitVersion
err = configfile.Create2(&configfile.CreateArgs{
err = configfile.Create(&configfile.CreateArgs{
Filename: args.config,
Password: password,
PlaintextNames: args.plaintextnames,

21
internal/configfile/config_file.go
View File

@ -90,29 +90,10 @@ type CreateArgs struct {
DeterministicNames bool
}
func Create(filename string, password []byte, plaintextNames bool,
logN int, creator string, aessiv bool, devrandom bool,
fido2CredentialID []byte, fido2HmacSalt []byte, deterministicNames bool) error {
args := CreateArgs{
Filename: filename,
Password: password,
PlaintextNames: plaintextNames,
LogN: logN,
Creator: creator,
AESSIV: aessiv,
Devrandom: devrandom,
Fido2CredentialID: fido2CredentialID,
Fido2HmacSalt: fido2HmacSalt,
DeterministicNames: deterministicNames,
}
log.Panicf("Use Create2(%#v) instead\n", args)
return nil
}
// Create - create a new config with a random key encrypted with
// "Password" and write it to "Filename".
// Uses scrypt with cost parameter "LogN".
func Create2(args *CreateArgs) error {
func Create(args *CreateArgs) error {
var cf ConfFile
cf.filename = args.Filename
cf.Creator = args.Creator

8
internal/configfile/config_test.go
View File

@ -62,7 +62,7 @@ func TestLoadV2StrangeFeature(t *testing.T) {
}
func TestCreateConfDefault(t *testing.T) {
err := Create2(&CreateArgs{
err := Create(&CreateArgs{
Filename: "config_test/tmp.conf",
Password: testPw,
LogN: 10,
@ -87,7 +87,7 @@ func TestCreateConfDefault(t *testing.T) {
}
func TestCreateConfDevRandom(t *testing.T) {
err := Create2(&CreateArgs{
err := Create(&CreateArgs{
Filename: "config_test/tmp.conf",
Password: testPw,
LogN: 10,
@ -99,7 +99,7 @@ func TestCreateConfDevRandom(t *testing.T) {
}
func TestCreateConfPlaintextnames(t *testing.T) {
err := Create2(&CreateArgs{
err := Create(&CreateArgs{
Filename: "config_test/tmp.conf",
Password: testPw,
PlaintextNames: true,
@ -125,7 +125,7 @@ func TestCreateConfPlaintextnames(t *testing.T) {
// Reverse mode uses AESSIV
func TestCreateConfFileAESSIV(t *testing.T) {
err := Create2(&CreateArgs{
err := Create(&CreateArgs{
Filename: "config_test/tmp.conf",
Password: testPw,
LogN: 10,