summaryrefslogtreecommitdiff
path: root/src/lib/libssl
diff options
context:
space:
mode:
authormikeb <>2010-10-06 22:19:20 +0000
committermikeb <>2010-10-06 22:19:20 +0000
commitb8e3e6f8657e2f4d97938a5b1b2d0de4dacf8d8f (patch)
treef242f30768252dee8049878e21861f520369ce38 /src/lib/libssl
parente653be87798ed0bf345d0673de6916f7393b3534 (diff)
downloadopenbsd-b8e3e6f8657e2f4d97938a5b1b2d0de4dacf8d8f.tar.gz
openbsd-b8e3e6f8657e2f4d97938a5b1b2d0de4dacf8d8f.tar.bz2
openbsd-b8e3e6f8657e2f4d97938a5b1b2d0de4dacf8d8f.zip
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 'src/lib/libssl')
-rw-r--r--src/lib/libssl/src/crypto/engine/eng_cryptodev.c1
-rw-r--r--src/lib/libssl/src/crypto/engine/hw_cryptodev.c1
2 files changed, 0 insertions, 2 deletions
diff --git a/src/lib/libssl/src/crypto/engine/eng_cryptodev.c b/src/lib/libssl/src/crypto/engine/eng_cryptodev.c
index f04c79151b..10b3856b4e 100644
--- a/src/lib/libssl/src/crypto/engine/eng_cryptodev.c
+++ b/src/lib/libssl/src/crypto/engine/eng_cryptodev.c
@@ -151,7 +151,6 @@ static struct {
151 { CRYPTO_AES_CBC, NID_aes_256_cbc, 16, 32, }, 151 { CRYPTO_AES_CBC, NID_aes_256_cbc, 16, 32, },
152 { CRYPTO_BLF_CBC, NID_bf_cbc, 8, 16, }, 152 { CRYPTO_BLF_CBC, NID_bf_cbc, 8, 16, },
153 { CRYPTO_CAST_CBC, NID_cast5_cbc, 8, 16, }, 153 { CRYPTO_CAST_CBC, NID_cast5_cbc, 8, 16, },
154 { CRYPTO_SKIPJACK_CBC, NID_undef, 0, 0, },
155 { 0, NID_undef, 0, 0, }, 154 { 0, NID_undef, 0, 0, },
156}; 155};
157 156
diff --git a/src/lib/libssl/src/crypto/engine/hw_cryptodev.c b/src/lib/libssl/src/crypto/engine/hw_cryptodev.c
index b90f24576c..03022f2fd3 100644
--- a/src/lib/libssl/src/crypto/engine/hw_cryptodev.c
+++ b/src/lib/libssl/src/crypto/engine/hw_cryptodev.c
@@ -147,7 +147,6 @@ static struct dev_crypto_cipher ciphers[] = {
147 { CRYPTO_AES_CBC, NID_aes_256_cbc, 16, 32, }, 147 { CRYPTO_AES_CBC, NID_aes_256_cbc, 16, 32, },
148 { CRYPTO_BLF_CBC, NID_bf_cbc, 8, 16, }, 148 { CRYPTO_BLF_CBC, NID_bf_cbc, 8, 16, },
149 { CRYPTO_CAST_CBC, NID_cast5_cbc, 8, 16, }, 149 { CRYPTO_CAST_CBC, NID_cast5_cbc, 8, 16, },
150 { CRYPTO_SKIPJACK_CBC, NID_undef, 0, 0, },
151 { 0, NID_undef, 0, 0, }, 150 { 0, NID_undef, 0, 0, },
152}; 151};
153 152