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

Refactor and add tests #29

Merged
merged 11 commits into from
Apr 4, 2022
Merged

Refactor and add tests #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
9e6ef10
run license check before linter
bytemare Mar 29, 2022
537662d
add license header
bytemare Mar 29, 2022
e2a8280
refactor test files
bytemare Apr 2, 2022
d922c6b
fix forgotten group identifier in messages for serialization and adde…
bytemare Apr 2, 2022
6f8b080
move some things around
bytemare Apr 2, 2022
fadf48b
add tests, rework fake credentials, refine examples, add licence headers
bytemare Apr 4, 2022
22b6f1f
Merge branch 'main' into refactor-tests
bytemare Apr 4, 2022
509b96f
don't check for identity point on deserialization as it's now integra…
bytemare Apr 4, 2022
1bf5bba
add more examples
bytemare Apr 4, 2022
d57658e
factorize some lines
bytemare Apr 4, 2022
1f8d44c
Merge branch 'refactor-tests' of github.com:bytemare/opaque into refa…
bytemare Apr 4, 2022
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
12 changes: 10 additions & 2 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,11 @@ func (c *Client) buildPRK(evaluation *group.Point) []byte {
// RegistrationInit returns a RegistrationRequest message blinding the given password.
func (c *Client) RegistrationInit(password []byte) *message.RegistrationRequest {
m := c.OPRF.Blind(password)
return &message.RegistrationRequest{BlindedMessage: m}

return &message.RegistrationRequest{
C: c.conf.OPRF,
BlindedMessage: m,
}
}

// RegistrationFinalizeWithNonce returns a RegistrationRecord message given the identities, server's
Expand Down Expand Up @@ -120,6 +124,7 @@ func (c *Client) registrationFinalize(
)

return &message.RegistrationRecord{
G: c.conf.Group,
PublicKey: clientPublicKey,
MaskingKey: maskingKey,
Envelope: envelope.Serialize(),
Expand All @@ -130,7 +135,10 @@ func (c *Client) registrationFinalize(
// clientInfo is optional client information sent in clear, and only authenticated in KE3.
func (c *Client) LoginInit(password []byte) *message.KE1 {
m := c.OPRF.Blind(password)
credReq := &message.CredentialRequest{BlindedMessage: m}
credReq := &message.CredentialRequest{
C: c.conf.OPRF,
BlindedMessage: m,
}
ke1 := c.Ake.Start(c.conf.Group)
ke1.CredentialRequest = credReq
c.Ake.Ke1 = ke1.Serialize()
Expand Down
35 changes: 4 additions & 31 deletions deserializer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ package opaque

import (
"errors"
"log"

"github.com/bytemare/crypto/group"

Expand Down Expand Up @@ -44,10 +45,6 @@ func (d *Deserializer) RegistrationRequest(registrationRequest []byte) (*message
return nil, errInvalidBlindedData
}

if blindedMessage.IsIdentity() {
return nil, errInvalidBlindedData
}

return &message.RegistrationRequest{C: d.conf.OPRF, BlindedMessage: blindedMessage}, nil
}

Expand All @@ -69,19 +66,11 @@ func (d *Deserializer) RegistrationResponse(registrationResponse []byte) (*messa
return nil, errInvalidEvaluatedData
}

if evaluatedMessage.IsIdentity() {
return nil, errInvalidEvaluatedData
}

pks, err := d.conf.Group.NewElement().Decode(registrationResponse[d.conf.OPRFPointLength:])
if err != nil {
return nil, errInvalidServerPK
}

if pks.IsIdentity() {
return nil, errInvalidServerPK
}

return &message.RegistrationResponse{
C: d.conf.OPRF,
G: d.conf.Group,
Expand Down Expand Up @@ -110,10 +99,6 @@ func (d *Deserializer) RegistrationRecord(record []byte) (*message.RegistrationR
return nil, errInvalidClientPK
}

if pku.IsIdentity() {
return nil, errInvalidClientPK
}

return &message.RegistrationRecord{
G: d.conf.Group,
PublicKey: pku,
Expand All @@ -131,10 +116,6 @@ func (d *Deserializer) deserializeCredentialResponse(
return nil, errInvalidEvaluatedData
}

if data.IsIdentity() {
return nil, errInvalidEvaluatedData
}

return &message.CredentialResponse{
C: d.conf.OPRF,
EvaluatedMessage: data,
Expand All @@ -158,22 +139,15 @@ func (d *Deserializer) KE1(ke1 []byte) (*message.KE1, error) {
return nil, errInvalidBlindedData
}

if blindedMessage.IsIdentity() {
return nil, errInvalidBlindedData
}

nonceU := ke1[d.conf.OPRFPointLength : d.conf.OPRFPointLength+d.conf.NonceLen]

epku, err := d.conf.Group.NewElement().Decode(ke1[d.conf.OPRFPointLength+d.conf.NonceLen:])
if err != nil {
return nil, errInvalidClientEPK
}

if epku.IsIdentity() {
return nil, errInvalidClientEPK
}

return &message.KE1{
G: d.conf.Group,
CredentialRequest: &message.CredentialRequest{
C: d.conf.OPRF,
BlindedMessage: blindedMessage,
Expand Down Expand Up @@ -217,11 +191,10 @@ func (d *Deserializer) KE2(ke2 []byte) (*message.KE2, error) {
return nil, errInvalidServerEPK
}

if epks.IsIdentity() {
return nil, errInvalidServerEPK
}
log.Printf("group %v", d.conf.Group)

return &message.KE2{
G: d.conf.Group,
CredentialResponse: cresp,
NonceS: nonceS,
EpkS: epks,
Expand Down
Loading