46 lines
1.7 KiB
Diff
46 lines
1.7 KiB
Diff
|
From 4f4e9952664e23b5aea4816ac2fda311415719de Mon Sep 17 00:00:00 2001
|
||
|
|
From: Isaac Boukris <iboukris@gmail.com>
|
||
|
|
Date: Fri, 8 Nov 2019 12:04:48 +0100
|
||
|
|
Subject: [PATCH 179/187] smbdes: remove D_P16() (not used)
|
||
|
|
|
||
|
|
Signed-off-by: Isaac Boukris <iboukris@samba.org>
|
||
|
|
Reviewed-by: Andrew Bartlett <abartlet@samba.org>
|
||
|
|
(cherry picked from commit 2eef12904f2c08257394a2ee869960f7c2e09112)
|
||
|
|
---
|
||
|
|
libcli/auth/proto.h | 1 -
|
||
|
|
libcli/auth/smbdes.c | 6 ------
|
||
|
|
2 files changed, 7 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/libcli/auth/proto.h b/libcli/auth/proto.h
|
||
|
|
index 9ae62efca31..212b46bb0e8 100644
|
||
|
|
--- a/libcli/auth/proto.h
|
||
|
|
+++ b/libcli/auth/proto.h
|
||
|
|
@@ -225,7 +225,6 @@ int des_crypt56_gnutls(uint8_t out[8], const uint8_t in[8], const uint8_t key[7]
|
||
|
|
enum samba_gnutls_direction encrypt);
|
||
|
|
int E_P16(const uint8_t *p14,uint8_t *p16);
|
||
|
|
void E_P24(const uint8_t *p21, const uint8_t *c8, uint8_t *p24);
|
||
|
|
-void D_P16(const uint8_t *p14, const uint8_t *in, uint8_t *out);
|
||
|
|
void E_old_pw_hash( uint8_t *p14, const uint8_t *in, uint8_t *out);
|
||
|
|
void des_crypt128(uint8_t out[8], const uint8_t in[8], const uint8_t key[16]);
|
||
|
|
void des_crypt112(uint8_t out[8], const uint8_t in[8], const uint8_t key[14], int forw);
|
||
|
|
diff --git a/libcli/auth/smbdes.c b/libcli/auth/smbdes.c
|
||
|
|
index c0d10278179..46fd5849f5b 100644
|
||
|
|
--- a/libcli/auth/smbdes.c
|
||
|
|
+++ b/libcli/auth/smbdes.c
|
||
|
|
@@ -381,12 +381,6 @@ void E_P24(const uint8_t *p21, const uint8_t *c8, uint8_t *p24)
|
||
|
|
des_crypt56(p24+16, c8, p21+14, 1);
|
||
|
|
}
|
||
|
|
|
||
|
|
-void D_P16(const uint8_t *p14, const uint8_t *in, uint8_t *out)
|
||
|
|
-{
|
||
|
|
- des_crypt56(out, in, p14, 0);
|
||
|
|
- des_crypt56(out+8, in+8, p14+7, 0);
|
||
|
|
-}
|
||
|
|
-
|
||
|
|
void E_old_pw_hash( uint8_t *p14, const uint8_t *in, uint8_t *out)
|
||
|
|
{
|
||
|
|
des_crypt56(out, in, p14, 1);
|
||
|
|
--
|
||
|
|
2.23.0
|
||
|
|
|