cifs: create a MD4 module and switch cifs.ko to use it

[mirror_ubuntu-jammy-kernel.git] / fs / cifs / smbencrypt.c

diff --git a/fs/cifs/smbencrypt.c b/fs/cifs/smbencrypt.c
index 39a938443e3e3470848772389520c8b0e07c933e..10047cc5528651292244ff012d5a61d64ac2baeb 100644 (file)
--- a/fs/cifs/smbencrypt.c
+++ b/fs/cifs/smbencrypt.c
@@ -18,13 +18,13 @@
 #include <linux/string.h>
 #include <linux/kernel.h>
 #include <linux/random.h>
-#include <crypto/des.h>
 #include "cifs_fs_sb.h"
 #include "cifs_unicode.h"
 #include "cifspdu.h"
 #include "cifsglob.h"
 #include "cifs_debug.h"
 #include "cifsproto.h"
+#include "../cifs_common/md4.h"
 
 #ifndef false
 #define false 0
@@ -38,126 +38,29 @@
 #define SSVALX(buf,pos,val) (CVAL(buf,pos)=(val)&0xFF,CVAL(buf,pos+1)=(val)>>8)
 #define SSVAL(buf,pos,val) SSVALX((buf),(pos),((__u16)(val)))
 
-static void
-str_to_key(unsigned char *str, unsigned char *key)
-{
-       int i;
-
-       key[0] = str[0] >> 1;
-       key[1] = ((str[0] & 0x01) << 6) | (str[1] >> 2);
-       key[2] = ((str[1] & 0x03) << 5) | (str[2] >> 3);
-       key[3] = ((str[2] & 0x07) << 4) | (str[3] >> 4);
-       key[4] = ((str[3] & 0x0F) << 3) | (str[4] >> 5);
-       key[5] = ((str[4] & 0x1F) << 2) | (str[5] >> 6);
-       key[6] = ((str[5] & 0x3F) << 1) | (str[6] >> 7);
-       key[7] = str[6] & 0x7F;
-       for (i = 0; i < 8; i++)
-               key[i] = (key[i] << 1);
-}
-
-static int
-smbhash(unsigned char *out, const unsigned char *in, unsigned char *key)
-{
-       unsigned char key2[8];
-       struct des_ctx ctx;
-
-       str_to_key(key, key2);
-
-       if (fips_enabled) {
-               cifs_dbg(VFS, "FIPS compliance enabled: DES not permitted\n");
-               return -ENOENT;
-       }
-
-       des_expand_key(&ctx, key2, DES_KEY_SIZE);
-       des_encrypt(&ctx, out, in);
-       memzero_explicit(&ctx, sizeof(ctx));
-
-       return 0;
-}
-
-static int
-E_P16(unsigned char *p14, unsigned char *p16)
-{
-       int rc;
-       unsigned char sp8[8] =
-           { 0x4b, 0x47, 0x53, 0x21, 0x40, 0x23, 0x24, 0x25 };
-
-       rc = smbhash(p16, sp8, p14);
-       if (rc)
-               return rc;
-       rc = smbhash(p16 + 8, sp8, p14 + 7);
-       return rc;
-}
-
-static int
-E_P24(unsigned char *p21, const unsigned char *c8, unsigned char *p24)
-{
-       int rc;
-
-       rc = smbhash(p24, c8, p21);
-       if (rc)
-               return rc;
-       rc = smbhash(p24 + 8, c8, p21 + 7);
-       if (rc)
-               return rc;
-       rc = smbhash(p24 + 16, c8, p21 + 14);
-       return rc;
-}
-
 /* produce a md4 message digest from data of length n bytes */
-int
+static int
 mdfour(unsigned char *md4_hash, unsigned char *link_str, int link_len)
 {
        int rc;
-       struct crypto_shash *md4 = NULL;
-       struct sdesc *sdescmd4 = NULL;
-
-       rc = cifs_alloc_hash("md4", &md4, &sdescmd4);
-       if (rc)
-               goto mdfour_err;
+       struct md4_ctx mctx;
 
-       rc = crypto_shash_init(&sdescmd4->shash);
+       rc = cifs_md4_init(&mctx);
        if (rc) {
-               cifs_dbg(VFS, "%s: Could not init md4 shash\n", __func__);
+               cifs_dbg(VFS, "%s: Could not init MD4\n", __func__);
                goto mdfour_err;
        }
-       rc = crypto_shash_update(&sdescmd4->shash, link_str, link_len);
+       rc = cifs_md4_update(&mctx, link_str, link_len);
        if (rc) {
-               cifs_dbg(VFS, "%s: Could not update with link_str\n", __func__);
+               cifs_dbg(VFS, "%s: Could not update MD4\n", __func__);
                goto mdfour_err;
        }
-       rc = crypto_shash_final(&sdescmd4->shash, md4_hash);
+       rc = cifs_md4_final(&mctx, md4_hash);
        if (rc)
-               cifs_dbg(VFS, "%s: Could not generate md4 hash\n", __func__);
-
-mdfour_err:
-       cifs_free_hash(&md4, &sdescmd4);
-       return rc;
-}
-
-/*
-   This implements the X/Open SMB password encryption
-   It takes a password, a 8 byte "crypt key" and puts 24 bytes of
-   encrypted password into p24 */
-/* Note that password must be uppercased and null terminated */
-int
-SMBencrypt(unsigned char *passwd, const unsigned char *c8, unsigned char *p24)
-{
-       int rc;
-       unsigned char p14[14], p16[16], p21[21];
+               cifs_dbg(VFS, "%s: Could not finalize MD4\n", __func__);
 
-       memset(p14, '\0', 14);
-       memset(p16, '\0', 16);
-       memset(p21, '\0', 21);
-
-       memcpy(p14, passwd, 14);
-       rc = E_P16(p14, p16);
-       if (rc)
-               return rc;
-
-       memcpy(p21, p16, 16);
-       rc = E_P24(p21, c8, p24);
 
+mdfour_err:
        return rc;
 }
 
@@ -186,25 +89,3 @@ E_md4hash(const unsigned char *passwd, unsigned char *p16,
 
        return rc;
 }
-
-/* Does the NT MD4 hash then des encryption. */
-int
-SMBNTencrypt(unsigned char *passwd, unsigned char *c8, unsigned char *p24,
-               const struct nls_table *codepage)
-{
-       int rc;
-       unsigned char p16[16], p21[21];
-
-       memset(p16, '\0', 16);
-       memset(p21, '\0', 21);
-
-       rc = E_md4hash(passwd, p16, codepage);
-       if (rc) {
-               cifs_dbg(FYI, "%s Can't generate NT hash, error: %d\n",
-                        __func__, rc);
-               return rc;
-       }
-       memcpy(p21, p16, 16);
-       rc = E_P24(p21, c8, p24);
-       return rc;
-}