diff options
| author | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2010-10-06 22:19:21 +0000 |
|---|---|---|
| committer | Mike Belopuhov <mikeb@cvs.openbsd.org> | 2010-10-06 22:19:21 +0000 |
| commit | 17b1c63ba51e1c8f58ef89ffe4953e3a7a8144ed (patch) | |
| tree | 3875af8f630ab070970dc9e8309534f215fe4b06 /sys/netinet | |
| parent | 11582097cde9bb4bf4acb463d2661d972fc67353 (diff) | |
Retire Skipjack
There's not much use for the declassified cipher from the 80's
with a questionable license these days. According to the FIPS
drafts, Skipjack reaches its EOL in December 2010.
The libc portion will be removed after the ports hackathon.
djm and thib agree, no objections from deraadt
Thanks to jsg for digging up FIPS drafts.
Diffstat (limited to 'sys/netinet')
| -rw-r--r-- | sys/netinet/ip_esp.c | 6 | ||||
| -rw-r--r-- | sys/netinet/ip_ipsp.h | 3 |
2 files changed, 2 insertions, 7 deletions
diff --git a/sys/netinet/ip_esp.c b/sys/netinet/ip_esp.c index d16c0e0afec..5a3cfcbe55b 100644 --- a/sys/netinet/ip_esp.c +++ b/sys/netinet/ip_esp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_esp.c,v 1.113 2010/09/23 16:33:48 mikeb Exp $ */ +/* $OpenBSD: ip_esp.c,v 1.114 2010/10/06 22:19:20 mikeb Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr) and @@ -147,10 +147,6 @@ esp_init(struct tdb *tdbp, struct xformsw *xsp, struct ipsecinit *ii) txform = &enc_xform_cast5; break; - case SADB_X_EALG_SKIPJACK: - txform = &enc_xform_skipjack; - break; - default: DPRINTF(("esp_init(): unsupported encryption algorithm %d specified\n", ii->ii_encalg)); return EINVAL; diff --git a/sys/netinet/ip_ipsp.h b/sys/netinet/ip_ipsp.h index e2521bbfc48..0e9b8a1c22f 100644 --- a/sys/netinet/ip_ipsp.h +++ b/sys/netinet/ip_ipsp.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ip_ipsp.h,v 1.145 2010/09/23 16:34:09 mikeb Exp $ */ +/* $OpenBSD: ip_ipsp.h,v 1.146 2010/10/06 22:19:20 mikeb Exp $ */ /* * The authors of this code are John Ioannidis (ji@tla.org), * Angelos D. Keromytis (kermit@csd.uch.gr), @@ -475,7 +475,6 @@ extern struct enc_xform enc_xform_des; extern struct enc_xform enc_xform_3des; extern struct enc_xform enc_xform_blf; extern struct enc_xform enc_xform_cast5; -extern struct enc_xform enc_xform_skipjack; extern struct auth_hash auth_hash_hmac_md5_96; extern struct auth_hash auth_hash_hmac_sha1_96; |