diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-12-28 10:02:38 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-12-28 10:02:38 +0000 |
| commit | e43eb395fda42f410b0e54303cb52afe2fcaec90 (patch) | |
| tree | 2667ab3c1c610803a9dac5feb1678065f593f809 /sys/net | |
| parent | 3842ebbf1fb15e7d8241c7758b5b8d1b553e5b42 (diff) | |
remove KPDK. not really used, and a bad choice anyway. ok naddy
Diffstat (limited to 'sys/net')
| -rw-r--r-- | sys/net/pfkeyv2.h | 6 | ||||
| -rw-r--r-- | sys/net/pfkeyv2_convert.c | 10 |
2 files changed, 3 insertions, 13 deletions
diff --git a/sys/net/pfkeyv2.h b/sys/net/pfkeyv2.h index ace99172939..cf915b3cfb7 100644 --- a/sys/net/pfkeyv2.h +++ b/sys/net/pfkeyv2.h @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkeyv2.h,v 1.64 2013/10/24 18:50:16 deraadt Exp $ */ +/* $OpenBSD: pfkeyv2.h,v 1.65 2014/12/28 10:02:37 tedu Exp $ */ /* * @(#)COPYRIGHT 1.1 (NRL) January 1998 * @@ -300,9 +300,7 @@ struct sadb_x_tap { #define SADB_X_AALG_AES128GMAC 9 #define SADB_X_AALG_AES192GMAC 10 #define SADB_X_AALG_AES256GMAC 11 -#define SADB_X_AALG_MD5 249 -#define SADB_X_AALG_SHA1 250 -#define SADB_AALG_MAX 250 +#define SADB_AALG_MAX 11 #define SADB_EALG_NONE 0 #define SADB_X_EALG_DES_IV64 1 diff --git a/sys/net/pfkeyv2_convert.c b/sys/net/pfkeyv2_convert.c index b6e4c65a5df..fd1d341dac5 100644 --- a/sys/net/pfkeyv2_convert.c +++ b/sys/net/pfkeyv2_convert.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkeyv2_convert.c,v 1.44 2014/12/19 17:14:40 tedu Exp $ */ +/* $OpenBSD: pfkeyv2_convert.c,v 1.45 2014/12/28 10:02:37 tedu Exp $ */ /* * The author of this code is Angelos D. Keromytis (angelos@keromytis.org) * @@ -214,14 +214,6 @@ export_sa(void **p, struct tdb *tdb) case CRYPTO_AES_256_GMAC: sadb_sa->sadb_sa_auth = SADB_X_AALG_AES256GMAC; break; - - case CRYPTO_MD5_KPDK: - sadb_sa->sadb_sa_auth = SADB_X_AALG_MD5; - break; - - case CRYPTO_SHA1_KPDK: - sadb_sa->sadb_sa_auth = SADB_X_AALG_SHA1; - break; } } |