Page MenuHomeFreeBSD
Files F167823062

D24346.id70360.diff
No OneTemporary
Actions

D24346.id70360.diff
View Options

Index: sys/opencrypto/cryptodev.c
===================================================================
--- sys/opencrypto/cryptodev.c
+++ sys/opencrypto/cryptodev.c
@@ -408,21 +408,9 @@
switch (sop->cipher) {
case 0:
break;
- case CRYPTO_DES_CBC:
- txform = &enc_xform_des;
- break;
case CRYPTO_3DES_CBC:
txform = &enc_xform_3des;
break;
- case CRYPTO_BLF_CBC:
- txform = &enc_xform_blf;
- break;
- case CRYPTO_CAST_CBC:
- txform = &enc_xform_cast5;
- break;
- case CRYPTO_SKIPJACK_CBC:
- txform = &enc_xform_skipjack;
- break;
case CRYPTO_AES_CBC:
txform = &enc_xform_rijndael128;
break;
@@ -432,9 +420,6 @@
case CRYPTO_NULL_CBC:
txform = &enc_xform_null;
break;
- case CRYPTO_ARC4:
- txform = &enc_xform_arc4;
- break;
case CRYPTO_CAMELLIA_CBC:
txform = &enc_xform_camellia;
break;
@@ -460,9 +445,6 @@
switch (sop->mac) {
case 0:
break;
- case CRYPTO_MD5_HMAC:
- thash = &auth_hash_hmac_md5;
- break;
case CRYPTO_POLY1305:
thash = &auth_hash_poly1305;
break;
@@ -850,43 +832,15 @@
static void
cryptodev_warn(struct csession *cse)
{
- static struct timeval arc4warn, blfwarn, castwarn, deswarn, md5warn;
- static struct timeval skipwarn, tdeswarn;
+ static struct timeval tdeswarn;
const struct crypto_session_params *csp;
csp = crypto_get_params(cse->cses);
switch (csp->csp_cipher_alg) {
- case CRYPTO_DES_CBC:
- if (ratecheck(&deswarn, &warninterval))
- gone_in(13, "DES cipher via /dev/crypto");
- break;
case CRYPTO_3DES_CBC:
if (ratecheck(&tdeswarn, &warninterval))
gone_in(14, "3DES cipher via /dev/crypto");
break;
- case CRYPTO_BLF_CBC:
- if (ratecheck(&blfwarn, &warninterval))
- gone_in(13, "Blowfish cipher via /dev/crypto");
- break;
- case CRYPTO_CAST_CBC:
- if (ratecheck(&castwarn, &warninterval))
- gone_in(13, "CAST128 cipher via /dev/crypto");
- break;
- case CRYPTO_SKIPJACK_CBC:
- if (ratecheck(&skipwarn, &warninterval))
- gone_in(13, "Skipjack cipher via /dev/crypto");
- break;
- case CRYPTO_ARC4:
- if (ratecheck(&arc4warn, &warninterval))
- gone_in(13, "ARC4 cipher via /dev/crypto");
- break;
- }
-
- switch (csp->csp_auth_alg) {
- case CRYPTO_MD5_HMAC:
- if (ratecheck(&md5warn, &warninterval))
- gone_in(13, "MD5-HMAC authenticator via /dev/crypto");
- break;
}
}

File Metadata

Mime Type
text/plain
Expires
Tue, Aug 25, 7:27 PM (15 h, 57 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37247661
Default Alt Text
D24346.id70360.diff (2 KB)

Event Timeline