diff --git a/README.md b/README.md
index 07e761e..02c664d 100644
--- a/README.md
+++ b/README.md
@@ -224,7 +224,7 @@ assert(data.relays.length === 2)
 ### Encrypting and decrypting direct messages
 
 ```js
-import { nip04, getPublicKey, generatePrivateKey } from 'nostr-tools'
+import {nip44, getPublicKey, generatePrivateKey} from 'nostr-tools'
 
 // sender
 let sk1 = generatePrivateKey()
@@ -236,7 +236,8 @@ let pk2 = getPublicKey(sk2)
 
 // on the sender side
 let message = 'hello'
-let ciphertext = await nip04.encrypt(sk1, pk2, message)
+let key = nip44.getSharedSecret(sk1, pk2)
+let ciphertext = nip44.encrypt(key, message)
 
 let event = {
   kind: 4,
@@ -251,8 +252,9 @@ sendEvent(event)
 // on the receiver side
 sub.on('event', async event => {
   let sender = event.pubkey
-  pk1 === sender
-  let plaintext = await nip04.decrypt(sk2, pk1, event.content)
+  // pk1 === sender
+  let _key = nip44.getSharedSecret(sk2, pk1)
+  let plaintext = nip44.decrypt(_key, event.content)
 })
 ```
 
diff --git a/nip44.test.ts b/nip44.test.ts
index a9a89e6..088d893 100644
--- a/nip44.test.ts
+++ b/nip44.test.ts
@@ -1,21 +1,75 @@
-import crypto from 'node:crypto'
-import { hexToBytes } from '@noble/hashes/utils'
+import { encrypt, decrypt, utils } from './nip44.ts'
+import { bytesToHex, hexToBytes } from '@noble/hashes/utils'
+import { v2 as vectors } from './nip44.vectors.json'
+import { getPublicKey } from './keys.ts'
 
-import { encrypt, decrypt, getSharedSecret } from './nip44.ts'
-import { getPublicKey, generatePrivateKey } from './keys.ts'
-
-// @ts-ignore
-// eslint-disable-next-line no-undef
-globalThis.crypto = crypto
-
-test('encrypt and decrypt message', async () => {
-  let sk1 = generatePrivateKey()
-  let sk2 = generatePrivateKey()
-  let pk1 = getPublicKey(sk1)
-  let pk2 = getPublicKey(sk2)
-  let sharedKey1 = getSharedSecret(sk1, pk2)
-  let sharedKey2 = getSharedSecret(sk2, pk1)
-
-  expect(decrypt(hexToBytes(sk1), encrypt(hexToBytes(sk1), 'hello'))).toEqual('hello')
-  expect(decrypt(sharedKey2, encrypt(sharedKey1, 'hello'))).toEqual('hello')
+test('NIP44: valid_sec', async () => {
+  for (const v of vectors.valid_sec) {
+    const pub2 = getPublicKey(v.sec2)
+    const key = utils.v2.getConversationKey(v.sec1, pub2)
+    expect(bytesToHex(key)).toEqual(v.shared)
+    const ciphertext = encrypt(key, v.plaintext, { salt: hexToBytes(v.salt) })
+    expect(ciphertext).toEqual(v.ciphertext)
+    const decrypted = decrypt(key, ciphertext)
+    expect(decrypted).toEqual(v.plaintext)
+  }
 })
+
+test('NIP44: valid_pub', async () => {
+  for (const v of vectors.valid_pub) {
+    const key = utils.v2.getConversationKey(v.sec1, v.pub2)
+    expect(bytesToHex(key)).toEqual(v.shared)
+    const ciphertext = encrypt(key, v.plaintext, { salt: hexToBytes(v.salt) })
+    expect(ciphertext).toEqual(v.ciphertext)
+    const decrypted = decrypt(key, ciphertext)
+    expect(decrypted).toEqual(v.plaintext)
+  }
+})
+
+test('NIP44: invalid', async () => {
+  for (const v of vectors.invalid) {
+    expect(() => {
+      const key = utils.v2.getConversationKey(v.sec1, v.pub2)
+      const ciphertext = decrypt(key, v.plaintext)
+    }).toThrowError()
+  }
+})
+
+test('NIP44: invalid_conversation_key', async () => {
+  for (const v of vectors.invalid_conversation_key) {
+    expect(() => {
+      const key = utils.v2.getConversationKey(v.sec1, v.pub2)
+      const ciphertext = encrypt(key, v.plaintext)
+    }).toThrowError()
+  }
+})
+
+test('NIP44: v1 calcPadding', () => {
+  for (const [len, shouldBePaddedTo] of vectors.padding) {
+    const actual = utils.v2.calcPadding(len)
+    expect(actual).toEqual(shouldBePaddedTo)
+  }
+})
+
+// To re-generate vectors and produce new ones:
+// Create regen.mjs with this content:
+// import {getPublicKey, nip44} from './lib/esm/nostr.mjs'
+// import {bytesToHex, hexToBytes} from '@noble/hashes/utils'
+// import vectors from './nip44.vectors.json' assert { type: "json" };
+// function genVectors(v) {
+//   const pub2 = v.pub2 ?? getPublicKey(v.sec2);
+//   let sharedKey = nip44.utils.v2.getConversationKey(v.sec1, pub2)
+//   let ciphertext = nip44.encrypt(sharedKey, v.plaintext, { salt: hexToBytes(v.salt) })
+//   console.log({
+//     sec1: v.sec1,
+//     pub2: pub2,
+//     sharedKey: bytesToHex(sharedKey),
+//     salt: v.salt,
+//     plaintext: v.plaintext,
+//     ciphertext
+//   })
+// }
+// for (let v of vectors.valid_sec) genVectors(v);
+// for (let v of vectors.valid_pub) genVectors(v);
+// const padded = concatBytes(utils.v2.pad(plaintext), new Uint8Array(250))
+// const mac = randomBytes(32)
diff --git a/nip44.ts b/nip44.ts
index dd75f85..62f602b 100644
--- a/nip44.ts
+++ b/nip44.ts
@@ -1,40 +1,105 @@
-import { base64 } from '@scure/base'
-import { randomBytes } from '@noble/hashes/utils'
+import { chacha20 } from '@noble/ciphers/chacha'
+import { ensureBytes, equalBytes } from '@noble/ciphers/utils'
 import { secp256k1 } from '@noble/curves/secp256k1'
+import { hkdf } from '@noble/hashes/hkdf'
+import { hmac } from '@noble/hashes/hmac'
 import { sha256 } from '@noble/hashes/sha256'
-import { xchacha20 } from '@noble/ciphers/chacha'
-
+import { concatBytes, randomBytes } from '@noble/hashes/utils'
+import { base64 } from '@scure/base'
 import { utf8Decoder, utf8Encoder } from './utils.ts'
 
-export const getSharedSecret = (privkey: string, pubkey: string): Uint8Array =>
-  sha256(secp256k1.getSharedSecret(privkey, '02' + pubkey).subarray(1, 33))
+export const utils = {
+  v2: {
+    maxPlaintextSize: 65536 - 128, // 64kb - 128
+    minCiphertextSize: 100, // should be 128 if min padded to 32b: base64(1+32+32+32)
+    maxCiphertextSize: 102400, // 100kb
 
-export function encrypt(key: Uint8Array, text: string, v = 1) {
-  if (v !== 1) {
-    throw new Error('NIP44: unknown encryption version')
-  }
+    getConversationKey(privkeyA: string, pubkeyB: string): Uint8Array {
+      const key = secp256k1.getSharedSecret(privkeyA, '02' + pubkeyB)
+      return key.subarray(1, 33)
+    },
 
-  const nonce = randomBytes(24)
-  const plaintext = utf8Encoder.encode(text)
-  const ciphertext = xchacha20(key, nonce, plaintext)
+    getMessageKeys(conversationKey: Uint8Array, salt: Uint8Array) {
+      const keys = hkdf(sha256, conversationKey, salt, 'nip44-v2', 76)
+      return {
+        encryption: keys.subarray(0, 32),
+        nonce: keys.subarray(32, 44),
+        auth: keys.subarray(44, 76),
+      }
+    },
 
-  const payload = new Uint8Array(25 + ciphertext.length)
-  payload.set([v], 0)
-  payload.set(nonce, 1)
-  payload.set(ciphertext, 25)
+    calcPadding(len: number): number {
+      if (!Number.isSafeInteger(len) || len < 0) throw new Error('expected positive integer')
+      if (len <= 32) return 32
+      const nextpower = 1 << (Math.floor(Math.log2(len - 1)) + 1)
+      const chunk = nextpower <= 256 ? 32 : nextpower / 8
+      return chunk * (Math.floor((len - 1) / chunk) + 1)
+    },
 
-  return base64.encode(payload)
+    pad(unpadded: string): Uint8Array {
+      const unpaddedB = utf8Encoder.encode(unpadded)
+      const len = unpaddedB.length
+      if (len < 1 || len >= utils.v2.maxPlaintextSize) throw new Error('plaintext should be between 1b and 64KB')
+      const paddedLen = utils.v2.calcPadding(len)
+      const zeros = new Uint8Array(paddedLen - len)
+      const lenBuf = new Uint8Array(2)
+      new DataView(lenBuf.buffer).setUint16(0, len)
+      return concatBytes(lenBuf, unpaddedB, zeros)
+    },
+
+    unpad(padded: Uint8Array): string {
+      const unpaddedLen = new DataView(padded.buffer).getUint16(0)
+      const unpadded = padded.subarray(2, 2 + unpaddedLen)
+      if (
+        unpaddedLen === 0 ||
+        unpadded.length !== unpaddedLen ||
+        padded.length !== 2 + utils.v2.calcPadding(unpaddedLen)
+      )
+        throw new Error('invalid padding')
+      return utf8Decoder.decode(unpadded)
+    },
+  },
 }
 
-export function decrypt(key: Uint8Array, payload: string) {
-  let data = base64.decode(payload)
-  if (data[0] !== 1) {
-    throw new Error(`NIP44: unknown encryption version: ${data[0]}`)
-  }
+export function encrypt(
+  key: Uint8Array,
+  plaintext: string,
+  options: { salt?: Uint8Array; version?: number } = {},
+): string {
+  const version = options.version ?? 2
+  if (version !== 2) throw new Error('unknown encryption version ' + version)
 
-  const nonce = data.slice(1, 25)
-  const ciphertext = data.slice(25)
-  const plaintext = xchacha20(key, nonce, ciphertext)
+  const salt = options.salt ?? randomBytes(32)
+  ensureBytes(salt, 32)
 
-  return utf8Decoder.decode(plaintext)
+  const keys = utils.v2.getMessageKeys(key, salt)
+  const padded = utils.v2.pad(plaintext)
+  const ciphertext = chacha20(keys.encryption, keys.nonce, padded)
+  const mac = hmac(sha256, keys.auth, ciphertext)
+
+  return base64.encode(concatBytes(new Uint8Array([version]), salt, ciphertext, mac))
+}
+
+export function decrypt(key: Uint8Array, ciphertext: string): string {
+  const clen = ciphertext.length
+
+  if (clen < utils.v2.minCiphertextSize || clen >= utils.v2.maxCiphertextSize)
+    throw new Error('ciphertext length is invalid')
+
+  const v = ciphertext[0]
+  if (v === '#') throw new Error('unknown encryption version')
+  const data = base64.decode(ciphertext)
+  const version = data.subarray(0, 1)[0]
+  if (version !== 2) throw new Error('unknown encryption version ' + version)
+
+  const salt = data.subarray(1, 33)
+  const ciphertext_ = data.subarray(33, -32)
+  const mac = data.subarray(-32)
+
+  const keys = utils.v2.getMessageKeys(key, salt)
+  const calculatedMac = hmac(sha256, keys.auth, ciphertext_)
+  if (!equalBytes(calculatedMac, mac)) throw new Error('encryption MAC does not match')
+
+  const plaintext = chacha20(keys.encryption, keys.nonce, ciphertext_)
+  return utils.v2.unpad(plaintext)
 }
diff --git a/nip44.vectors.json b/nip44.vectors.json
new file mode 100644
index 0000000..c3b60b8
--- /dev/null
+++ b/nip44.vectors.json
@@ -0,0 +1,251 @@
+{
+  "v2": {
+    "valid_sec": [
+      {
+        "sec1": "0000000000000000000000000000000000000000000000000000000000000001",
+        "sec2": "0000000000000000000000000000000000000000000000000000000000000002",
+        "shared": "c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5",
+        "salt": "0000000000000000000000000000000000000000000000000000000000000001",
+        "plaintext": "a",
+        "ciphertext": "AgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABYNpT9ESckRbRUY7bUF5P+1rObpA4BNoksAUQ8myMDd9/37W/J2YHvBpRjvy9uC0+ovbpLc0WLaMFieqAMdIYqR14",
+        "note": "sk1 = 1, sk2 = random, 0x02"
+      },
+      {
+        "sec1": "0000000000000000000000000000000000000000000000000000000000000002",
+        "sec2": "0000000000000000000000000000000000000000000000000000000000000001",
+        "shared": "c6047f9441ed7d6d3045406e95c07cd85c778e4b8cef3ca7abac09b95c709ee5",
+        "salt": "f00000000000000000000000000000f00000000000000000000000000000000f",
+        "plaintext": "🍕🫃",
+        "ciphertext": "AvAAAAAAAAAAAAAAAAAAAPAAAAAAAAAAAAAAAAAAAAAPKY68BwdF7PIT205jBoaZHSs7OMpKsULW5F5ClOJWiy6XjZy7s2v85KugYmbBKgEC2LytbXbxkr7Jpgfk529K3/pP",
+        "note": "sk1 = 1, sk2 = random, 0x02"
+      },
+      {
+        "sec1": "5c0c523f52a5b6fad39ed2403092df8cebc36318b39383bca6c00808626fab3a",
+        "sec2": "4b22aa260e4acb7021e32f38a6cdf4b673c6a277755bfce287e370c924dc936d",
+        "shared": "94da47d851b9c1ed33b3b72f35434f56aa608d60e573e9c295f568011f4f50a4",
+        "salt": "b635236c42db20f021bb8d1cdff5ca75dd1a0cc72ea742ad750f33010b24f73b",
+        "plaintext": "表ポあA鷗ŒéＢ逍Üߪąñ丂㐀𠀀",
+        "ciphertext": "ArY1I2xC2yDwIbuNHN/1ynXdGgzHLqdCrXUPMwELJPc7yuU7XwJ8wCYUrq4aXX86HLnkMx7fPFvNeMk0uek9ma01magfEBIf+vJvZdWKiv48eUu9Cv31plAJsH6kSIsGc5TVYBYipkrQUNRxxJA15QT+uCURF96v3XuSS0k2Pf108AI=",
+        "note": "hard-unicode string"
+      },
+      {
+        "sec1": "8f40e50a84a7462e2b8d24c28898ef1f23359fff50d8c509e6fb7ce06e142f9c",
+        "sec2": "b9b0a1e9cc20100c5faa3bbe2777303d25950616c4c6a3fa2e3e046f936ec2ba",
+        "shared": "ab99c122d4586cdd5c813058aa543d0e7233545dbf6874fc34a3d8d9a18fbbc3",
+        "salt": "b20989adc3ddc41cd2c435952c0d59a91315d8c5218d5040573fc3749543acaf",
+        "plaintext": "ability🤝的 ȺȾ",
+        "ciphertext": "ArIJia3D3cQc0sQ1lSwNWakTFdjFIY1QQFc/w3SVQ6yvPSc+7YCIFTmGk5OLuh1nhl6TvID7sGKLFUCWRW1eRfV/0a7sT46N3nTQzD7IE67zLWrYqGnE+0DDNz6sJ4hAaFrT"
+      },
+      {
+        "sec1": "875adb475056aec0b4809bd2db9aa00cff53a649e7b59d8edcbf4e6330b0995c",
+        "sec2": "9c05781112d5b0a2a7148a222e50e0bd891d6b60c5483f03456e982185944aae",
+        "shared": "a449f2a85c6d3db0f44c64554a05d11a3c0988d645e4b4b2592072f63662f422",
+        "salt": "8d4442713eb9d4791175cb040d98d6fc5be8864d6ec2f89cf0895a2b2b72d1b1",
+        "plaintext": "pepper👀їжак",
+        "ciphertext": "Ao1EQnE+udR5EXXLBA2Y1vxb6IZNbsL4nPCJWisrctGx1TkkMfiHJxEeSdQ/4Rlaghn0okDCNYLihBsHrDzBsNRC27APmH9mmZcpcg66Mb0exH9V5/lLBWdQW+fcY9GpvXv0"
+      },
+      {
+        "sec1": "eba1687cab6a3101bfc68fd70f214aa4cc059e9ec1b79fdb9ad0a0a4e259829f",
+        "sec2": "dff20d262bef9dfd94666548f556393085e6ea421c8af86e9d333fa8747e94b3",
+        "shared": "decde9938ffcb14fa7ff300105eb1bf239469af9baf376e69755b9070ae48c47",
+        "salt": "2180b52ae645fcf9f5080d81b1f0b5d6f2cd77ff3c986882bb549158462f3407",
+        "plaintext": "( ͡° ͜ʖ ͡°)",
+        "ciphertext": "AiGAtSrmRfz59QgNgbHwtdbyzXf/PJhogrtUkVhGLzQHiR8Hljs6Nl/XsNDAmCz6U1Z3NUGhbCtczc3wXXxDzFkjjMimxsf/74OEzu7LphUadM9iSWvVKPrNXY7lTD0B2muz"
+      },
+      {
+        "sec1": "d5633530f5bcfebceb5584cfbbf718a30df0751b729dd9a789b9f30c0587d74e",
+        "sec2": "b74e6a341fb134127272b795a08b59250e5fa45a82a2eb4095e4ce9ed5f5e214",
+        "shared": "c6f2fde7aa00208c388f506455c31c3fa07caf8b516d43bf7514ee19edcda994",
+        "salt": "e4cd5f7ce4eea024bc71b17ad456a986a74ac426c2c62b0a15eb5c5c8f888b68",
+        "plaintext": "مُنَاقَشَةُ سُبُلِ اِسْتِخْدَامِ اللُّغَةِ فِي النُّظُمِ الْقَائِمَةِ وَفِيم يَخُصَّ التَّطْبِيقَاتُ الْحاسُوبِيَّةُ،",
+        "ciphertext": "AuTNX3zk7qAkvHGxetRWqYanSsQmwsYrChXrXFyPiItohfde4vHVRHUupr+Glh9JW4f9EY+w795hvRZbixs0EQgDZ7zwLlymVQI3NNvMqvemQzHUA1I5+9gSu8XSMwX9gDCUAjUJtntCkRt9+tjdy2Wa2ZrDYqCvgirvzbJTIC69Ve3YbKuiTQCKtVi0PA5ZLqVmnkHPIqfPqDOGj/a3dvJVzGSgeijcIpjuEgFF54uirrWvIWmTBDeTA+tlQzJHpB2wQnUndd2gLDb8+eKFUZPBifshD3WmgWxv8wRv6k3DeWuWEZQ70Z+YDpgpeOzuzHj0MDBwMAlY8Qq86Rx6pxY76PLDDfHh3rE2CHJEKl2MhDj7pGXao2o633vSRd9ueG8W"
+      },
+      {
+        "sec1": "d5633530f5bcfebceb5584cfbbf718a30df0751b729dd9a789b9f30c0587d74e",
+        "sec2": "b74e6a341fb134127272b795a08b59250e5fa45a82a2eb4095e4ce9ed5f5e214",
+        "shared": "c6f2fde7aa00208c388f506455c31c3fa07caf8b516d43bf7514ee19edcda994",
+        "salt": "38d1ca0abef9e5f564e89761a86cee04574b6825d3ef2063b10ad75899e4b023",
+        "plaintext": "الكل في المجمو عة (5)",
+        "ciphertext": "AjjRygq++eX1ZOiXYahs7gRXS2gl0+8gY7EK11iZ5LAjTHmhdBC3meTY4A7Lv8s8B86MnmlUBJ8ebzwxFQzDyVCcdSbWFaKe0gigEBdXew7TjrjH8BCpAbtYjoa4YHa8GNjj7zH314ApVnwoByHdLHLB9Vr6VdzkxcJgA6oL4MAsRLg="
+      },
+      {
+        "sec1": "d5633530f5bcfebceb5584cfbbf718a30df0751b729dd9a789b9f30c0587d74e",
+        "sec2": "b74e6a341fb134127272b795a08b59250e5fa45a82a2eb4095e4ce9ed5f5e214",
+        "shared": "c6f2fde7aa00208c388f506455c31c3fa07caf8b516d43bf7514ee19edcda994",
+        "salt": "4f1a31909f3483a9e69c8549a55bbc9af25fa5bbecf7bd32d9896f83ef2e12e0",
+        "plaintext": "𝖑𝖆𝖟𝖞 社會科學院語學研究所",
+        "ciphertext": "Ak8aMZCfNIOp5pyFSaVbvJryX6W77Pe9MtmJb4PvLhLg/25Q5uBC88jl5ghtEREXX6o4QijPzM0uwmkeQ54/6aIqUyzGNVdryWKZ0mee2lmVVWhU+26X6XGFQ5DGRn+1v0POsFUCZ/REh35+beBNHnyvjxD/rbrMfhP2Blc8X5m8Xvk="
+      },
+      {
+        "sec1": "d5633530f5bcfebceb5584cfbbf718a30df0751b729dd9a789b9f30c0587d74e",
+        "sec2": "b74e6a341fb134127272b795a08b59250e5fa45a82a2eb4095e4ce9ed5f5e214",
+        "shared": "c6f2fde7aa00208c388f506455c31c3fa07caf8b516d43bf7514ee19edcda994",
+        "salt": "a3e219242d85465e70adcd640b564b3feff57d2ef8745d5e7a0663b2dccceb54",
+        "plaintext": "🙈 🙉 🙊 0️⃣ 1️⃣ 2️⃣ 3️⃣ 4️⃣ 5️⃣ 6️⃣ 7️⃣ 8️⃣ 9️⃣ 🔟 Powerلُلُصّبُلُلصّبُررً ॣ ॣh ॣ ॣ冗",
+        "ciphertext": "AqPiGSQthUZecK3NZAtWSz/v9X0u+HRdXnoGY7LczOtU9bUC2ji2A2udRI2VCEQZ7IAmYRRgxodBtd5Yi/5htCUczf1jLHxIt9AhVAZLKuRgbWOuEMq5RBybkxPsSeAkxzXVOlWHZ1Febq5ogkjqY/6Xj8CwwmaZxfbx+d1BKKO3Wa+IFuXwuVAZa1Xo+fan+skyf+2R5QSj10QGAnGO7odAu/iZ9A28eMoSNeXsdxqy1+PRt5Zk4i019xmf7C4PDGSzgFZSvQ2EzusJN5WcsnRFmF1L5rXpX1AYo8HusOpWcGf9PjmFbO+8spUkX1W/T21GRm4o7dro1Y6ycgGOA9BsiQ==",
+        "note": "emoji and lang 7"
+      }
+    ],
+    "valid_pub": [
+      {
+        "sec1": "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364139",
+        "pub2": "0000000000000000000000000000000000000000000000000000000000000002",
+        "shared": "7a1ccf5ce5a08e380f590de0c02776623b85a61ae67cfb6a017317e505b7cb51",
+        "salt": "a000000000000000000000000000000000000000000000000000000000000001",
+        "plaintext": "⁰⁴⁵₀₁₂",
+        "ciphertext": "AqAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAB2+xmGnjIMPMqqJGmjdYAYZUDUyEEUO3/evHUaO40LePeR91VlMVZ7I+nKJPkaUiKZ3cQiQnA86Uwti2IxepmzOFN",
+        "note": "sec1 = n-2, pub2: random, 0x02"
+      },
+      {
+        "sec1": "0000000000000000000000000000000000000000000000000000000000000002",
+        "pub2": "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdeb",
+        "shared": "aa971537d741089885a0b48f2730a125e15b36033d089d4537a4e1204e76b39e",
+        "salt": "b000000000000000000000000000000000000000000000000000000000000002",
+        "plaintext": "A Peer-to-Peer Electronic Cash System",
+        "ciphertext": "ArAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACyuqG6RycuPyDPtwxzTcuMQu+is3N5XuWTlvCjligVaVBRydexaylXbsX592MEd3/Jt13BNL/GlpYpGDvLS4Tt/+2s9FX/16e/RDc+czdwXglc4DdSHiq+O06BvvXYfEQOPw=",
+        "note": "sec1 = 2, pub2: "
+      },
+      {
+        "sec1": "0000000000000000000000000000000000000000000000000000000000000001",
+        "pub2": "79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
+        "shared": "79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
+        "salt": "79be667ef9dcbbac55a06295ce870b07029bfcdb2dce28d959f2815b16f81798",
+        "plaintext": "A purely peer-to-peer version of electronic cash would allow online payments to be sent directly from one party to another without going through a financial institution. Digital signatures provide part of the solution, but the main benefits are lost if a trusted third party is still required to prevent double-spending.",
+        "ciphertext": "Anm+Zn753LusVaBilc6HCwcCm/zbLc4o2VnygVsW+BeYb9wHyKevpe7ohJ6OkpceFcb0pySY8TLGwT7Q3zWNDKxc9blXanxKborEXkQH8xNaB2ViJfgxpkutbwbYd0Grix34xzaZBASufdsNm7R768t51tI6sdS0nms6kWLVJpEGu6Ke4Bldv4StJtWBLaTcgsgN+4WxDbBhC/nhwjEQiBBbbmUrPWjaVZXjl8dzzPrYtkSoeBNJs/UNvDwym4+qrmhv4ASTvVflpZgLlSe4seqeu6dWoRqn8uRHZQnPs+XhqwbdCHpeKGB3AfGBykZY0RIr0tjarWdXNasGbIhGM3GiLasioJeabAZw0plCevDkKpZYDaNfMJdzqFVJ8UXRIpvDpQad0SOm8lLum/aBzUpLqTjr3RvSlhYdbuODpd9pR5K60k4L2N8nrPtBv08wlilQg2ymwQgKVE6ipxIzzKMetn8+f0nQ9bHjWFJqxetSuMzzArTUQl9c4q/DwZmCBhI2",
+        "note": "sec1 == pub2 == salt"
+      }
+    ],
+    "invalid": [
+      {
+        "sec1": "2573d1e9b9ac5de5d570f652cbb9e8d4f235e3d3d334181448e87c417f374e83",
+        "pub2": "8348c2d35549098706e5bab7966d9a9c72fbf6554e918f41c2b6cb275f79ec13",
+        "sharedKey": "8673ec68393a997bfad7eab8661461daf8b3931b7e885d78312a3fb7fe17f41a",
+        "salt": "daaea5ca345b268e5b62060ca72c870c48f713bc1e00ff3fc0ddb78e826f10db",
+        "plaintext": "n o s t r",
+        "ciphertext": "##Atqupco0WyaOW2IGDKcshwxI9xO8HgD/P8Ddt46CbxDbOsrsqIEybscEwg5rnI/Cx03mDSmeweOLKD7dw5BDZQDxXSlCwX1LIcTJEZaJPTz98Ftu0zSE0d93ED7OtdlvNeZx",
+        "note": "invalid version: flag"
+      },
+      {
+        "sec1": "11063318c5cb3cd9cafcced42b4db5ea02ec976ed995962d2bc1fa1e9b52e29f",
+        "pub2": "5c49873b6eac3dd363325250cc55d5dd4c7ce9a885134580405736d83506bb74",
+        "sharedKey": "e2aad10de00913088e5cb0f73fa526a6a17e95763cc5b2a127022f5ea5a73445",
+        "salt": "ad408d4be8616dc84bb0bf046454a2a102edac937c35209c43cd7964c5feb781",
+        "plaintext": "⚠️",
+        "ciphertext": "ArIJia3D3cQc0sQ1lSwNWakTFdjFIY1QQFc/w3SVQ6yvPSc+7YCIFTmGk5OLuh1nhl6TvID7sGKLFUCWRW1eRfV/0a7sT46N3nTQzD7IE67zLWrYqGnE+0DDNz6sJ4hAaFrT",
+        "note": "invalid version: 0"
+      },
+      {
+        "sec1": "2573d1e9b9ac5de5d570f652cbb9e8d4f235e3d3d334181448e87c417f374e83",
+        "pub2": "8348c2d35549098706e5bab7966d9a9c72fbf6554e918f41c2b6cb275f79ec13",
+        "sharedKey": "8673ec68393a997bfad7eab8661461daf8b3931b7e885d78312a3fb7fe17f41a",
+        "salt": "daaea5ca345b268e5b62060ca72c870c48f713bc1e00ff3fc0ddb78e826f10db",
+        "plaintext": "n o s t r",
+        "ciphertext": "Atqupco0WyaOW2IGDKcshwxI9xO8HgD/P8Ddt46CbxDbOsrsqIEybscEwg5rnI/Cx03mDSmeweOLKD,7dw5BDZQDxXSlCwX1LIcTJEZaJPTz98Ftu0zSE0d93ED7OtdlvNeZx",
+        "note": "invalid base64"
+      },
+      {
+        "sec1": "5a2f39347fed3883c9fe05868a8f6156a292c45f606bc610495fcc020ed158f7",
+        "pub2": "775bbfeba58d07f9d1fbb862e306ac780f39e5418043dadb547c7b5900245e71",
+        "sharedKey": "2e70c0a1cde884b88392458ca86148d859b273a5695ede5bbe41f731d7d88ffd",
+        "salt": "09ff97750b084012e15ecb84614ce88180d7b8ec0d468508a86b6d70c0361a25",
+        "plaintext": "¯\\_(ツ)_/¯",
+        "ciphertext": "Agn/l3ULCEAS4V7LhGFM6IGA17jsDUaFCKhrbXDANholdUejFZPARM22IvOqp1U/UmFSkeSyTBYbbwy5ykmi+mKiER/Pr3IhMJbShCKkP4ytxzWxEndwVjRV+ZgzmeGNL7Dy",
+        "note": "invalid mac 1"
+      },
+      {
+        "sec1": "067eda13c4a36090ad28a7a183e9df611186ca01f63cb30fcdfa615ebfd6fb6d",
+        "pub2": "32c1ece2c5dd2160ad03b243f50eff12db605b86ac92da47eacc78144bf0cdd3",
+        "sharedKey": "a808915e31afc5b853d654d2519632dac7298ee2ecddc11695b8eba925935c2a",
+        "salt": "65b14b0b949aaa7d52c417eb753b390e8ad6d84b23af4bec6d9bfa3e03a08af4",
+        "plaintext": "🥎",
+        "ciphertext": "AmWxSwuUmqp9UsQX63U7OQ6K1thLI69L7G2b+j4DoIr0U0P/M1/oKm95z8qz6Kg0zQawLzwk3DskvWA2drXP4zK+t0BULZ9vhTDlmL8rsvBozBsvQwFPqd63PRRS4zrFvgwh",
+        "note": "invalid mac 2"
+      },
+      {
+        "sec1": "3e7be560fb9f8c965c48953dbd00411d48577e200cf00d7cc427e49d0e8d9c01",
+        "pub2": "e539e5fee58a337307e2a937ee9a7561b45876fb5df405c5e7be3ee564b239cc",
+        "sharedKey": "6ee3efc4255e3b8270e5dd3f7dc7f6b60878cda6218c8df34a3261cd48744931",
+        "salt": "7ab65dbb8bbc2b8e35cafb5745314e1f050325a864d11d0475ef75b3660d91c1",
+        "plaintext": "elliptic-curve cryptography",
+        "ciphertext": "Anq2XbuLvCuONcr7V0UxTh8FAyWoZNEdBHXvdbNmDZHBu7F9m36yBd58mVUBB5ktBTOJREDaQT1KAyPmZidP+IRea1lNw5YAEK7+pbnpfCw8CD0i2n8Pf2IDWlKDhLiVvatw",
+        "note": "padding invalid: u16 length is 0"
+      },
+      {
+        "sec1": "c22e1d4de967aa39dc143354d8f596cec1d7c912c3140831fff2976ce3e387c1",
+        "pub2": "4e405be192677a2da95ffc733950777213bf880cf7c3b084eeb6f3fe5bd43705",
+        "sharedKey": "1675a773dbf6fbcbef6a293004a4504b6c856978be738b10584b0269d437c8d1",
+        "salt": "7d4283e3b54c885d6afee881f48e62f0a3f5d7a9e1cb71ccab594a7882c39330",
+        "plaintext": "Peer-to-Peer",
+        "ciphertext": "An1Cg+O1TIhdav7ogfSOYvCj9dep4ctxzKtZSniCw5MwhT0hvSnF9Xjp9Lml792qtNbmAVvR6laukTe9eYEjeWPpZFxtkVpYTbbL9wDKFeplDMKsUKVa+roSeSvv0ela9seDVl2Sfso=",
+        "note": "invalid padding: 5 extra zeros"
+      },
+      {
+        "sec1": "be1edab14c5912e5c59084f197f0945242e969c363096cccb59af8898815096f",
+        "pub2": "9eaf0775d971e4941c97189232542e1daefcdb7dddafc39bcea2520217710ba2",
+        "sharedKey": "1741a44c052d5ae363c7845441f73d2b6c28d9bfb3006190012bba12eb4c774b",
+        "salt": "6f9fd72667c273acd23ca6653711a708434474dd9eb15c3edb01ce9a95743e9b",
+        "plaintext": "censorship-resistant and global social network",
+        "ciphertext": "Am+f1yZnwnOs0jymZTcRpwhDRHTdnrFcPtsBzpqVdD6bL9HUMo3Mjkz4bjQo/FJF2LWHmaCr9Byc3hU9D7we+EkNBWenBHasT1G52fZk9r3NKeOC1hLezNwBLr7XXiULh+NbMBDtJh9/aQh1uZ9EpAfeISOzbZXwYwf0P5M85g9XER8hZ2fgJDLb4qMOuQRG6CrPezhr357nS3UHwPC2qHo3uKACxhE+2td+965yDcvMTx4KYTQg1zNhd7PA5v/WPnWeq2B623yLxlevUuo/OvXplFho3QVy7s5QZVop6qV2g2/l/SIsvD0HIcv3V35sywOCBR0K4VHgduFqkx/LEF3NGgAbjONXQHX8ZKushsEeR4TxlFoRSovAyYjhWolz+Ok3KJL2Ertds3H+M/Bdl2WnZGT0IbjZjn3DS+b1Ke0R0X4Onww2ZG3+7o6ncIwTc+lh1O7YQn00V0HJ+EIp03heKV2zWdVSC615By/+Yt9KAiV56n5+02GAuNqA",
+        "note": "invalid padding: 250 extra zeros"
+      }
+    ],
+    "invalid_conversation_key": [
+      {
+        "sec1": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "pub2": "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
+        "plaintext": "a",
+        "note": "sec1 higher than curve.n"
+      },
+      {
+        "sec1": "0000000000000000000000000000000000000000000000000000000000000000",
+        "pub2": "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
+        "plaintext": "a",
+        "note": "sec1 is 0"
+      },
+      {
+        "sec1": "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364139",
+        "pub2": "ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
+        "plaintext": "a",
+        "note": "pub2 is invalid, no sqrt, all-ff"
+      },
+      {
+        "sec1": "fffffffffffffffffffffffffffffffebaaedce6af48a03bbfd25e8cd0364141",
+        "pub2": "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
+        "plaintext": "a",
+        "note": "sec1 == curve.n"
+      },
+      {
+        "sec1": "0000000000000000000000000000000000000000000000000000000000000002",
+        "pub2": "1234567890abcdef1234567890abcdef1234567890abcdef1234567890abcdef",
+        "plaintext": "a",
+        "note": "pub2 is invalid, no sqrt"
+      }
+    ],
+    "padding": [
+      [16, 32],
+      [32, 32],
+      [33, 64],
+      [37, 64],
+      [45, 64],
+      [49, 64],
+      [64, 64],
+      [65, 96],
+      [100, 128],
+      [111, 128],
+      [200, 224],
+      [250, 256],
+      [320, 320],
+      [383, 384],
+      [384, 384],
+      [400, 448],
+      [500, 512],
+      [512, 512],
+      [515, 640],
+      [700, 768],
+      [800, 896],
+      [900, 1024],
+      [1020, 1024],
+      [74123, 81920]
+    ]
+  }
+}
\ No newline at end of file
diff --git a/package.json b/package.json
index e117217..2670b4f 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "license": "Unlicense",
   "dependencies": {
-    "@noble/ciphers": "^0.2.0",
+    "@noble/ciphers": "0.2.0",
     "@noble/curves": "1.1.0",
     "@noble/hashes": "1.3.1",
     "@scure/base": "1.1.1",
diff --git a/tsconfig.json b/tsconfig.json
index e377c72..1a01ade 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -9,6 +9,7 @@
     "skipLibCheck": true,
     "esModuleInterop": true,
     "emitDeclarationOnly": true,
+    "resolveJsonModule": true,
     "outDir": "lib",
     "rootDir": ".",
     "allowImportingTsExtensions": true