Skip to content

Commit f1ea0fe

Browse files
committed
fix: Avoid NPE when some extensions were missing
1 parent b1fa01c commit f1ea0fe

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

TLS/src/main/java/de/rub/nds/tlsattacker/tls/protocol/extension/ECPointFormatExtensionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void initializeClientHelloExtension(ECPointFormatExtensionMessage extensi
4747

4848
extension.setExtensionType(ExtensionType.EC_POINT_FORMATS.getValue());
4949
extension.setPointFormats(pointFormats);
50-
extension.setPointFormatsLength(pointFormats.length);
50+
extension.setPointFormatsLength(pointFormats != null ? pointFormats.length : 0);
5151
extension.setExtensionLength(extension.getPointFormatsLength().getValue() + EC_POINT_FORMATS_LENGTH);
5252

5353
byte[] pfExtension = ArrayConverter.concatenate(extension.getExtensionType().getValue(),

TLS/src/main/java/de/rub/nds/tlsattacker/tls/protocol/extension/EllipticCurvesExtensionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public void initializeClientHelloExtension(EllipticCurvesExtensionMessage extens
4848

4949
extension.setExtensionType(ExtensionType.ELLIPTIC_CURVES.getValue());
5050
extension.setSupportedCurves(curves);
51-
extension.setSupportedCurvesLength(curves.length);
51+
extension.setSupportedCurvesLength(curves != null ? curves.length : 0);
5252
extension.setExtensionLength(extension.getSupportedCurvesLength().getValue() + ExtensionByteLength.EXTENSIONS);
5353

5454
byte[] ecExtensionBytes = ArrayConverter.concatenate(extension.getExtensionType().getValue(), ArrayConverter

TLS/src/main/java/de/rub/nds/tlsattacker/tls/protocol/extension/SignatureAndHashAlgorithmsExtensionHandler.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public void initializeClientHelloExtension(SignatureAndHashAlgorithmsExtensionMe
4646

4747
extension.setExtensionType(ExtensionType.SIGNATURE_AND_HASH_ALGORITHMS.getValue());
4848
extension.setSignatureAndHashAlgorithms(algorithms);
49-
extension.setSignatureAndHashAlgorithmsLength(algorithms.length);
49+
extension.setSignatureAndHashAlgorithmsLength(algorithms != null ? algorithms.length : 0);
5050
extension.setExtensionLength(extension.getSignatureAndHashAlgorithmsLength().getValue()
5151
+ ExtensionByteLength.EXTENSIONS);
5252

0 commit comments

Comments
 (0)