xray: recreate test filesytems with -scrypt 10
Speeds up the dumpmasterkey test *a lot*: Before: ok github.com/rfjakob/gocryptfs/gocryptfs-xray/xray_tests 0.398s After: ok github.com/rfjakob/gocryptfs/gocryptfs-xray/xray_tests 0.023s
This commit is contained in:
parent
8d71f8fe52
commit
28584d0d2c
|
@ -1,5 +1,4 @@
|
||||||
Your master key is:
|
Your master key is:
|
||||||
|
|
||||||
f342380e-238f708f-f4eb94d1-fcf79cca-
|
b4d8b25c-324dd6ea-a328c990-6e8a2a3c-
|
||||||
7e1e9d9a-b9122286-5e4eaae8-a292ee43
|
6038552a-042ced43-26cfff21-0c62957a
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
Header: Version: 2, Id: aa854388132e168d55250e89070ca5bf
|
Header: Version: 2, Id: 8932adf303fe0289679d47fa84d2b241
|
||||||
Block 0: IV: d2d30e816ddebcf6af2e7333b837c8fd, Tag: 66cb786e17f02c9ffd1d722ac0b69f79, Offset: 18 Len: 4128
|
Block 0: IV: c8536b4bfd92f5dc3c1e2ac29f116d4a, Tag: 22b20422749b2f4bba67ec7d3bb1ac34, Offset: 18 Len: 4128
|
||||||
Block 1: IV: 82e2c96c1d6f2fd1e985d44feff8bb31, Tag: f4c0743fd073ff779e94c4954b8c6c34, Offset: 4146 Len: 936
|
Block 1: IV: 2de68f4965779bb137ef2b3c20453556, Tag: 3e8758d6872234b1fffab2504e623467, Offset: 4146 Len: 936
|
||||||
|
|
Binary file not shown.
Binary file not shown.
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"Creator": "gocryptfs v1.7-beta1-7-g6b94f5e",
|
"Creator": "gocryptfs v1.7-beta1-11-g8d71f8f-dirty",
|
||||||
"EncryptedKey": "mHLMC8208CamUCy6lpX8BtQ0h93dmhUycXAJRPYJI5d8vHvlS7hVgWOuAIf1wQEWQ2veEo9GBe3rmfmTnGzSvA==",
|
"EncryptedKey": "Rp0VYTJ9QK2imhJQH1miFIgAYZbsfv3t1tvPJvsOVy86ogBzKpUuMDFXD+PPawLvZM/TuYl0n3gx1RY5hzFfbg==",
|
||||||
"ScryptObject": {
|
"ScryptObject": {
|
||||||
"Salt": "0yHaO65zMQgn9izBA3HlcLkX0KdI3PGBc4799TRVQYo=",
|
"Salt": "mDPjzd+SZpScPYVv/M9AFjNzXcUy6fqKckXay53EQdQ=",
|
||||||
"N": 65536,
|
"N": 1024,
|
||||||
"R": 8,
|
"R": 8,
|
||||||
"P": 1,
|
"P": 1,
|
||||||
"KeyLen": 32
|
"KeyLen": 32
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Ów5Ó44¦R#ňTĂ^•
|
™<EFBFBD>:őjµ‹Í‰/î\<5C>W„
|
|
@ -1,5 +1,4 @@
|
||||||
Your master key is:
|
Your master key is:
|
||||||
|
|
||||||
29dd219d-e227ff20-8474469d-9fc9fdc6-
|
83dfe2df-9f6ad754-179cb4d5-377a65dd-
|
||||||
b434ab35-404e808c-489d441e-2c1003f2
|
bff54950-10e1b7b5-faf409e3-f7d8eeee
|
||||||
|
|
||||||
|
|
|
@ -1,3 +1,3 @@
|
||||||
Header: Version: 2, Id: c2f21142e108952a47edfe16053d2bb9, assuming AES-SIV mode
|
Header: Version: 2, Id: d839806747918e345633fcdd0988e67c, assuming AES-SIV mode
|
||||||
Block 0: IV: 7621fdc35be7671ac6f369214436e8ff, Tag: e8108c158b22cad6bb3296645357eb75, Offset: 18 Len: 4128
|
Block 0: IV: 1d3ce2b13260f83766ccf9a670478a4b, Tag: 0b6f95bd523b4c93704e15ecc6bef8e7, Offset: 18 Len: 4128
|
||||||
Block 1: IV: f096d86a4dc3461ef17655cfcf865b13, Tag: 925f23d647e4ab7add2c8d36362cc5a9, Offset: 4146 Len: 936
|
Block 1: IV: 7eb947d2adf18adf3bed39bbc8052968, Tag: 1a272903e5a987f53f07344840387c20, Offset: 4146 Len: 936
|
||||||
|
|
Binary file not shown.
|
@ -1,9 +1,9 @@
|
||||||
{
|
{
|
||||||
"Creator": "gocryptfs v1.7-beta1-7-g6b94f5e",
|
"Creator": "gocryptfs v1.7-beta1-11-g8d71f8f-dirty",
|
||||||
"EncryptedKey": "D0kHfg/pryMO9Ydo15EwpYjNHf3iWKq2GJyNocbjwJt9blEeMoLD5DnoARuDzQs54hblw+9MHwFjCSHYmJrFbA==",
|
"EncryptedKey": "YOxpZ+cImv4HirwuwIUpRmOMlyAFRvEqHOXdgpMcGvIlm70h4q+shSr3RZ19xomnbFZXGfIfKQ2APtVYWOAwuw==",
|
||||||
"ScryptObject": {
|
"ScryptObject": {
|
||||||
"Salt": "ehn0LM/Hy/4QkXAMCZq3c3p0O9G7gu5e3OQSR8MiJ6c=",
|
"Salt": "OzdcVESNmkD0403NHBWezQmq2SyDyLOY2/B4Aev2lHc=",
|
||||||
"N": 65536,
|
"N": 1024,
|
||||||
"R": 8,
|
"R": 8,
|
||||||
"P": 1,
|
"P": 1,
|
||||||
"KeyLen": 32
|
"KeyLen": 32
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
.¨Í1Aiõ&Á4—öÉ
|
<EFBFBD>_<EFBFBD>5<EFBFBD><EFBFBD><EFBFBD><EFBFBD>p<EFBFBD><EFBFBD><EFBFBD><EFBFBD><0C>F
|
Binary file not shown.
|
@ -13,7 +13,7 @@ func TestAesgcmXray(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
cmd := exec.Command("../gocryptfs-xray", "aesgcm_fs/fRtDWUFQK9vDAtAJrTbbWg")
|
cmd := exec.Command("../gocryptfs-xray", "aesgcm_fs/VnvoeSetPaOFjZDaZAh0lA")
|
||||||
out, err := cmd.CombinedOutput()
|
out, err := cmd.CombinedOutput()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
@ -30,7 +30,7 @@ func TestAessivXray(t *testing.T) {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
}
|
}
|
||||||
cmd := exec.Command("../gocryptfs-xray", "-aessiv", "aessiv_fs/Ldq-c4ADpM5iGSSrPjUAqQ")
|
cmd := exec.Command("../gocryptfs-xray", "-aessiv", "aessiv_fs/klepPXQJIaEDaIx-yurAqQ")
|
||||||
out, err := cmd.CombinedOutput()
|
out, err := cmd.CombinedOutput()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
t.Fatal(err)
|
t.Fatal(err)
|
||||||
|
@ -43,7 +43,7 @@ func TestAessivXray(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestDumpmasterkey(t *testing.T) {
|
func TestDumpmasterkey(t *testing.T) {
|
||||||
expected := "f342380e238f708ff4eb94d1fcf79cca7e1e9d9ab91222865e4eaae8a292ee43\n"
|
expected := "b4d8b25c324dd6eaa328c9906e8a2a3c6038552a042ced4326cfff210c62957a\n"
|
||||||
cmd := exec.Command("../gocryptfs-xray", "-dumpmasterkey", "aesgcm_fs/gocryptfs.conf")
|
cmd := exec.Command("../gocryptfs-xray", "-dumpmasterkey", "aesgcm_fs/gocryptfs.conf")
|
||||||
// Password = "test"
|
// Password = "test"
|
||||||
cmd.Stdin = bytes.NewBuffer([]byte("test"))
|
cmd.Stdin = bytes.NewBuffer([]byte("test"))
|
||||||
|
|
Loading…
Reference in New Issue