From 297df740adfff55c2779131c62e73aaa25ac1ccd Mon Sep 17 00:00:00 2001
From: eater <=@eater.me>
Date: Sun, 11 Aug 2019 15:44:38 +0200
Subject: [PATCH] Apply padding -before- crypting

---
 crypto.go | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/crypto.go b/crypto.go
index 8fc355d..78d0e95 100644
--- a/crypto.go
+++ b/crypto.go
@@ -114,9 +114,8 @@ func EncryptAndSign(v Message, key *rsa.PrivateKey, pub *rsa.PublicKey, signatur
 
 	encBody := make([]byte, len(body))
 	enc := cipher2.NewCBCEncrypter(cipher, iv)
+	body = append(body, Pad(body)...)
 	enc.CryptBlocks(encBody, body)
-
-	copy(encBody[len(encBody):], Pad(encBody))
 	writer.Write([]byte(hex.EncodeToString(encBody)))
 
 	return nil