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.

12 files changed, 0 insertions, 64 deletions

diff --git a/regress/sbin/ipsecctl/sa11.in b/regress/sbin/ipsecctl/sa11.in
index 8abf099739b..003f797dc94 100644
--- a/regress/sbin/ipsecctl/sa11.in
+++ b/regress/sbin/ipsecctl/sa11.in
@@ -35,8 +35,3 @@ esp transport from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef:0xbeef8ead \
 	enc null \
 	auth hmac-sha1 \
 	authkey file "DIR/ak160:DIR/ak160"
-esp transport from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef:0xbeef9ead \
-	enc skipjack \
-	auth hmac-sha1 \
-	authkey file "DIR/ak160:DIR/ak160" \
-	enckey file "DIR/ek80:DIR/ek80"
diff --git a/regress/sbin/ipsecctl/sa11.ok b/regress/sbin/ipsecctl/sa11.ok
index bb7a460dc71..e36a9a64276 100644
--- a/regress/sbin/ipsecctl/sa11.ok
+++ b/regress/sbin/ipsecctl/sa11.ok
@@ -44,9 +44,3 @@ esp transport from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 esp transport from 2.2.2.2 to 1.1.1.8 spi 0xbeef8ead auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-esp transport from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
-esp transport from 2.2.2.2 to 1.1.1.9 spi 0xbeef9ead auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
diff --git a/regress/sbin/ipsecctl/sa18.in b/regress/sbin/ipsecctl/sa18.in
index 12fdc997c80..bb46f29d697 100644
--- a/regress/sbin/ipsecctl/sa18.in
+++ b/regress/sbin/ipsecctl/sa18.in
@@ -28,7 +28,3 @@ esp from 3ffe::7 to 3ffe::10 spi 0x7eadbeef:0xbeef7ead auth hmac-sha1 \
 esp from 3ffe::8 to 3ffe::10 spi 0x8eadbeef:0xbeef8ead auth hmac-sha1 \
 	enc null \
 	authkey file "DIR/ak160:DIR/ak160"
-esp from 3ffe::9 to 3ffe::10 spi 0x9eadbeef:0xbeef9ead auth hmac-sha1 \
-	enc skipjack \
-	authkey file "DIR/ak160:DIR/ak160" \
-	enckey file "DIR/ek80:DIR/ek80"
diff --git a/regress/sbin/ipsecctl/sa18.ok b/regress/sbin/ipsecctl/sa18.ok
index 31d24d7d1e3..fcd33b66376 100644
--- a/regress/sbin/ipsecctl/sa18.ok
+++ b/regress/sbin/ipsecctl/sa18.ok
@@ -44,9 +44,3 @@ esp tunnel from 3ffe::8 to 3ffe::10 spi 0x8eadbeef auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 esp tunnel from 3ffe::10 to 3ffe::8 spi 0xbeef8ead auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-esp tunnel from 3ffe::9 to 3ffe::10 spi 0x9eadbeef auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
-esp tunnel from 3ffe::10 to 3ffe::9 spi 0xbeef9ead auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
diff --git a/regress/sbin/ipsecctl/sa21.in b/regress/sbin/ipsecctl/sa21.in
index 807bd49bb31..63c8b64f6ad 100644
--- a/regress/sbin/ipsecctl/sa21.in
+++ b/regress/sbin/ipsecctl/sa21.in
@@ -35,8 +35,3 @@ esp from 3ffe::8 to 3ffe::10 spi 0x8eadbeef:0xbeef8ead \
 	enc null \
 	auth hmac-sha1 \
 	authkey file "DIR/ak160:DIR/ak160"
-esp from 3ffe::9 to 3ffe::10 spi 0x9eadbeef:0xbeef9ead \
-	enc skipjack \
-	auth hmac-sha1 \
-	authkey file "DIR/ak160:DIR/ak160" \
-	enckey file "DIR/ek80:DIR/ek80"
diff --git a/regress/sbin/ipsecctl/sa21.ok b/regress/sbin/ipsecctl/sa21.ok
index 31d24d7d1e3..fcd33b66376 100644
--- a/regress/sbin/ipsecctl/sa21.ok
+++ b/regress/sbin/ipsecctl/sa21.ok
@@ -44,9 +44,3 @@ esp tunnel from 3ffe::8 to 3ffe::10 spi 0x8eadbeef auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 esp tunnel from 3ffe::10 to 3ffe::8 spi 0xbeef8ead auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-esp tunnel from 3ffe::9 to 3ffe::10 spi 0x9eadbeef auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
-esp tunnel from 3ffe::10 to 3ffe::9 spi 0xbeef9ead auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
diff --git a/regress/sbin/ipsecctl/sa23.in b/regress/sbin/ipsecctl/sa23.in
index 2b7667b7735..528d88cb488 100644
--- a/regress/sbin/ipsecctl/sa23.in
+++ b/regress/sbin/ipsecctl/sa23.in
@@ -35,8 +35,3 @@ esp transport from 3ffe::8 to 3ffe::10 spi 0x8eadbeef:0xbeef8ead \
 	enc null \
 	auth hmac-sha1 \
 	authkey file "DIR/ak160:DIR/ak160"
-esp transport from 3ffe::9 to 3ffe::10 spi 0x9eadbeef:0xbeef9ead \
-	enc skipjack \
-	auth hmac-sha1 \
-	authkey file "DIR/ak160:DIR/ak160" \
-	enckey file "DIR/ek80:DIR/ek80"
diff --git a/regress/sbin/ipsecctl/sa23.ok b/regress/sbin/ipsecctl/sa23.ok
index 12d04750785..ad2832d7730 100644
--- a/regress/sbin/ipsecctl/sa23.ok
+++ b/regress/sbin/ipsecctl/sa23.ok
@@ -44,9 +44,3 @@ esp transport from 3ffe::8 to 3ffe::10 spi 0x8eadbeef auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 esp transport from 3ffe::10 to 3ffe::8 spi 0xbeef8ead auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-esp transport from 3ffe::9 to 3ffe::10 spi 0x9eadbeef auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
-esp transport from 3ffe::10 to 3ffe::9 spi 0xbeef9ead auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
diff --git a/regress/sbin/ipsecctl/sa6.in b/regress/sbin/ipsecctl/sa6.in
index 2867b98f380..aa9b4d21b02 100644
--- a/regress/sbin/ipsecctl/sa6.in
+++ b/regress/sbin/ipsecctl/sa6.in
@@ -28,7 +28,3 @@ esp from 1.1.1.7 to 2.2.2.2 spi 0x7eadbeef:0xbeef7ead auth hmac-sha1 \
 esp from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef:0xbeef8ead auth hmac-sha1 \
 	enc null \
 	authkey file "DIR/ak160:DIR/ak160"
-esp from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef:0xbeef9ead auth hmac-sha1 \
-	enc skipjack \
-	authkey file "DIR/ak160:DIR/ak160" \
-	enckey file "DIR/ek80:DIR/ek80"
diff --git a/regress/sbin/ipsecctl/sa6.ok b/regress/sbin/ipsecctl/sa6.ok
index 677ca933976..51a53803e97 100644
--- a/regress/sbin/ipsecctl/sa6.ok
+++ b/regress/sbin/ipsecctl/sa6.ok
@@ -44,9 +44,3 @@ esp tunnel from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 esp tunnel from 2.2.2.2 to 1.1.1.8 spi 0xbeef8ead auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-esp tunnel from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
-esp tunnel from 2.2.2.2 to 1.1.1.9 spi 0xbeef9ead auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
diff --git a/regress/sbin/ipsecctl/sa9.in b/regress/sbin/ipsecctl/sa9.in
index edbac916aba..cbe9c59eb0d 100644
--- a/regress/sbin/ipsecctl/sa9.in
+++ b/regress/sbin/ipsecctl/sa9.in
@@ -35,11 +35,6 @@ esp from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef:0xbeef8ead \
 	enc null \
 	auth hmac-sha1 \
 	authkey file "DIR/ak160:DIR/ak160"
-esp from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef:0xbeef9ead \
-	enc skipjack \
-	auth hmac-sha1 \
-	authkey file "DIR/ak160:DIR/ak160" \
-	enckey file "DIR/ek80:DIR/ek80"
 esp from 1.1.1.10 to 2.2.2.2 spi 0xaeadbeef:0xbeefaead \
 	enc null \
 	auth hmac-sha1 \
diff --git a/regress/sbin/ipsecctl/sa9.ok b/regress/sbin/ipsecctl/sa9.ok
index 3737c0e26dc..99f4ae10c6a 100644
--- a/regress/sbin/ipsecctl/sa9.ok
+++ b/regress/sbin/ipsecctl/sa9.ok
@@ -44,12 +44,6 @@ esp tunnel from 1.1.1.8 to 2.2.2.2 spi 0x8eadbeef auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 esp tunnel from 2.2.2.2 to 1.1.1.8 spi 0xbeef8ead auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-esp tunnel from 1.1.1.9 to 2.2.2.2 spi 0x9eadbeef auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
-esp tunnel from 2.2.2.2 to 1.1.1.9 spi 0xbeef9ead auth hmac-sha1 enc skipjack \
-	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa \
-	enckey 0xeeeeeeeeeeeeeeeeeeee
 esp tunnel from 1.1.1.10 to 2.2.2.2 spi 0xaeadbeef auth hmac-sha1 enc null \
 	authkey 0xaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 esp tunnel from 2.2.2.2 to 1.1.1.10 spi 0xbeefaead auth hmac-sha1 enc null \