Skip to content

Commit e05b7e9

Browse files
jcbrandjcbrand
committed
OMEMO fixes for Edge.
1 parent bf76b3b commit e05b7e9

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

‎CHANGES.md

+1
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
## 4.0.2 (Unreleased)
44

55
- M4A and WEBM files when sent as XEP-0066 Out of Band Data, are now playable directly in chat
6+
- OMEMO fixes for Edge.
67
- #1220 Converse not working in Edge
78

89
## 4.0.1 (2018-09-19)

‎dist/converse.js

+10-1
Original file line numberDiff line numberDiff line change
@@ -72889,11 +72889,19 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
7288972889
async encryptMessage(plaintext) {
7289072890
// The client MUST use fresh, randomly generated key/IV pairs
7289172891
// with AES-128 in Galois/Counter Mode (GCM).
72892-
const iv = crypto.getRandomValues(new window.Uint8Array(16)),
72892+
// For GCM a 12 byte IV is strongly suggested as other IV lengths
72893+
// will require additional calculations. In principle any IV size
72894+
// can be used as long as the IV doesn't ever repeat. NIST however
72895+
// suggests that only an IV size of 12 bytes needs to be supported
72896+
// by implementations.
72897+
//
72898+
// https://crypto.stackexchange.com/questions/26783/ciphertext-and-tag-size-and-iv-transmission-with-aes-in-gcm-mode
72899+
const iv = crypto.getRandomValues(new window.Uint8Array(12)),
7289372900
key = await crypto.subtle.generateKey(KEY_ALGO, true, ["encrypt", "decrypt"]),
7289472901
algo = {
7289572902
'name': 'AES-GCM',
7289672903
'iv': iv,
72904+
'additionalData': new Uint8Array(1),
7289772905
'tagLength': TAG_LENGTH
7289872906
},
7289972907
encrypted = await crypto.subtle.encrypt(algo, key, u.stringToArrayBuffer(plaintext)),
@@ -72916,6 +72924,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_ARRAY__, __WEBPACK_AMD_
7291672924
algo = {
7291772925
'name': "AES-GCM",
7291872926
'iv': u.base64ToArrayBuffer(obj.iv),
72927+
'additionalData': new Uint8Array(1),
7291972928
'tagLength': TAG_LENGTH
7292072929
};
7292172930
return u.arrayBufferToString((await crypto.subtle.decrypt(algo, key_obj, cipher)));

‎src/converse-omemo.js

+12-1
Original file line numberDiff line numberDiff line change
@@ -204,11 +204,21 @@
204204
async encryptMessage (plaintext) {
205205
// The client MUST use fresh, randomly generated key/IV pairs
206206
// with AES-128 in Galois/Counter Mode (GCM).
207-
const iv = crypto.getRandomValues(new window.Uint8Array(16)),
207+
208+
// For GCM a 12 byte IV is strongly suggested as other IV lengths
209+
// will require additional calculations. In principle any IV size
210+
// can be used as long as the IV doesn't ever repeat. NIST however
211+
// suggests that only an IV size of 12 bytes needs to be supported
212+
// by implementations.
213+
//
214+
// https://crypto.stackexchange.com/questions/26783/ciphertext-and-tag-size-and-iv-transmission-with-aes-in-gcm-mode
215+
216+
const iv = crypto.getRandomValues(new window.Uint8Array(12)),
208217
key = await crypto.subtle.generateKey(KEY_ALGO, true, ["encrypt", "decrypt"]),
209218
algo = {
210219
'name': 'AES-GCM',
211220
'iv': iv,
221+
'additionalData': new Uint8Array(1),
212222
'tagLength': TAG_LENGTH
213223
},
214224
encrypted = await crypto.subtle.encrypt(algo, key, u.stringToArrayBuffer(plaintext)),
@@ -232,6 +242,7 @@
232242
algo = {
233243
'name': "AES-GCM",
234244
'iv': u.base64ToArrayBuffer(obj.iv),
245+
'additionalData': new Uint8Array(1),
235246
'tagLength': TAG_LENGTH
236247
}
237248
return u.arrayBufferToString(await crypto.subtle.decrypt(algo, key_obj, cipher));

0 commit comments

Comments
 (0)