From 387148849a7040055eb07da64720062977595072 Mon Sep 17 00:00:00 2001
From: Tulir Asokan <tulir@maunium.net>
Date: Wed, 27 Apr 2022 19:04:34 +0300
Subject: [PATCH] Update mautrix-go again

---
 go.mod        | 2 +-
 go.sum        | 4 ++--
 portal.go     | 4 ++--
 urlpreview.go | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index 54eb4e3..a6068cd 100644
--- a/go.mod
+++ b/go.mod
@@ -17,7 +17,7 @@ require (
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 	maunium.net/go/mauflag v1.0.0
 	maunium.net/go/maulogger/v2 v2.3.2
-	maunium.net/go/mautrix v0.10.13-0.20220427112957-a59522681515
+	maunium.net/go/mautrix v0.10.13-0.20220427124931-09c8c43908d4
 )
 
 require (
diff --git a/go.sum b/go.sum
index 60d42ff..14ac518 100644
--- a/go.sum
+++ b/go.sum
@@ -197,5 +197,5 @@ maunium.net/go/mauflag v1.0.0 h1:YiaRc0tEI3toYtJMRIfjP+jklH45uDHtT80nUamyD4M=
 maunium.net/go/mauflag v1.0.0/go.mod h1:nLivPOpTpHnpzEh8jEdSL9UqO9+/KBJFmNRlwKfkPeA=
 maunium.net/go/maulogger/v2 v2.3.2 h1:1XmIYmMd3PoQfp9J+PaHhpt80zpfmMqaShzUTC7FwY0=
 maunium.net/go/maulogger/v2 v2.3.2/go.mod h1:TYWy7wKwz/tIXTpsx8G3mZseIRiC5DoMxSZazOHy68A=
-maunium.net/go/mautrix v0.10.13-0.20220427112957-a59522681515 h1:n+faOlwr44gHYPLa8eWq0QHYBkePUWzg3IKSGJkTLk8=
-maunium.net/go/mautrix v0.10.13-0.20220427112957-a59522681515/go.mod h1:lm1eZygpN3wlLyexPh+Z56DEvOuC4tY5/JacJWr+/AE=
+maunium.net/go/mautrix v0.10.13-0.20220427124931-09c8c43908d4 h1:DSAVqAG/Bw2uxfro1JhNvGKK6HJxSefw5Y/7hnPiEzU=
+maunium.net/go/mautrix v0.10.13-0.20220427124931-09c8c43908d4/go.mod h1:lm1eZygpN3wlLyexPh+Z56DEvOuC4tY5/JacJWr+/AE=
diff --git a/portal.go b/portal.go
index 11ad723..e46e720 100644
--- a/portal.go
+++ b/portal.go
@@ -1952,7 +1952,7 @@ func (portal *Portal) encryptFileInPlace(data []byte, mimeType string) (string,
 		EncryptedFile: *attachment.NewEncryptedFile(),
 		URL:           "",
 	}
-	file.Encrypt(data)
+	file.EncryptInPlace(data)
 	return "application/octet-stream", file
 }
 
@@ -2458,7 +2458,7 @@ func (portal *Portal) preprocessMatrixMedia(sender *User, relaybotFormatted bool
 		return nil
 	}
 	if file != nil {
-		err = file.Decrypt(data)
+		err = file.DecryptInPlace(data)
 		if err != nil {
 			portal.log.Errorfln("Failed to decrypt media in %s: %v", eventID, err)
 			return nil
diff --git a/urlpreview.go b/urlpreview.go
index 99a57c9..3a0a17e 100644
--- a/urlpreview.go
+++ b/urlpreview.go
@@ -89,7 +89,7 @@ func (portal *Portal) convertURLPreviewToBeeper(intent *appservice.IntentAPI, so
 		uploadData, uploadMime := thumbnailData, output.ImageType
 		if portal.Encrypted {
 			crypto := attachment.NewEncryptedFile()
-			crypto.Encrypt(uploadData)
+			crypto.EncryptInPlace(uploadData)
 			uploadMime = "application/octet-stream"
 			output.ImageEncryption = &event.EncryptedFileInfo{EncryptedFile: *crypto}
 		}
@@ -169,7 +169,7 @@ func (portal *Portal) convertURLPreviewToWhatsApp(sender *User, evt *event.Event
 			return true
 		}
 		if preview.ImageEncryption != nil {
-			err = preview.ImageEncryption.Decrypt(data)
+			err = preview.ImageEncryption.DecryptInPlace(data)
 			if err != nil {
 				portal.log.Errorfln("Failed to decrypt URL preview image in %s: %v", evt.ID, err)
 				return true