highperfocused/go-nostr
1
0
Fork 0
mirror of https://github.com/nbd-wtf/go-nostr.git synced 2025-10-10 12:53:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix nip04 decryption padding and add tests.

Browse Source
This commit is contained in:
fiatjaf
2022-12-14 16:10:10 -03:00
parent ac25c2071e
commit 8a8fd7c2b0
2 changed files with 58 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
nip04/nip04.go
View File

@@ -51,10 +51,12 @@ func Encrypt(message string, key []byte) (string, error) {
}
mode := cipher.NewCBCEncrypter(block, iv)
// PKCS5 padding
padding := block.BlockSize() - len([]byte(message))%block.BlockSize()
padtext := bytes.Repeat([]byte{byte(padding)}, padding)
paddedMsgBytes := append([]byte(message), padtext...)
plaintext := []byte(message)
// add padding
padding := block.BlockSize() - len(plaintext)%block.BlockSize() // will be a number between 1 and 16 (inc), never 0
padtext := bytes.Repeat([]byte{byte(padding)}, padding) // encode the padding in all the padding bytes
paddedMsgBytes := append(plaintext, padtext...)
ciphertext := make([]byte, len(paddedMsgBytes))
mode.CryptBlocks(ciphertext, paddedMsgBytes)
@@ -87,5 +89,9 @@ func Decrypt(content string, key []byte) (string, error) {
plaintext := make([]byte, len(ciphertext))
mode.CryptBlocks(plaintext, ciphertext)
return string(plaintext[:]), nil
// remove padding
padding := int(plaintext[len(plaintext)-1]) // the padding amount is encoded in the padding bytes themselves
message := string(plaintext[0 : len(plaintext)-padding])
return message, nil
}