summaryrefslogtreecommitdiff
path: root/sbin/iked
diff options
context:
space:
mode:
authorChristian Weisgerber <naddy@cvs.openbsd.org>2015-12-02 12:44:00 +0000
committerChristian Weisgerber <naddy@cvs.openbsd.org>2015-12-02 12:44:00 +0000
commit62e621509c602e1241ab5aa91d796d395e2527d7 (patch)
tree00d309b41ef8e37ba713d20332f8631633499913 /sbin/iked
parentcfc34333f382375bdcf7db5ee0ea73ddd8171cb0 (diff)
remove unimplemented PF_KEY algorithms; ok sthen@ mpi@ mikeb@
Diffstat (limited to 'sbin/iked')
-rw-r--r--sbin/iked/pfkey.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/sbin/iked/pfkey.c b/sbin/iked/pfkey.c
index d04bbef4623..85b773a524c 100644
--- a/sbin/iked/pfkey.c
+++ b/sbin/iked/pfkey.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pfkey.c,v 1.47 2015/11/04 12:40:49 mikeb Exp $ */
+/* $OpenBSD: pfkey.c,v 1.48 2015/12/02 12:43:59 naddy Exp $ */
/*
* Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org>
@@ -69,16 +69,10 @@ struct pfkey_constmap {
};
static const struct pfkey_constmap pfkey_encr[] = {
- { SADB_X_EALG_DES_IV64, IKEV2_XFORMENCR_DES_IV64 },
{ SADB_EALG_DESCBC, IKEV2_XFORMENCR_DES },
{ SADB_EALG_3DESCBC, IKEV2_XFORMENCR_3DES },
- { SADB_X_EALG_RC5, IKEV2_XFORMENCR_RC5 },
- { SADB_X_EALG_IDEA, IKEV2_XFORMENCR_IDEA },
{ SADB_X_EALG_CAST, IKEV2_XFORMENCR_CAST },
{ SADB_X_EALG_BLF, IKEV2_XFORMENCR_BLOWFISH },
- { SADB_X_EALG_3IDEA, IKEV2_XFORMENCR_3IDEA },
- { SADB_X_EALG_DES_IV32, IKEV2_XFORMENCR_DES_IV32 },
- { SADB_X_EALG_RC4, IKEV2_XFORMENCR_RC4 },
{ SADB_EALG_NULL, IKEV2_XFORMENCR_NULL },
{ SADB_X_EALG_AES, IKEV2_XFORMENCR_AES_CBC },
{ SADB_X_EALG_AESCTR, IKEV2_XFORMENCR_AES_CTR },
@@ -91,7 +85,6 @@ static const struct pfkey_constmap pfkey_encr[] = {
static const struct pfkey_constmap pfkey_integr[] = {
{ SADB_AALG_MD5HMAC, IKEV2_XFORMAUTH_HMAC_MD5_96 },
{ SADB_AALG_SHA1HMAC, IKEV2_XFORMAUTH_HMAC_SHA1_96 },
- { SADB_X_AALG_DES, IKEV2_XFORMAUTH_DES_MAC },
{ SADB_X_AALG_SHA2_256, IKEV2_XFORMAUTH_HMAC_SHA2_256_128 },
{ SADB_X_AALG_SHA2_384, IKEV2_XFORMAUTH_HMAC_SHA2_384_192 },
{ SADB_X_AALG_SHA2_512, IKEV2_XFORMAUTH_HMAC_SHA2_512_256 },