Skip to content
Snippets Groups Projects
Commit 6f3e41ff authored by Jono Wenger's avatar Jono Wenger
Browse files

Merge branch 'XX-2796/ndfUdbPubKey' into 'release'

XX-2796 / Add public key field to UDB in the NDF

See merge request !4
parents 516a65a4 231e9973
No related branches found
No related tags found
No related merge requests found
......@@ -5,3 +5,5 @@ require (
github.com/spf13/jwalterweatherman v1.1.0
gitlab.com/elixxir/primitives v0.0.0-20200731184040-494269b53b4d
)
go 1.13
......@@ -72,6 +72,7 @@ type Notification struct {
// UDB is the structure for the UDB object in the JSON file.
type UDB struct {
ID []byte `json:"Id"`
PubKeyPem string `json:"Public_key_PEM"`
}
// Group is the structure for a group in the JSON file; it is used for the E2E
......@@ -196,6 +197,7 @@ func (ndf *NetworkDefinition) Serialize() []byte {
// Convert UDB to byte slice
b = append(b, ndf.UDB.ID...)
b = append(b, []byte(ndf.UDB.PubKeyPem)...)
// Convert E2E to byte slice
b = append(b, []byte(ndf.E2E.Prime)...)
......
This diff is collapsed.
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment