Compare commits

...

2 Commits

Author SHA1 Message Date
fiatjaf
c66a2acda1 encrypt uint8array to hex. 2022-01-24 21:00:51 -03:00
fiatjaf
6f07c756e5 change nip04 functions interfaces. 2022-01-24 20:21:26 -03:00
2 changed files with 8 additions and 7 deletions

View File

@@ -16,24 +16,25 @@ export function encrypt(privkey, pubkey, text) {
let encryptedMessage = cipher.update(text, 'utf8', 'base64') let encryptedMessage = cipher.update(text, 'utf8', 'base64')
encryptedMessage += cipher.final('base64') encryptedMessage += cipher.final('base64')
return [encryptedMessage, Buffer.from(iv.buffer).toString('base64')] return `${encryptedMessage}?iv=${Buffer.from(iv.buffer).toString('base64')}`
} }
export function decrypt(privkey, pubkey, ciphertext, iv) { export function decrypt(privkey, pubkey, ciphertext) {
const key = secp256k1.getSharedSecret(privkey, '02' + pubkey) let [cip, iv] = ciphertext.split('?iv=')
const normalizedKey = getOnlyXFromFullSharedSecret(key) let key = secp256k1.getSharedSecret(privkey, '02' + pubkey)
let normalizedKey = getOnlyXFromFullSharedSecret(key)
var decipher = aes.createDecipheriv( var decipher = aes.createDecipheriv(
'aes-256-cbc', 'aes-256-cbc',
Buffer.from(normalizedKey, 'hex'), Buffer.from(normalizedKey, 'hex'),
Buffer.from(iv, 'base64') Buffer.from(iv, 'base64')
) )
let decryptedMessage = decipher.update(ciphertext, 'base64') let decryptedMessage = decipher.update(cip, 'base64')
decryptedMessage += decipher.final('utf8') decryptedMessage += decipher.final('utf8')
return decryptedMessage return decryptedMessage
} }
function getOnlyXFromFullSharedSecret(fullSharedSecretCoordinates) { function getOnlyXFromFullSharedSecret(fullSharedSecretCoordinates) {
return fullSharedSecretCoordinates.substr(2, 64) return Buffer.from(fullSharedSecretCoordinates).toString('hex').substr(2, 64)
} }

View File

@@ -1,6 +1,6 @@
{ {
"name": "nostr-tools", "name": "nostr-tools",
"version": "0.20.1", "version": "0.21.1",
"description": "Tools for making a Nostr client.", "description": "Tools for making a Nostr client.",
"repository": { "repository": {
"type": "git", "type": "git",