Skip to content

Commit f80db24

Browse files
committed
Remove unused EncryptionService.decryptWithAES method
1 parent ac39c9a commit f80db24

File tree

5 files changed

+8
-44
lines changed

5 files changed

+8
-44
lines changed

packages/sdk/src/encryption/EncryptionService.ts

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -45,20 +45,6 @@ export class EncryptionService {
4545
return result.data
4646
}
4747

48-
/**
49-
* Decrypt AES-256-CTR encrypted data.
50-
* Note: The input cipher buffer is transferred to the worker and becomes unusable after this call.
51-
*/
52-
async decryptWithAES(cipher: Uint8Array, cipherKey: Uint8Array): Promise<Uint8Array> {
53-
const result = await this.getWorkerApi().decrypt(
54-
transfer({ cipher, cipherKey }, [cipher.buffer])
55-
)
56-
if (result.type === 'error') {
57-
throw new Error(`AES decryption failed: ${result.message}`)
58-
}
59-
return result.data
60-
}
61-
6248
/**
6349
* Encrypt the next group key using the current group key.
6450
*/

packages/sdk/src/encryption/EncryptionWorker.ts

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,16 @@
33
* Offloads CPU-intensive cryptographic operations to a separate thread.
44
*/
55
import { expose, transfer } from 'comlink'
6-
import { decryptWithAES, encryptWithAES } from './aesUtils'
6+
import { encryptWithAES } from './aesUtils'
77
import {
88
encryptNextGroupKey,
99
decryptNextGroupKey,
1010
decryptStreamMessageContent,
1111
AESEncryptRequest,
12-
AESDecryptRequest,
1312
EncryptGroupKeyRequest,
1413
DecryptGroupKeyRequest,
1514
DecryptStreamMessageRequest,
1615
AESEncryptResult,
17-
AESDecryptResult,
1816
EncryptGroupKeyResult,
1917
DecryptGroupKeyResult,
2018
DecryptStreamMessageResult
@@ -30,15 +28,6 @@ const workerApi = {
3028
}
3129
},
3230

33-
decrypt: async (request: AESDecryptRequest): Promise<AESDecryptResult> => {
34-
try {
35-
const result = decryptWithAES(request.cipher, request.cipherKey)
36-
return transfer({ type: 'success', data: result }, [result.buffer])
37-
} catch (err) {
38-
return { type: 'error', message: String(err) }
39-
}
40-
},
41-
4231
encryptGroupKey: async (request: EncryptGroupKeyRequest): Promise<EncryptGroupKeyResult> => {
4332
try {
4433
const result = encryptNextGroupKey(

packages/sdk/src/encryption/encryptionUtils.ts

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ export interface AESEncryptRequest {
1414
cipherKey: Uint8Array
1515
}
1616

17-
export interface AESDecryptRequest {
18-
cipher: Uint8Array
19-
cipherKey: Uint8Array
20-
}
21-
2217
export interface EncryptGroupKeyRequest {
2318
nextGroupKeyId: string
2419
nextGroupKeyData: Uint8Array
@@ -47,10 +42,6 @@ export type AESEncryptResult =
4742
| { type: 'success', data: Uint8Array }
4843
| { type: 'error', message: string }
4944

50-
export type AESDecryptResult =
51-
| { type: 'success', data: Uint8Array }
52-
| { type: 'error', message: string }
53-
5445
export type EncryptGroupKeyResult =
5546
| { type: 'success', id: string, data: Uint8Array }
5647
| { type: 'error', message: string }

packages/sdk/test/test-utils/utils.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import { GroupKeyManager } from '../../src/encryption/GroupKeyManager'
4545
import { LocalGroupKeyStore } from '../../src/encryption/LocalGroupKeyStore'
4646
import { SubscriberKeyExchange } from '../../src/encryption/SubscriberKeyExchange'
4747
import { EncryptionService } from '../../src/encryption/EncryptionService'
48-
import { encryptWithAES, decryptWithAES } from '../../src/encryption/aesUtils'
48+
import { encryptWithAES } from '../../src/encryption/aesUtils'
4949
import { encryptNextGroupKey, decryptNextGroupKey, decryptStreamMessageContent } from '../../src/encryption/encryptionUtils'
5050
import { StreamrClientEventEmitter } from '../../src/events'
5151
import { StreamMessage } from '../../src/protocol/StreamMessage'
@@ -92,9 +92,6 @@ export function createMockEncryptionService(): EncryptionService {
9292
encryptWithAES: async (data: Uint8Array, cipherKey: Uint8Array) => {
9393
return encryptWithAES(data, cipherKey)
9494
},
95-
decryptWithAES: async (cipher: Uint8Array, cipherKey: Uint8Array) => {
96-
return decryptWithAES(cipher, cipherKey)
97-
},
9895
encryptNextGroupKey: async (currentKey: GroupKey, nextKey: GroupKey) => {
9996
return encryptNextGroupKey(nextKey.id, nextKey.data, currentKey.data)
10097
},

packages/sdk/test/unit/EncryptionService.test.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ describe('EncryptionService', () => {
1818
encryptionService.destroy()
1919
})
2020

21-
describe('encryptWithAES / decryptWithAES', () => {
21+
describe('encryptWithAES', () => {
2222
it('encrypts and decrypts data correctly', async () => {
2323
const plaintextOriginal = utf8ToBinary('hello world')
2424
const key = GroupKey.generate()
@@ -32,7 +32,8 @@ describe('EncryptionService', () => {
3232
expect(ciphertext).not.toStrictEqual(plaintextOriginal)
3333
expect(ciphertext.length).toBeGreaterThan(plaintextOriginal.length)
3434

35-
const decrypted = await encryptionService.decryptWithAES(ciphertext, key.data)
35+
// Use decryptStreamMessage to verify encryption worked correctly
36+
const [decrypted] = await encryptionService.decryptStreamMessage(ciphertext, key)
3637

3738
expect(decrypted).toStrictEqual(plaintextOriginal)
3839
})
@@ -55,7 +56,7 @@ describe('EncryptionService', () => {
5556
Uint8Array.from(plaintextOriginal),
5657
key.data
5758
)
58-
const decrypted = await encryptionService.decryptWithAES(ciphertext, key.data)
59+
const [decrypted] = await encryptionService.decryptStreamMessage(ciphertext, key)
5960

6061
expect(decrypted).toStrictEqual(plaintextOriginal)
6162
})
@@ -68,7 +69,7 @@ describe('EncryptionService', () => {
6869
Uint8Array.from(plaintextOriginal),
6970
key.data
7071
)
71-
const decrypted = await encryptionService.decryptWithAES(ciphertext, key.data)
72+
const [decrypted] = await encryptionService.decryptStreamMessage(ciphertext, key)
7273

7374
expect(decrypted).toStrictEqual(plaintextOriginal)
7475
})
@@ -200,7 +201,7 @@ describe('EncryptionService', () => {
200201
Uint8Array.from(plaintext),
201202
key.data
202203
)
203-
const decrypted = await encryptionService.decryptWithAES(ciphertext, key.data)
204+
const [decrypted] = await encryptionService.decryptStreamMessage(ciphertext, key)
204205
results.push(decrypted)
205206
}
206207

0 commit comments

Comments
 (0)