Skip to content

saltpack: Allow anonymous signcrypt #133

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

Merged
gabriel merged 3 commits into from
Sep 2, 2020
Merged

saltpack: Allow anonymous signcrypt #133

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1cd7f0b
saltpack: Allow anonymous signcrypt
gabriel Sep 2, 2020
627f05a
Merge branch 'master' into signcryptanon
gabriel Sep 2, 2020
2a8eb2f
Update signcrypt_test.go
gabriel Sep 2, 2020
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
7 changes: 3 additions & 4 deletions saltpack/signcrypt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ func Signcrypt(b []byte, armored bool, sender *keys.EdX25519Key, recipients ...k
if err != nil {
return nil, err
}
if sender == nil {
return nil, errors.Errorf("no sender specified")
var sk ksaltpack.SigningSecretKey
if sender != nil {
sk = newSignKey(sender)
}
sk := newSignKey(sender)
if armored {
s, err := ksaltpack.SigncryptArmor62Seal(b, ephemeralKeyCreator{}, sk, recs, nil, "")
if err != nil {
Expand All @@ -39,7 +39,6 @@ func edx25519SenderKey(senderPub ksaltpack.SigningPublicKey) (*keys.EdX25519Publ
return nil, errors.Errorf("invalid edx25519 sender key")
}
return keys.NewEdX25519PublicKey(keys.Bytes32(b)), nil

}

// SigncryptOpen ...
Expand Down
17 changes: 14 additions & 3 deletions saltpack/signcrypt_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,25 @@ func TestSigncrypt(t *testing.T) {
_, err = saltpack.Signcrypt(message, false, alice, keys.ID(""))
require.EqualError(t, err, "invalid recipient: empty id")

_, err = saltpack.Signcrypt(message, false, nil, bob.ID())
require.EqualError(t, err, "no sender specified")

// Duplicate recipient
_, err = saltpack.Signcrypt(message, false, alice, bob.ID(), bob.ID())
require.NoError(t, err)
}

func TestSigncryptAnonymous(t *testing.T) {
bob := keys.GenerateEdX25519Key()

message := []byte("hi bob")

encrypted, err := saltpack.Signcrypt(message, false, nil, bob.ID())
require.NoError(t, err)

out, sender, err := saltpack.SigncryptOpen(encrypted, false, saltpack.NewKeyring(bob))
require.NoError(t, err)
require.Equal(t, message, out)
require.Nil(t, sender)
}

func TestSigncryptStream(t *testing.T) {
alice := keys.GenerateEdX25519Key()
bob := keys.GenerateEdX25519Key()
Expand Down