deblan-mirror/mautrix-go
1
0
Fork 0
mirror of https://mau.dev/mautrix/go.git synced 2026-03-14 14:25:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

wip: olm/pk: trying to fuzz decryption

Browse source 
Signed-off-by: Sumner Evans <sumner@beeper.com>
This commit is contained in:
Sumner Evans 2024-03-11 08:59:17 -06:00
commit 1a5205f080
No known key found for this signature in database
GPG key ID: 8904527AB50022FD
5 changed files with 35 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
crypto/goolm/pk/decryption.go
View file

@ -34,7 +34,7 @@ func NewDecryption() (*Decryption, error) {
}, nil
}
// NewDescriptionFromPrivate resturns a new Decryption with the private key fixed.
// NewDescriptionFromPrivate returns a new Decryption with the private key fixed.
func NewDecryptionFromPrivate(privateKey crypto.Curve25519PrivateKey) (*Decryption, error) {
s := &Decryption{}
keyPair, err := crypto.Curve25519GenerateFromPrivate(privateKey)
@ -56,7 +56,7 @@ func (s Decryption) PrivateKey() crypto.Curve25519PrivateKey {
}
// Decrypt decrypts the ciphertext and verifies the MAC. The base64 encoded key is used to construct the shared secret.
func (s Decryption) Decrypt(ciphertext, mac []byte, key id.Curve25519) ([]byte, error) {
func (s Decryption) Decrypt(key id.Curve25519, mac, ciphertext []byte) ([]byte, error) {
keyDecoded, err := base64.RawStdEncoding.DecodeString(string(key))
if err != nil {
return nil, err

2
crypto/goolm/pk/pk_test.go
View file

@ -48,7 +48,7 @@ func TestEncryptionDecryption(t *testing.T) {
t.Fatal(err)
}
decrypted, err := decryption.Decrypt(ciphertext, mac, id.Curve25519(bobPublic))
decrypted, err := decryption.Decrypt(id.Curve25519(bobPublic), ciphertext, mac)
if err != nil {
t.Fatal(err)
}

2
crypto/olm/pk_goolm.go
View file

@ -25,5 +25,5 @@ func NewPKSigning() (PKSigning, error) {
}
func NewPKDecryption(privateKey []byte) (PKDecryption, error) {
return pk.NewDecryption()
return pk.NewDecryptionFromPrivate(privateKey)
}

2
crypto/olm/pk_interface.go
View file

@ -35,7 +35,7 @@ type PKDecryption interface {
PublicKey() id.Curve25519
// Decrypt verifies and decrypts the given message.
Decrypt(ciphertext, mac []byte, key id.Curve25519) ([]byte, error)
Decrypt(key id.Curve25519, ciphertext, mac []byte) ([]byte, error)
}
var _ PKDecryption = (*pk.Decryption)(nil)

30
crypto/olm/pk_test.go
View file

@ -43,3 +43,33 @@ func FuzzSign(f *testing.F) {
assert.Equal(t, goolmResult, libolmResult)
})
}
// func FuzzDecrypt(f *testing.F) {
// f.Add([]byte("plaintext"))
// f.Fuzz(func(t *testing.T, plaintext []byte) {
// keyPair, err := crypto.Curve25519GenerateKey(nil)
// require.NoError(t, err)
// goolmEncryption, err := pk.NewEncryption(keyPair.B64Encoded())
// require.NoError(t, err)
// ciphertext, mac, err := goolmEncryption.Encrypt(plaintext, keyPair.PrivateKey)
// assert.NoError(t, err)
// goolmPkDecryption, err := pk.NewDecryptionFromPrivate(keyPair.PrivateKey)
// require.NoError(t, err)
// libolmPkDecryption, err := olm.NewPkDecryption(keyPair.PrivateKey)
// require.NoError(t, err)
// fmt.Printf("mac=%s\n", mac)
// fmt.Printf("ciphertext=%v\n", ciphertext)
// libolmResult, libolmErr := libolmPkDecryption.Decrypt([]byte(keyPair.B64Encoded().String()), mac, []byte(base64.RawStdEncoding.EncodeToString(ciphertext)))
// goolmResult, goolmErr := goolmPkDecryption.Decrypt(keyPair.B64Encoded(), mac, ciphertext)
// assert.Equal(t, libolmErr, goolmErr)
// assert.Equal(t, libolmResult, goolmResult)
// })
// }