diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2005-05-25 05:51:14 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2005-05-25 05:51:14 +0000 |
| commit | 621f650766e230d792f754e3ee289a7f15b756a8 (patch) | |
| tree | eed3a8cf163df7c737bb834caa761cba560782e9 /sbin | |
| parent | 2e172c5c337953c5b261a718c224233f55f766fa (diff) | |
aesctr and null support
Diffstat (limited to 'sbin')
| -rw-r--r-- | sbin/ipsecadm/ipsecadm.c | 4 | ||||
| -rw-r--r-- | sbin/ipsecadm/pfkdump.c | 5 |
2 files changed, 6 insertions, 3 deletions
diff --git a/sbin/ipsecadm/ipsecadm.c b/sbin/ipsecadm/ipsecadm.c index aef7236895e..44c52c7cf88 100644 --- a/sbin/ipsecadm/ipsecadm.c +++ b/sbin/ipsecadm/ipsecadm.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsecadm.c,v 1.84 2004/12/28 15:19:23 deraadt Exp $ */ +/* $OpenBSD: ipsecadm.c,v 1.85 2005/05/25 05:51:13 markus Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -98,9 +98,11 @@ typedef struct { } transform; transform xf[] = { + { "null", SADB_EALG_NULL, XF_ENC | ESP_NEW }, { "des", SADB_EALG_DESCBC, XF_ENC | ESP_OLD | ESP_NEW }, { "3des", SADB_EALG_3DESCBC, XF_ENC | ESP_OLD | ESP_NEW }, { "aes", SADB_X_EALG_AES, XF_ENC | ESP_NEW }, + { "aesctr", SADB_X_EALG_AESCTR, XF_ENC | ESP_NEW }, { "blf", SADB_X_EALG_BLF, XF_ENC | ESP_NEW }, { "cast", SADB_X_EALG_CAST, XF_ENC | ESP_NEW }, { "skipjack", SADB_X_EALG_SKIPJACK, XF_ENC | ESP_NEW }, diff --git a/sbin/ipsecadm/pfkdump.c b/sbin/ipsecadm/pfkdump.c index 8b74062fd8b..0673e327746 100644 --- a/sbin/ipsecadm/pfkdump.c +++ b/sbin/ipsecadm/pfkdump.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkdump.c,v 1.15 2004/11/26 18:02:22 markus Exp $ */ +/* $OpenBSD: pfkdump.c,v 1.16 2005/05/25 05:51:13 markus Exp $ */ /* * Copyright (c) 2003 Markus Friedl. All rights reserved. @@ -114,7 +114,7 @@ struct idname ext_types[] = { }; struct idname msg_types[] = { - { SADB_ACQUIRE, "sadb_aqcuire", NULL }, + { SADB_ACQUIRE, "sadb_acquire", NULL }, { SADB_ADD, "sadb_add", NULL }, { SADB_DELETE, "sadb_delete", NULL }, { SADB_DUMP, "sadb_dump", NULL }, @@ -166,6 +166,7 @@ struct idname enc_types[] = { { SADB_EALG_DESCBC, "des-cbc", NULL }, { SADB_X_EALG_3IDEA, "idea3", NULL }, { SADB_X_EALG_AES, "aes", NULL }, + { SADB_X_EALG_AESCTR, "aesctr", NULL }, { SADB_X_EALG_BLF, "blowfish", NULL }, { SADB_X_EALG_CAST, "cast128", NULL }, { SADB_X_EALG_DES_IV32, "des-iv32", NULL }, |