@@ -93,7 +93,7 @@ class EncryptionService {
9393
9494 const keyMaterial = await crypto . subtle . importKey (
9595 'raw' ,
96- securePassword . getBytes ( ) ,
96+ securePassword . getBytes ( ) . buffer as ArrayBuffer ,
9797 { name : 'PBKDF2' } ,
9898 false ,
9999 [ 'deriveKey' ]
@@ -102,7 +102,7 @@ class EncryptionService {
102102 const key = await crypto . subtle . deriveKey (
103103 {
104104 name : 'PBKDF2' ,
105- salt : userSalt ,
105+ salt : userSalt . buffer as ArrayBuffer ,
106106 iterations : ENCRYPTION_CONFIG . ITERATIONS ,
107107 hash : 'SHA-256' ,
108108 } ,
@@ -157,7 +157,7 @@ class EncryptionService {
157157
158158 const keyMaterial = await crypto . subtle . importKey (
159159 'raw' ,
160- securePassword . getBytes ( ) ,
160+ securePassword . getBytes ( ) . buffer as ArrayBuffer ,
161161 { name : 'PBKDF2' } ,
162162 false ,
163163 [ 'deriveKey' ]
@@ -166,7 +166,7 @@ class EncryptionService {
166166 const key = await crypto . subtle . deriveKey (
167167 {
168168 name : 'PBKDF2' ,
169- salt : userSalt ,
169+ salt : userSalt . buffer as ArrayBuffer ,
170170 iterations : ENCRYPTION_CONFIG . ITERATIONS ,
171171 hash : 'SHA-256' ,
172172 } ,
@@ -192,7 +192,7 @@ class EncryptionService {
192192 const encryptedData = this . base64ToArrayBuffer ( testObj . data ) ;
193193
194194 await crypto . subtle . decrypt (
195- { name : ENCRYPTION_CONFIG . ALGORITHM , iv } ,
195+ { name : ENCRYPTION_CONFIG . ALGORITHM , iv : iv . buffer as ArrayBuffer } ,
196196 key ,
197197 encryptedData
198198 ) ;
@@ -281,7 +281,7 @@ class EncryptionService {
281281 const keyData = this . base64ToUint8Array ( userSecret ) ;
282282 return crypto . subtle . importKey (
283283 'raw' ,
284- keyData ,
284+ keyData . buffer as ArrayBuffer ,
285285 { name : ENCRYPTION_CONFIG . ALGORITHM } ,
286286 false ,
287287 [ 'encrypt' , 'decrypt' ]
@@ -301,7 +301,7 @@ class EncryptionService {
301301 return crypto . subtle . deriveKey (
302302 {
303303 name : 'PBKDF2' ,
304- salt,
304+ salt : salt . buffer as ArrayBuffer ,
305305 iterations : ENCRYPTION_CONFIG . ITERATIONS ,
306306 hash : 'SHA-256' ,
307307 } ,
@@ -421,13 +421,13 @@ class EncryptionService {
421421 const contentBuffer = this . base64ToArrayBuffer ( encryptedContent ) ;
422422
423423 const decryptedTitleBuffer = await crypto . subtle . decrypt (
424- { name : ENCRYPTION_CONFIG . ALGORITHM , iv } ,
424+ { name : ENCRYPTION_CONFIG . ALGORITHM , iv : iv . buffer as ArrayBuffer } ,
425425 key ,
426426 titleBuffer
427427 ) ;
428428
429429 const decryptedContentBuffer = await crypto . subtle . decrypt (
430- { name : ENCRYPTION_CONFIG . ALGORITHM , iv } ,
430+ { name : ENCRYPTION_CONFIG . ALGORITHM , iv : iv . buffer as ArrayBuffer } ,
431431 key ,
432432 contentBuffer
433433 ) ;
@@ -496,7 +496,7 @@ class EncryptionService {
496496 return bytes . buffer . slice (
497497 bytes . byteOffset ,
498498 bytes . byteOffset + bytes . byteLength
499- ) ;
499+ ) as ArrayBuffer ;
500500 }
501501
502502 private base64ToUint8Array ( base64 : string ) : Uint8Array {
0 commit comments