From 7645a98e4c92a20d45a8a1417db498db1b075080 Mon Sep 17 00:00:00 2001 From: Tibor Král Date: Fri, 18 Jan 2019 16:54:28 +0100 Subject: Update IPSec writers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix data_len fields in api messages - Add enum for authentication types Change-Id: I266bb096488b41d4e97b6fa4c5a557b71925be77 Signed-off-by: Tibor Král --- .../main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java') diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java index 300ea6b8e..6cb37329c 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyCustomizer.java @@ -20,6 +20,7 @@ import io.fd.hc2vpp.common.translate.util.ByteDataTranslator; import io.fd.hc2vpp.common.translate.util.FutureJVppCustomizer; import io.fd.hc2vpp.common.translate.util.Ipv4Translator; import io.fd.hc2vpp.common.translate.util.JvppReplyConsumer; +import io.fd.hc2vpp.ipsec.dto.AuthMethod; import io.fd.honeycomb.translate.spi.write.ListWriterCustomizer; import io.fd.honeycomb.translate.write.WriteContext; import io.fd.honeycomb.translate.write.WriteFailedException; @@ -137,7 +138,9 @@ public class Ikev2PolicyCustomizer extends FutureJVppCustomizer Ikev2ProfileSetAuth request = new Ikev2ProfileSetAuth(); request.name = name.getBytes(); request.data = fileName.getBytes(); - request.authMethod = BYTE_TRUE; + request.dataLen = request.data.length; + request.isHex = BYTE_FALSE; + request.authMethod = AuthMethod.RSA_SIG.getValue(); getReplyForWrite(getFutureJVpp().ikev2ProfileSetAuth(request).toCompletableFuture(), id); } @@ -145,11 +148,12 @@ public class Ikev2PolicyCustomizer extends FutureJVppCustomizer final IkeGeneralPolicyProfileGrouping.PreSharedKey preSharedKey, final InstanceIdentifier id) throws WriteFailedException { final Ikev2ProfileSetAuth request = new Ikev2ProfileSetAuth(); - request.authMethod = BYTE_FALSE; + request.authMethod = AuthMethod.SHARED_KEY_MIC.getValue(); if (preSharedKey.getHexString() != null) { request.isHex = BYTE_TRUE; } request.data = preSharedKey.stringValue().getBytes(); + request.dataLen = request.data.length; request.name = name.getBytes(); getReplyForWrite(getFutureJVpp().ikev2ProfileSetAuth(request).toCompletableFuture(), id); } -- cgit 1.2.3-korg