Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: remove trailing commas from keystore json #2200

Merged
merged 9 commits into from
Dec 1, 2023
Merged

fix: remove trailing commas from keystore json #2200

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4d24c62
fix: remove trailing commas from keystore json
weboko Nov 8, 2023
36cdda5
Merge branch 'master' into weboko/keystore-json
weboko Nov 20, 2023
9334c74
Merge branch 'master' into weboko/keystore-json
weboko Nov 21, 2023
f83fcb9
Merge branch 'master' into weboko/keystore-json
weboko Nov 27, 2023
658a125
Merge branch 'master' of github.com:waku-org/nwaku into weboko/keysto…
weboko Nov 28, 2023
a8c5c6f
keyfile.nim: try a different Json formatting approach
Ivansete-status Nov 30, 2023
8ecc8a7
Merge branch 'weboko/keystore-json' of github.com:waku-org/nwaku into…
weboko Nov 30, 2023
140a1b8
build keystore
weboko Nov 30, 2023
87c6c22
address comment
weboko Dec 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 30 additions & 13 deletions waku/waku_keystore/keyfile.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,23 @@ type
DKey = array[DKLen, byte]
KfResult*[T] = Result[T, KeyFileError]

# basic types for building Keystore JSON
CypherParams = object
iv: string

CryptoNew = object
cipher: string
cipherparams: CypherParams
ciphertext: string
kdf: string
kdfparams: JsonNode
mac: string

KeystoreEntry = object
crypto: CryptoNew
id: string
version: string

const
SupportedHashes = [
"sha224", "sha256", "sha384", "sha512",
Expand Down Expand Up @@ -373,20 +390,20 @@ proc createKeyFileJson*(secret: openArray[byte],

let params = ? kdfParams(kdfkind, toHex(salt, true), workfactor)

let json = %*
{
"crypto": {
"cipher": $cryptkind,
"cipherparams": {
"iv": toHex(iv, true)
},
"ciphertext": toHex(ciphertext, true),
"kdf": $kdfkind,
"kdfparams": params,
"mac": toHex(mac.data, true),
},
}
var obj = KeystoreEntry(
crypto: CryptoNew(
cipher: $cryptkind,
cipherparams: CypherParams(
iv: toHex(iv, true)
),
ciphertext: toHex(ciphertext, true),
kdf: $kdfkind,
kdfparams: params,
mac: toHex(mac.data, true)
)
)

let json = %* obj
if IdInKeyfile:
json.add("id", %($u))
if VersionInKeyfile:
Expand Down
Loading