diff options
Diffstat (limited to 'ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write')
3 files changed, 10 insertions, 2 deletions
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<Policy> 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); } diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java index 4c11f1633..f6b100c54 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/Ikev2PolicyIdentityCustomizer.java @@ -93,6 +93,7 @@ public class Ikev2PolicyIdentityCustomizer extends FutureJVppCustomizer request.idType = 5; request.data = ipv6AddressNoZoneToArray(((Ipv6Address) identityData).getIpv6Address()); } + request.dataLen = request.data.length; } @Override diff --git a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java index d7bbee32d..c29137d26 100644 --- a/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java +++ b/ipsec/ipsec-impl/src/main/java/io/fd/hc2vpp/ipsec/write/IpsecSadEntryCustomizer.java @@ -153,6 +153,7 @@ public class IpsecSadEntryCustomizer extends FutureJVppCustomizer return; } targetEntry.integrityKey = integKey.getBytes(); + targetEntry.integrityKeyLength = (byte) integKey.getBytes().length; } } @@ -174,6 +175,7 @@ public class IpsecSadEntryCustomizer extends FutureJVppCustomizer return; } targetEntry.integrityKey = integKey.getBytes(); + targetEntry.integrityKeyLength = (byte) integKey.getBytes().length; } } @@ -199,6 +201,7 @@ public class IpsecSadEntryCustomizer extends FutureJVppCustomizer return; } targetEntry.cryptoKey = cryptoKey.getBytes(); + targetEntry.cryptoKeyLength = (byte) cryptoKey.getBytes().length; } } |