Page MenuHomeFreeBSD
Files F147003106

D24767.id71651.diff
No OneTemporary
Actions

D24767.id71651.diff
View Options

Index: head/share/man/man4/hifn.4
===================================================================
--- head/share/man/man4/hifn.4
+++ head/share/man/man4/hifn.4
@@ -26,7 +26,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd October 19, 2009
+.Dd May 11, 2020
.Dt HIFN 4
.Os
.Sh NAME
@@ -57,7 +57,7 @@
The
.Nm
driver registers itself to accelerate DES, Triple-DES,
-AES (7955 and 7956 only), ARC4, MD5,
+AES (7955 and 7956 only), ARC4,
MD5-HMAC, SHA1, and SHA1-HMAC operations for
.Xr ipsec 4
and
Index: head/share/man/man9/crypto.9
===================================================================
--- head/share/man/man9/crypto.9
+++ head/share/man/man9/crypto.9
@@ -17,7 +17,7 @@
.\"
.\" $FreeBSD$
.\"
-.Dd March 27, 2020
+.Dd May 11, 2020
.Dt CRYPTO 9
.Os
.Sh NAME
@@ -106,7 +106,6 @@
.It Dv CRYPTO_AES_NIST_GMAC
.It Dv CRYPTO_BLAKE2B
.It Dv CRYPTO_BLAKE2S
-.It Dv CRYPTO_MD5
.It Dv CRYPTO_MD5_HMAC
.It Dv CRYPTO_MD5_KPDK
.It Dv CRYPTO_NULL_HMAC
Index: head/sys/dev/cesa/cesa.c
===================================================================
--- head/sys/dev/cesa/cesa.c
+++ head/sys/dev/cesa/cesa.c
@@ -1607,7 +1607,6 @@
sc->sc_soc_id == MV_DEV_88F6810))
return (false);
/* FALLTHROUGH */
- case CRYPTO_MD5:
case CRYPTO_MD5_HMAC:
case CRYPTO_SHA1:
case CRYPTO_SHA1_HMAC:
@@ -1686,12 +1685,6 @@
}
switch (csp->csp_auth_alg) {
- case CRYPTO_MD5:
- cs->cs_mblen = 1;
- cs->cs_hlen = (csp->csp_auth_mlen == 0) ? MD5_HASH_LEN :
- csp->csp_auth_mlen;
- cs->cs_config |= CESA_CSHD_MD5;
- break;
case CRYPTO_MD5_HMAC:
cs->cs_mblen = MD5_BLOCK_LEN;
cs->cs_hlen = (csp->csp_auth_mlen == 0) ? MD5_HASH_LEN :
Index: head/sys/dev/hifn/hifn7751.c
===================================================================
--- head/sys/dev/hifn/hifn7751.c
+++ head/sys/dev/hifn/hifn7751.c
@@ -2315,7 +2315,6 @@
}
switch (csp->csp_auth_alg) {
- case CRYPTO_MD5:
case CRYPTO_SHA1:
break;
case CRYPTO_MD5_HMAC:
@@ -2524,11 +2523,6 @@
cmd->base_masks |= HIFN_BASE_CMD_MAC;
switch (csp->csp_auth_alg) {
- case CRYPTO_MD5:
- cmd->mac_masks |= HIFN_MAC_CMD_ALG_MD5 |
- HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HASH |
- HIFN_MAC_CMD_POS_IPSEC;
- break;
case CRYPTO_MD5_HMAC:
cmd->mac_masks |= HIFN_MAC_CMD_ALG_MD5 |
HIFN_MAC_CMD_RESULT | HIFN_MAC_CMD_MODE_HMAC |
Index: head/sys/dev/sec/sec.c
===================================================================
--- head/sys/dev/sec/sec.c
+++ head/sys/dev/sec/sec.c
@@ -1180,7 +1180,6 @@
if (csp->csp_auth_klen > SEC_MAX_KEY_LEN)
return (false);
break;
- case CRYPTO_MD5:
case CRYPTO_SHA1:
break;
default:
@@ -1530,7 +1529,6 @@
sec_mdeu_can_handle(u_int alg)
{
switch (alg) {
- case CRYPTO_MD5:
case CRYPTO_SHA1:
case CRYPTO_MD5_HMAC:
case CRYPTO_SHA1_HMAC:
@@ -1554,8 +1552,6 @@
switch (csp->csp_auth_alg) {
case CRYPTO_MD5_HMAC:
*mode |= SEC_MDEU_MODE_HMAC;
- /* FALLTHROUGH */
- case CRYPTO_MD5:
*eu = SEC_EU_MDEU_A;
*mode |= SEC_MDEU_MODE_MD5;
*hashlen = MD5_HASH_LEN;
Index: head/sys/mips/nlm/dev/sec/nlmsec.c
===================================================================
--- head/sys/mips/nlm/dev/sec/nlmsec.c
+++ head/sys/mips/nlm/dev/sec/nlmsec.c
@@ -376,7 +376,6 @@
{
switch (csp->csp_auth_alg) {
- case CRYPTO_MD5:
case CRYPTO_SHA1:
case CRYPTO_MD5_HMAC:
case CRYPTO_SHA1_HMAC:
Index: head/sys/mips/nlm/dev/sec/nlmseclib.c
===================================================================
--- head/sys/mips/nlm/dev/sec/nlmseclib.c
+++ head/sys/mips/nlm/dev/sec/nlmseclib.c
@@ -273,10 +273,6 @@
const struct crypto_session_params *csp)
{
switch(csp->csp_auth_alg) {
- case CRYPTO_MD5:
- cmd->hashalg = NLM_HASH_MD5;
- cmd->hashmode = NLM_HASH_MODE_SHA1;
- break;
case CRYPTO_SHA1:
cmd->hashalg = NLM_HASH_SHA;
cmd->hashmode = NLM_HASH_MODE_SHA1;
Index: head/sys/opencrypto/crypto.c
===================================================================
--- head/sys/opencrypto/crypto.c
+++ head/sys/opencrypto/crypto.c
@@ -550,10 +550,6 @@
return (&auth_hash_key_md5);
case CRYPTO_SHA1_KPDK:
return (&auth_hash_key_sha1);
-#ifdef notyet
- case CRYPTO_MD5:
- return (&auth_hash_md5);
-#endif
case CRYPTO_SHA1:
return (&auth_hash_sha1);
case CRYPTO_SHA2_224:
@@ -704,7 +700,6 @@
[CRYPTO_SHA1_KPDK] = ALG_KEYED_DIGEST,
[CRYPTO_AES_CBC] = ALG_CIPHER,
[CRYPTO_ARC4] = ALG_CIPHER,
- [CRYPTO_MD5] = ALG_DIGEST,
[CRYPTO_SHA1] = ALG_DIGEST,
[CRYPTO_NULL_HMAC] = ALG_DIGEST,
[CRYPTO_NULL_CBC] = ALG_CIPHER,
Index: head/sys/opencrypto/cryptodev.c
===================================================================
--- head/sys/opencrypto/cryptodev.c
+++ head/sys/opencrypto/cryptodev.c
@@ -506,11 +506,6 @@
return (EINVAL);
}
break;
-#ifdef notdef
- case CRYPTO_MD5:
- thash = &auth_hash_md5;
- break;
-#endif
case CRYPTO_SHA1:
thash = &auth_hash_sha1;
break;
Index: head/sys/opencrypto/cryptosoft.c
===================================================================
--- head/sys/opencrypto/cryptosoft.c
+++ head/sys/opencrypto/cryptosoft.c
@@ -980,9 +980,6 @@
if (csp->csp_mode == CSP_MODE_DIGEST)
ses->swcr_process = swcr_authcompute;
break;
-#ifdef notdef
- case CRYPTO_MD5:
-#endif
case CRYPTO_SHA1:
case CRYPTO_SHA2_224:
case CRYPTO_SHA2_256:

File Metadata

Mime Type
text/plain
Expires
Sun, Mar 8, 12:22 PM (17 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
29405477
Default Alt Text
D24767.id71651.diff (5 KB)

Event Timeline