Skip to content

Commit 3b7cbff

Browse files
committed
chore: use for...of instead of forEach
1 parent 7ab1f41 commit 3b7cbff

File tree

6 files changed

+15
-23
lines changed

6 files changed

+15
-23
lines changed

packages/dtls/src/cipher/suites/aead.ts

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,9 @@ export default class AEADCipher extends Cipher {
7272

7373
const additionalBuffer = this.encodeAdditionalBuffer(header, data.length);
7474

75-
const cipher = createCipheriv(
76-
this.blockAlgorithm!,
77-
writeKey,
78-
iv,
79-
{
80-
authTagLength: this.authTagLength,
81-
},
82-
);
75+
const cipher = createCipheriv(this.blockAlgorithm!, writeKey, iv, {
76+
authTagLength: this.authTagLength,
77+
});
8378

8479
cipher.setAAD(additionalBuffer, {
8580
plaintextLength: data.length,
@@ -128,14 +123,9 @@ export default class AEADCipher extends Cipher {
128123
encrypted.length,
129124
);
130125

131-
const decipher = createDecipheriv(
132-
this.blockAlgorithm!,
133-
writeKey,
134-
iv,
135-
{
136-
authTagLength: this.authTagLength,
137-
},
138-
);
126+
const decipher = createDecipheriv(this.blockAlgorithm!, writeKey, iv, {
127+
authTagLength: this.authTagLength,
128+
});
139129

140130
decipher.setAuthTag(authTag);
141131
decipher.setAAD(additionalBuffer, {

packages/dtls/src/cipher/suites/null.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ export default class NullCipher extends Cipher {
1212
super();
1313

1414
this.name = "NULL_NULL_NULL"; // key, mac, hash
15-
this.blockAlgorithm = "NULL";
15+
this.blockAlgorithm = "NULL" as any;
1616
this.kx = createNULLKeyExchange();
1717
this.hashAlgorithm = "NULL";
1818
}

packages/dtls/src/context/cipher.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { webcrypto, createSign, randomBytes } from "crypto";
1+
import { createSign, randomBytes, webcrypto } from "crypto";
22
import { Certificate, PrivateKey } from "@fidm/x509";
33
import * as x509 from "@peculiar/x509";
44
import { encode, types } from "@shinyoshiaki/binary-data";

packages/dtls/src/flight/client/flight5.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ handlers[HandshakeType.server_hello_2] =
231231
log(dtls.sessionId, "selected cipherSuite", cipher.cipherSuite);
232232

233233
if (message.extensions) {
234-
message.extensions.forEach((extension) => {
234+
for (const extension of message.extensions) {
235235
switch (extension.type) {
236236
case UseSRTP.type:
237237
{
@@ -252,7 +252,7 @@ handlers[HandshakeType.server_hello_2] =
252252
log(dtls.sessionId, "RenegotiationIndication");
253253
break;
254254
}
255-
});
255+
}
256256
}
257257
};
258258

packages/dtls/src/flight/server/flight2.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export const flight2 =
5050
dtls.recordSequenceNumber = 0;
5151
dtls.sequenceNumber = 0;
5252

53-
clientHello.extensions.forEach((extension) => {
53+
for (const extension of clientHello.extensions) {
5454
switch (extension.type) {
5555
case EllipticCurves.type:
5656
{
@@ -118,7 +118,7 @@ export const flight2 =
118118
}
119119
break;
120120
}
121-
});
121+
}
122122

123123
cipher.localRandom = new DtlsRandom();
124124
cipher.remoteRandom = DtlsRandom.from(clientHello.random);

packages/dtls/tests/server.test.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ describe("server", () => {
2828
const fragments = hello.toFragment().chunk(10);
2929
const last = fragments.pop()!;
3030
const second = fragments.pop()!;
31-
fragments.forEach((fragment) => server.handleFragmentHandshake([fragment]));
31+
for (const fragment of fragments) {
32+
server.handleFragmentHandshake([fragment]);
33+
}
3234
expect(server.handleFragmentHandshake([last]).length).toBeGreaterThan(0);
3335
expect(server.handleFragmentHandshake([second]).length).toBe(0);
3436
});

0 commit comments

Comments
 (0)