Merge origin/master into maven-deploy

ic0ns · ic0ns · commit 348338600c4c · 2017-11-06T17:31:55.000+01:00
Conflicts:
	TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/extension/AlpnExtensionMessage.java
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/Config.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/config/Config.java
@@ -284,9 +284,9 @@ public static Config mergeWithDefaultValues(Config c) {
     private byte[] certificateStatusRequestExtensionRequestExtension = new byte[0];
 
     /**
-     * Default ALPN announced protocols It's HTTP/2 0x68 0x32 as of RFC7540
+     * Default ALPN announced protocols
      */
-    private String applicationLayerProtocolNegotiationAnnouncedProtocols = "h2";
+    private String[] alpnAnnouncedProtocols = new String[] { "h2" };
 
     @XmlJavaTypeAdapter(ByteArrayAdapter.class)
     private byte[] sessionId = new byte[0];
@@ -2049,13 +2049,12 @@ public void setCertificateStatusRequestExtensionRequestExtension(
         this.certificateStatusRequestExtensionRequestExtension = certificateStatusRequestExtensionRequestExtension;
     }
 
-    public String getApplicationLayerProtocolNegotiationAnnouncedProtocols() {
-        return applicationLayerProtocolNegotiationAnnouncedProtocols;
+    public String[] getAlpnAnnouncedProtocols() {
+        return alpnAnnouncedProtocols;
     }
 
-    public void setApplicationLayerProtocolNegotiationAnnouncedProtocols(
-            String applicationLayerProtocolNegotiationAnnouncedProtocols) {
-        this.applicationLayerProtocolNegotiationAnnouncedProtocols = applicationLayerProtocolNegotiationAnnouncedProtocols;
+    public void setAlpnAnnouncedProtocols(String[] alpnAnnouncedProtocols) {
+        this.alpnAnnouncedProtocols = alpnAnnouncedProtocols;
     }
 
     public byte[] getSessionId() {
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/constants/ExtensionByteLength.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/constants/ExtensionByteLength.java
@@ -110,6 +110,8 @@ public class ExtensionByteLength {
      */
     public static final int ALPN_EXTENSION_LENGTH = 2;
 
+    public static final int ALPN_ENTRY_LENGTH = 1;
+
     /**
      * Length of the SRP extension identifier length field
      */
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/ClientHelloMessage.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/ClientHelloMessage.java
@@ -149,7 +149,7 @@ public ClientHelloMessage(Config tlsConfig) {
             addExtension(new CertificateStatusRequestExtensionMessage());
         }
         if (tlsConfig.isAddAlpnExtension()) {
-            addExtension(new AlpnExtensionMessage());
+            addExtension(new AlpnExtensionMessage(tlsConfig));
         }
         if (tlsConfig.isAddSRPExtension()) {
             addExtension(new SRPExtensionMessage());
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/ServerHelloMessage.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/ServerHelloMessage.java
@@ -108,7 +108,7 @@ public ServerHelloMessage(Config tlsConfig) {
             addExtension(new CertificateStatusRequestExtensionMessage());
         }
         if (tlsConfig.isAddAlpnExtension()) {
-            addExtension(new AlpnExtensionMessage());
+            addExtension(new AlpnExtensionMessage(tlsConfig));
         }
         if (tlsConfig.isAddSRPExtension()) {
             addExtension(new SRPExtensionMessage());
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/extension/Alpn/AlpnEntry.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/extension/Alpn/AlpnEntry.java
@@ -0,0 +1,67 @@
+/**
+ * TLS-Attacker - A Modular Penetration Testing Framework for TLS
+ *
+ * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ *
+ * Licensed under Apache License 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package de.rub.nds.tlsattacker.core.protocol.message.extension.Alpn;
+
+import de.rub.nds.modifiablevariable.ModifiableVariableFactory;
+import de.rub.nds.modifiablevariable.bytearray.ModifiableByteArray;
+import de.rub.nds.modifiablevariable.integer.ModifiableInteger;
+import de.rub.nds.tlsattacker.core.protocol.ModifiableVariableHolder;
+import java.io.Serializable;
+
+/**
+ *
+ * @author Robert Merget <robert.merget@rub.de>
+ */
+public class AlpnEntry extends ModifiableVariableHolder implements Serializable {
+
+    private ModifiableInteger alpnEntryLength;
+
+    private ModifiableByteArray alpnEntryBytes;
+
+    private byte[] alpnEntryConfig;
+
+    public AlpnEntry() {
+    }
+
+    public AlpnEntry(byte[] alpnEntryConfig) {
+        this.alpnEntryConfig = alpnEntryConfig;
+    }
+
+    public ModifiableInteger getAlpnEntryLength() {
+        return alpnEntryLength;
+    }
+
+    public void setAlpnEntryLength(ModifiableInteger alpnEntryLength) {
+        this.alpnEntryLength = alpnEntryLength;
+    }
+
+    public void setAlpnEntryLength(int alpnEntryLength) {
+        this.alpnEntryLength = ModifiableVariableFactory.safelySetValue(this.alpnEntryLength, alpnEntryLength);
+    }
+
+    public ModifiableByteArray getAlpnEntryBytes() {
+        return alpnEntryBytes;
+    }
+
+    public void setAlpnEntryBytes(ModifiableByteArray alpnEntryBytes) {
+        this.alpnEntryBytes = alpnEntryBytes;
+    }
+
+    public void setAlpnEntryBytes(byte[] alpnEntryBytes) {
+        this.alpnEntryBytes = ModifiableVariableFactory.safelySetValue(this.alpnEntryBytes, alpnEntryBytes);
+    }
+
+    public byte[] getAlpnEntryConfig() {
+        return alpnEntryConfig;
+    }
+
+    public void setAlpnEntryConfig(byte[] alpnEntryConfig) {
+        this.alpnEntryConfig = alpnEntryConfig;
+    }
+}
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/extension/AlpnExtensionMessage.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/message/extension/AlpnExtensionMessage.java
@@ -8,11 +8,16 @@
  */
 package de.rub.nds.tlsattacker.core.protocol.message.extension;
 
+import de.rub.nds.modifiablevariable.HoldsModifiableVariable;
 import de.rub.nds.modifiablevariable.ModifiableVariableFactory;
 import de.rub.nds.modifiablevariable.ModifiableVariableProperty;
 import de.rub.nds.modifiablevariable.bytearray.ModifiableByteArray;
 import de.rub.nds.modifiablevariable.integer.ModifiableInteger;
+import de.rub.nds.tlsattacker.core.config.Config;
 import de.rub.nds.tlsattacker.core.constants.ExtensionType;
+import de.rub.nds.tlsattacker.core.protocol.message.extension.Alpn.AlpnEntry;
+import java.util.LinkedList;
+import java.util.List;
 
 /**
  * This extension is defined in RFC7301
@@ -24,8 +29,28 @@ public class AlpnExtensionMessage extends ExtensionMessage {
     @ModifiableVariableProperty
     private ModifiableByteArray alpnAnnouncedProtocols;
 
+    @HoldsModifiableVariable
+    private List<AlpnEntry> alpnEntryList;
+
     public AlpnExtensionMessage() {
         super(ExtensionType.ALPN);
+        alpnEntryList = new LinkedList<>();
+    }
+
+    public AlpnExtensionMessage(Config config) {
+        super(ExtensionType.ALPN);
+        alpnEntryList = new LinkedList<>();
+        for (String string : config.getAlpnAnnouncedProtocols()) {
+            alpnEntryList.add(new AlpnEntry(string.getBytes()));
+        }
+    }
+
+    public List<AlpnEntry> getAlpnEntryList() {
+        return alpnEntryList;
+    }
+
+    public void setAlpnEntryList(List<AlpnEntry> alpnEntryList) {
+        this.alpnEntryList = alpnEntryList;
     }
 
     public ModifiableInteger getAlpnExtensionLength() {
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/parser/extension/AlpnExtensionParser.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/parser/extension/AlpnExtensionParser.java
@@ -9,7 +9,11 @@
 package de.rub.nds.tlsattacker.core.protocol.parser.extension;
 
 import de.rub.nds.tlsattacker.core.constants.ExtensionByteLength;
+import de.rub.nds.tlsattacker.core.protocol.message.extension.Alpn.AlpnEntry;
 import de.rub.nds.tlsattacker.core.protocol.message.extension.AlpnExtensionMessage;
+import de.rub.nds.tlsattacker.core.protocol.parser.extension.alpn.AlpnEntryParser;
+import java.util.LinkedList;
+import java.util.List;
 
 public class AlpnExtensionParser extends ExtensionParser<AlpnExtensionMessage> {
 
@@ -20,7 +24,16 @@ public AlpnExtensionParser(int startposition, byte[] array) {
     @Override
     public void parseExtensionMessageContent(AlpnExtensionMessage msg) {
         msg.setAlpnExtensionLength(parseIntField(ExtensionByteLength.ALPN_EXTENSION_LENGTH));
-        msg.setAlpnAnnouncedProtocols(parseByteArrayField(msg.getAlpnExtensionLength().getValue()));
+        byte[] anouncedProtocols = parseByteArrayField(msg.getAlpnExtensionLength().getValue());
+        msg.setAlpnAnnouncedProtocols(anouncedProtocols);
+        List<AlpnEntry> entryList = new LinkedList<>();
+        int pointer = 0;
+        while (pointer < anouncedProtocols.length) {
+            AlpnEntryParser parser = new AlpnEntryParser(pointer, anouncedProtocols);
+            entryList.add(parser.parse());
+            pointer = parser.getPointer();
+        }
+        msg.setAlpnEntryList(entryList);
     }
 
     @Override
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/parser/extension/alpn/AlpnEntryParser.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/parser/extension/alpn/AlpnEntryParser.java
@@ -0,0 +1,33 @@
+/**
+ * TLS-Attacker - A Modular Penetration Testing Framework for TLS
+ *
+ * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ *
+ * Licensed under Apache License 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package de.rub.nds.tlsattacker.core.protocol.parser.extension.alpn;
+
+import de.rub.nds.tlsattacker.core.constants.ExtensionByteLength;
+import de.rub.nds.tlsattacker.core.protocol.message.extension.Alpn.AlpnEntry;
+import de.rub.nds.tlsattacker.core.protocol.parser.Parser;
+
+/**
+ *
+ * @author Robert Merget <robert.merget@rub.de>
+ */
+public class AlpnEntryParser extends Parser<AlpnEntry> {
+
+    public AlpnEntryParser(int startposition, byte[] array) {
+        super(startposition, array);
+    }
+
+    @Override
+    public AlpnEntry parse() {
+        AlpnEntry entry = new AlpnEntry();
+        entry.setAlpnEntryLength(parseIntField(ExtensionByteLength.ALPN_ENTRY_LENGTH));
+        entry.setAlpnEntryBytes(parseByteArrayField(entry.getAlpnEntryLength().getValue()));
+        return entry;
+    }
+
+}
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/extension/AlpnExtensionPreparator.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/extension/AlpnExtensionPreparator.java
@@ -9,9 +9,14 @@
 package de.rub.nds.tlsattacker.core.protocol.preparator.extension;
 
 import de.rub.nds.modifiablevariable.util.ArrayConverter;
+import de.rub.nds.tlsattacker.core.protocol.message.extension.Alpn.AlpnEntry;
 import de.rub.nds.tlsattacker.core.protocol.message.extension.AlpnExtensionMessage;
+import de.rub.nds.tlsattacker.core.protocol.preparator.extension.alpn.AlpnEntryPreparator;
 import de.rub.nds.tlsattacker.core.protocol.serializer.extension.ExtensionSerializer;
+import de.rub.nds.tlsattacker.core.protocol.serializer.extension.alpn.AlpnEntrySerializer;
 import de.rub.nds.tlsattacker.core.workflow.chooser.Chooser;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
 
 public class AlpnExtensionPreparator extends ExtensionPreparator<AlpnExtensionMessage> {
 
@@ -25,8 +30,18 @@ public AlpnExtensionPreparator(Chooser chooser, AlpnExtensionMessage message,
 
     @Override
     public void prepareExtensionContent() {
-        msg.setAlpnAnnouncedProtocols(chooser.getConfig().getApplicationLayerProtocolNegotiationAnnouncedProtocols()
-                .getBytes());
+        ByteArrayOutputStream stream = new ByteArrayOutputStream();
+        for (AlpnEntry entry : msg.getAlpnEntryList()) {
+            AlpnEntryPreparator preparator = new AlpnEntryPreparator(chooser, entry);
+            preparator.prepare();
+            AlpnEntrySerializer serializer = new AlpnEntrySerializer(entry);
+            try {
+                stream.write(serializer.serialize());
+            } catch (IOException ex) {
+                LOGGER.warn("Could not serialize AlpnEntry");
+            }
+        }
+        msg.setAlpnAnnouncedProtocols(stream.toByteArray());
         LOGGER.debug("Prepared the ALPN Extension with announced protocols "
                 + ArrayConverter.bytesToHexString(msg.getAlpnAnnouncedProtocols()));
         msg.setAlpnExtensionLength(msg.getAlpnAnnouncedProtocols().getValue().length);
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/extension/alpn/AlpnEntryPreparator.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/preparator/extension/alpn/AlpnEntryPreparator.java
@@ -0,0 +1,34 @@
+/**
+ * TLS-Attacker - A Modular Penetration Testing Framework for TLS
+ *
+ * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ *
+ * Licensed under Apache License 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package de.rub.nds.tlsattacker.core.protocol.preparator.extension.alpn;
+
+import de.rub.nds.tlsattacker.core.protocol.message.extension.Alpn.AlpnEntry;
+import de.rub.nds.tlsattacker.core.protocol.preparator.Preparator;
+import de.rub.nds.tlsattacker.core.workflow.chooser.Chooser;
+
+/**
+ *
+ * @author Robert Merget <robert.merget@rub.de>
+ */
+public class AlpnEntryPreparator extends Preparator<AlpnEntry> {
+
+    private final AlpnEntry entry;
+
+    public AlpnEntryPreparator(Chooser chooser, AlpnEntry entry) {
+        super(chooser, entry);
+        this.entry = entry;
+    }
+
+    @Override
+    public void prepare() {
+        entry.setAlpnEntryBytes(entry.getAlpnEntryConfig());
+        entry.setAlpnEntryLength(entry.getAlpnEntryBytes().getValue().length);
+    }
+
+}
diff --git a/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/serializer/extension/alpn/AlpnEntrySerializer.java b/TLS-Core/src/main/java/de/rub/nds/tlsattacker/core/protocol/serializer/extension/alpn/AlpnEntrySerializer.java
@@ -0,0 +1,34 @@
+/**
+ * TLS-Attacker - A Modular Penetration Testing Framework for TLS
+ *
+ * Copyright 2014-2017 Ruhr University Bochum / Hackmanit GmbH
+ *
+ * Licensed under Apache License 2.0
+ * http://www.apache.org/licenses/LICENSE-2.0
+ */
+package de.rub.nds.tlsattacker.core.protocol.serializer.extension.alpn;
+
+import de.rub.nds.tlsattacker.core.constants.ExtensionByteLength;
+import de.rub.nds.tlsattacker.core.protocol.message.extension.Alpn.AlpnEntry;
+import de.rub.nds.tlsattacker.core.protocol.serializer.Serializer;
+
+/**
+ *
+ * @author Robert Merget <robert.merget@rub.de>
+ */
+public class AlpnEntrySerializer extends Serializer<AlpnEntry> {
+
+    private final AlpnEntry entry;
+
+    public AlpnEntrySerializer(AlpnEntry entry) {
+        this.entry = entry;
+    }
+
+    @Override
+    protected byte[] serializeBytes() {
+        appendInt(entry.getAlpnEntryLength().getValue(), ExtensionByteLength.ALPN_ENTRY_LENGTH);
+        appendBytes(entry.getAlpnEntryBytes().getValue());
+        return getAlreadySerialized();
+    }
+
+}
diff --git a/TLS-Core/src/main/resources/default_config.xml b/TLS-Core/src/main/resources/default_config.xml
@@ -125,7 +125,6 @@
     <defaultServerSupportedCiphersuites>TLS_RSA_WITH_RC4_128_SHA</defaultServerSupportedCiphersuites>
     <defaultServerSupportedCiphersuites>TLS_ECDHE_RSA_WITH_RC4_128_SHA</defaultServerSupportedCiphersuites>
     <defaultServerSupportedCiphersuites>TLS_DHE_DSS_WITH_RC4_128_SHA</defaultServerSupportedCiphersuites>
-    <useAllProvidedRecords>false</useAllProvidedRecords>
     <dynamicWorkflow>false</dynamicWorkflow>
     <namedCurves>SECP192R1</namedCurves>
     <namedCurves>SECP256R1</namedCurves>
@@ -162,7 +161,7 @@
     <certificateStatusRequestExtensionRequestType>OCSP</certificateStatusRequestExtensionRequestType>
     <certificateStatusRequestExtensionResponderIDList></certificateStatusRequestExtensionResponderIDList>
     <certificateStatusRequestExtensionRequestExtension></certificateStatusRequestExtensionRequestExtension>
-    <applicationLayerProtocolNegotiationAnnouncedProtocols>h2</applicationLayerProtocolNegotiationAnnouncedProtocols>
+    <alpnAnnouncedProtocols>h2</alpnAnnouncedProtocols>
     <sessionId></sessionId>
     <secureRemotePasswordExtensionIdentifier></secureRemotePasswordExtensionIdentifier>
     <secureRealTimeTransportProtocolProtectionProfiles>SRTP_AES128_CM_HMAC_SHA1_80</secureRealTimeTransportProtocolProtectionProfiles>
@@ -445,18 +444,19 @@ EE 70 2A 05 B5 48 C5 F5  FC 2D E3 84 2B 63 66 A0
     <defaultClientRSAPublicKey>65537</defaultClientRSAPublicKey>
     <defaultServerRSAPrivateKey>15874858421354831201422373086128612745111153124913833804748747602178280564406425154617488927847142136837462790351481317765255581632968169400556456985418488827925888221598273953686611745401672309465708043217648197631331184971921491765473252248751361737713587292004390571935209364268173007740802648762007661253254661694353602685239350183219876383969245059520622897526828073822681994419744648185400986499062312630392385618231497966730037670361639244062483305891646041343885072158127929403028249239589737831073084456798375448844113695963693837622356344855176327289719518978665114515326513514352049909912072269175924872321</defaultServerRSAPrivateKey>
     <defaultClientRSAPrivateKey>15874858421354831201422373086128612745111153124913833804748747602178280564406425154617488927847142136837462790351481317765255581632968169400556456985418488827925888221598273953686611745401672309465708043217648197631331184971921491765473252248751361737713587292004390571935209364268173007740802648762007661253254661694353602685239350183219876383969245059520622897526828073822681994419744648185400986499062312630392385618231497966730037670361639244062483305891646041343885072158127929403028249239589737831073084456798375448844113695963693837622356344855176327289719518978665114515326513514352049909912072269175924872321</defaultClientRSAPrivateKey>
-    <defaultPSKKey>1a2b3c4d</defaultPSKKey>
-    <defaultPSKIdentity>436c69656e745f6964656e74697479</defaultPSKIdentity>
+    <defaultPSKKey>1A 2B 3C 4D</defaultPSKKey>
+    <defaultPSKIdentity>43 6C 69 65 6E 74 5F 69 64 65 6E 74 69 74 79</defaultPSKIdentity>
     <defaultClientHandshakeTrafficSecret></defaultClientHandshakeTrafficSecret>
     <defaultServerHandshakeTrafficSecret></defaultServerHandshakeTrafficSecret>
+    <defaultClientApplicationTrafficSecret></defaultClientApplicationTrafficSecret>
+    <defaultServerApplicationTrafficSecret></defaultServerApplicationTrafficSecret>
     <defaultTokenBindingType>PROVIDED_TOKEN_BINDING</defaultTokenBindingType>
     <defaultTokenBindingRsaPublicKey>65537</defaultTokenBindingRsaPublicKey>
     <defaultTokenBindingRsaPrivateKey>89489425009274444368228545921773093919669586065884257445497854456487674839629818390934941973262879616797970608917283679875499331574161113854088813275488110588247193077582527278437906504015680623423550067240042466665654232383502922215493623289472138866445818789127946123407807725702626644091036502372545139713</defaultTokenBindingRsaPrivateKey>
     <defaultTokenBindingEcPrivateKey>3</defaultTokenBindingEcPrivateKey>
     <defaultTokenBindingRsaModulus>145906768007583323230186939349070635292401872375357164399581871019873438799005358938369571402670149802121818086292467422828157022922076746906543401224889672472407926969987100581290103199317858753663710862357656510507883714297115637342788911463535102712032765166518411726859837988672111837205085526346618740053</defaultTokenBindingRsaModulus>
     <useRandomUnixTime>true</useRandomUnixTime>
     <chooserType>DEFAULT</chooserType>
-    <defaultServerApplicationTrafficSecret></defaultServerApplicationTrafficSecret>
-    <defaultClientApplicationTrafficSecret></defaultClientApplicationTrafficSecret>
-    
+    <useAllProvidedRecords>false</useAllProvidedRecords>
+    <httpsParsingEnabled>false</httpsParsingEnabled>
 </config>
diff --git a/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/protocol/preparator/extension/AlpnExtensionPreparatorTest.java b/TLS-Core/src/test/java/de/rub/nds/tlsattacker/core/protocol/preparator/extension/AlpnExtensionPreparatorTest.java

Original file line number	Diff line number	Diff line change
`@@ -149,7 +149,7 @@ public ClientHelloMessage(Config tlsConfig) {`
`149`	`149`	`addExtension(new CertificateStatusRequestExtensionMessage());`
`150`	`150`	`}`
`151`	`151`	`if (tlsConfig.isAddAlpnExtension()) {`
`152`		`- addExtension(new AlpnExtensionMessage());`
	`152`	`+ addExtension(new AlpnExtensionMessage(tlsConfig));`
`153`	`153`	`}`
`154`	`154`	`if (tlsConfig.isAddSRPExtension()) {`
`155`	`155`	`addExtension(new SRPExtensionMessage());`
Original file line number	Diff line number	Diff line change
`@@ -108,7 +108,7 @@ public ServerHelloMessage(Config tlsConfig) {`
`108`	`108`	`addExtension(new CertificateStatusRequestExtensionMessage());`
`109`	`109`	`}`
`110`	`110`	`if (tlsConfig.isAddAlpnExtension()) {`
`111`		`- addExtension(new AlpnExtensionMessage());`
	`111`	`+ addExtension(new AlpnExtensionMessage(tlsConfig));`
`112`	`112`	`}`
`113`	`113`	`if (tlsConfig.isAddSRPExtension()) {`
`114`	`114`	`addExtension(new SRPExtensionMessage());`