summaryrefslogtreecommitdiff
path: root/sbin/ipsecctl/ike.c
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@cvs.openbsd.org>2006-06-13 16:13:42 +0000
committerChristian Weisgerber <naddy@cvs.openbsd.org>2006-06-13 16:13:42 +0000
commit4c50e2c4d2ab5f69d2a4c472362942a437f1d814 (patch)
treec4ea84093418e9877e396007fe50ecfed489df2d /sbin/ipsecctl/ike.c
parent561201f596cdfd7f6dc03ed84c6903b315aadbff (diff)
For IKE, allow main mode SHA2 and quick mode AESCTR transforms,
which were recently added to isakmpd. ok hshoexer@, markus@
Diffstat (limited to 'sbin/ipsecctl/ike.c')
-rw-r--r--sbin/ipsecctl/ike.c14
1 files changed, 13 insertions, 1 deletions
diff --git a/sbin/ipsecctl/ike.c b/sbin/ipsecctl/ike.c
index fa422c8604f..2346f64a782 100644
--- a/sbin/ipsecctl/ike.c
+++ b/sbin/ipsecctl/ike.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ike.c,v 1.41 2006/06/10 19:21:10 hshoexer Exp $ */
+/* $OpenBSD: ike.c,v 1.42 2006/06/13 16:13:41 naddy Exp $ */
/*
* Copyright (c) 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org>
*
@@ -209,6 +209,9 @@ ike_section_qm(struct ipsec_addr_wrap *src, struct ipsec_addr_wrap *dst,
case ENCXF_AES:
fprintf(fd, "AES");
break;
+ case ENCXF_AESCTR:
+ fprintf(fd, "AESCTR");
+ break;
case ENCXF_BLOWFISH:
fprintf(fd, "BLF");
break;
@@ -335,6 +338,15 @@ ike_section_mm(struct ipsec_addr_wrap *peer, struct ipsec_transforms *mmxfs,
case AUTHXF_HMAC_SHA1:
fprintf(fd, "SHA");
break;
+ case AUTHXF_HMAC_SHA2_256:
+ fprintf(fd, "SHA2-256");
+ break;
+ case AUTHXF_HMAC_SHA2_384:
+ fprintf(fd, "SHA2-384");
+ break;
+ case AUTHXF_HMAC_SHA2_512:
+ fprintf(fd, "SHA2-512");
+ break;
default:
warnx("illegal transform %s", mmxfs->authxf->name);
return (-1);