mirror of
https://github.com/3proxy/3proxy.git
synced 2025-04-11 15:03:11 +08:00
Remove legacy NTLMv1 code
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
Some checks failed
C/C++ CI / ${{ matrix.target }} (macos-15) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-24.04-arm) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (ubuntu-latest) (push) Has been cancelled
C/C++ CI / ${{ matrix.target }} (windows-2022) (push) Has been cancelled
This commit is contained in:
Vladimir Dubrovin
parent
89b45b1b2a
commit
7aad0205e1
@ -144,18 +144,12 @@ $(BUILDDIR)mycrypt$(EXESUFFICS): md4$(OBJSUFFICS) md5$(OBJSUFFICS) mycryptmain$(
|
|||||||
md4$(OBJSUFFICS): libs/md4.h libs/md4.c
|
md4$(OBJSUFFICS): libs/md4.h libs/md4.c
|
||||||
$(CC) $(COUT)md4$(OBJSUFFICS) $(CFLAGS) libs/md4.c
|
$(CC) $(COUT)md4$(OBJSUFFICS) $(CFLAGS) libs/md4.c
|
||||||
|
|
||||||
smbdes$(OBJSUFFICS): libs/smbdes.c
|
|
||||||
$(CC) $(COUT)smbdes$(OBJSUFFICS) $(CFLAGS) libs/smbdes.c
|
|
||||||
|
|
||||||
md5$(OBJSUFFICS): libs/md5.h libs/md5.c
|
md5$(OBJSUFFICS): libs/md5.h libs/md5.c
|
||||||
$(CC) $(COUT)md5$(OBJSUFFICS) $(CFLAGS) libs/md5.c
|
$(CC) $(COUT)md5$(OBJSUFFICS) $(CFLAGS) libs/md5.c
|
||||||
|
|
||||||
ntlm$(OBJSUFFICS): ntlm.c
|
|
||||||
$(CC) $(COUT)ntlm$(OBJSUFFICS) $(CFLAGS) ntlm.c
|
|
||||||
|
|
||||||
stringtable$(OBJSUFFICS): stringtable.c
|
stringtable$(OBJSUFFICS): stringtable.c
|
||||||
$(CC) $(COUT)stringtable$(OBJSUFFICS) $(CFLAGS) stringtable.c
|
$(CC) $(COUT)stringtable$(OBJSUFFICS) $(CFLAGS) stringtable.c
|
||||||
|
|
||||||
$(BUILDDIR)3proxy$(EXESUFFICS): 3proxy$(OBJSUFFICS) mainfunc$(OBJSUFFICS) srvproxy$(OBJSUFFICS) srvpop3p$(OBJSUFFICS) srvsmtpp$(OBJSUFFICS) srvftppr$(OBJSUFFICS) srvsocks$(OBJSUFFICS) srvtcppm$(OBJSUFFICS) srvtlspr$(OBJSUFFICS) srvauto$(OBJSUFFICS) srvudppm$(OBJSUFFICS) sockmap$(OBJSUFFICS) sockgetchar$(OBJSUFFICS) common$(OBJSUFFICS) auth$(OBJSUFFICS) authradius$(OBJSUFFICS) conf$(OBJSUFFICS) log$(OBJSUFFICS) datatypes$(OBJSUFFICS) md4$(OBJSUFFICS) md5$(OBJSUFFICS) mycrypt$(OBJSUFFICS) base64$(OBJSUFFICS) ftp$(OBJSUFFICS) smbdes$(OBJSUFFICS) ntlm$(OBJSUFFICS) stringtable$(OBJSUFFICS) srvwebadmin$(OBJSUFFICS) srvdnspr$(OBJSUFFICS) plugins$(OBJSUFFICS) $(COMPATLIBS) $(VERSIONDEP)
|
$(BUILDDIR)3proxy$(EXESUFFICS): 3proxy$(OBJSUFFICS) mainfunc$(OBJSUFFICS) srvproxy$(OBJSUFFICS) srvpop3p$(OBJSUFFICS) srvsmtpp$(OBJSUFFICS) srvftppr$(OBJSUFFICS) srvsocks$(OBJSUFFICS) srvtcppm$(OBJSUFFICS) srvtlspr$(OBJSUFFICS) srvauto$(OBJSUFFICS) srvudppm$(OBJSUFFICS) sockmap$(OBJSUFFICS) sockgetchar$(OBJSUFFICS) common$(OBJSUFFICS) auth$(OBJSUFFICS) authradius$(OBJSUFFICS) conf$(OBJSUFFICS) log$(OBJSUFFICS) datatypes$(OBJSUFFICS) md4$(OBJSUFFICS) md5$(OBJSUFFICS) mycrypt$(OBJSUFFICS) base64$(OBJSUFFICS) ftp$(OBJSUFFICS) stringtable$(OBJSUFFICS) srvwebadmin$(OBJSUFFICS) srvdnspr$(OBJSUFFICS) plugins$(OBJSUFFICS) $(COMPATLIBS) $(VERSIONDEP)
|
||||||
$(LN) $(LNOUT)$(BUILDDIR)3proxy$(EXESUFFICS) $(LDFLAGS) $(VERFILE) 3proxy$(OBJSUFFICS) mainfunc$(OBJSUFFICS) auth$(OBJSUFFICS) authradius$(OBJSUFFICS) conf$(OBJSUFFICS) datatypes$(OBJSUFFICS) srvauto$(OBJSUFFICS) srvproxy$(OBJSUFFICS) srvpop3p$(OBJSUFFICS) srvsmtpp$(OBJSUFFICS) srvftppr$(OBJSUFFICS) srvsocks$(OBJSUFFICS) srvtcppm$(OBJSUFFICS) srvtlspr$(OBJSUFFICS) srvudppm$(OBJSUFFICS) sockmap$(OBJSUFFICS) sockgetchar$(OBJSUFFICS) common$(OBJSUFFICS) log$(OBJSUFFICS) mycrypt$(OBJSUFFICS) md5$(OBJSUFFICS) md4$(OBJSUFFICS) base64$(OBJSUFFICS) ftp$(OBJSUFFICS) smbdes$(OBJSUFFICS) ntlm$(OBJSUFFICS) stringtable$(OBJSUFFICS) srvwebadmin$(OBJSUFFICS) srvdnspr$(OBJSUFFICS) plugins$(OBJSUFFICS) $(COMPATLIBS) $(LIBS)
|
$(LN) $(LNOUT)$(BUILDDIR)3proxy$(EXESUFFICS) $(LDFLAGS) $(VERFILE) 3proxy$(OBJSUFFICS) mainfunc$(OBJSUFFICS) auth$(OBJSUFFICS) authradius$(OBJSUFFICS) conf$(OBJSUFFICS) datatypes$(OBJSUFFICS) srvauto$(OBJSUFFICS) srvproxy$(OBJSUFFICS) srvpop3p$(OBJSUFFICS) srvsmtpp$(OBJSUFFICS) srvftppr$(OBJSUFFICS) srvsocks$(OBJSUFFICS) srvtcppm$(OBJSUFFICS) srvtlspr$(OBJSUFFICS) srvudppm$(OBJSUFFICS) sockmap$(OBJSUFFICS) sockgetchar$(OBJSUFFICS) common$(OBJSUFFICS) log$(OBJSUFFICS) mycrypt$(OBJSUFFICS) md5$(OBJSUFFICS) md4$(OBJSUFFICS) base64$(OBJSUFFICS) ftp$(OBJSUFFICS) stringtable$(OBJSUFFICS) srvwebadmin$(OBJSUFFICS) srvdnspr$(OBJSUFFICS) plugins$(OBJSUFFICS) $(COMPATLIBS) $(LIBS)
|
||||||
|
|
||||||
|
|||||||
16
src/auth.c
16
src/auth.c
@ -971,15 +971,6 @@ int strongauth(struct clientparam * param){
|
|||||||
else if (!param->pwtype && param->password && !strcmp((char *)param->password, (char *)pwl->password)){
|
else if (!param->pwtype && param->password && !strcmp((char *)param->password, (char *)pwl->password)){
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
#ifndef NOCRYPT
|
|
||||||
else if (param->pwtype == 2 && param->password) {
|
|
||||||
ntpwdhash(buf, pwl->password, 0);
|
|
||||||
mschap(buf, param->password, buf + 16);
|
|
||||||
if(!memcmp(buf+16, param->password+8, 24)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
pthread_mutex_unlock(&pwl_mutex);
|
pthread_mutex_unlock(&pwl_mutex);
|
||||||
return 6;
|
return 6;
|
||||||
#ifndef NOCRYPT
|
#ifndef NOCRYPT
|
||||||
@ -993,13 +984,6 @@ int strongauth(struct clientparam * param){
|
|||||||
if(param->password && !param->pwtype && !memcmp(pwl->password, ntpwdhash(buf,param->password, 1), 32)) {
|
if(param->password && !param->pwtype && !memcmp(pwl->password, ntpwdhash(buf,param->password, 1), 32)) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
else if (param->pwtype == 2){
|
|
||||||
fromhex(pwl->password, buf, 16);
|
|
||||||
mschap(buf, param->password, buf + 16);
|
|
||||||
if(!memcmp(buf + 16, param->password+8, 24)) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
pthread_mutex_unlock(&pwl_mutex);
|
pthread_mutex_unlock(&pwl_mutex);
|
||||||
return 8;
|
return 8;
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
3821
src/libs/regex.c
3821
src/libs/regex.c
File diff suppressed because it is too large
Load Diff
@ -1,74 +0,0 @@
|
|||||||
/*
|
|
||||||
|
|
||||||
Minimal version of Henry Spencer's regex library
|
|
||||||
with minor modifications
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
#ifndef _REGEX_H_
|
|
||||||
#define _REGEX_H_
|
|
||||||
#ifdef __cplusplus
|
|
||||||
extern "C" {
|
|
||||||
#endif
|
|
||||||
|
|
||||||
typedef off_t regoff_t;
|
|
||||||
typedef struct {
|
|
||||||
int re_magic;
|
|
||||||
size_t re_nsub; /* number of parenthesized subexpressions */
|
|
||||||
const char *re_endp; /* end pointer for REG_PEND */
|
|
||||||
struct re_guts *re_g; /* none of your business :-) */
|
|
||||||
} regex_t;
|
|
||||||
typedef struct {
|
|
||||||
regoff_t rm_so; /* start of match */
|
|
||||||
regoff_t rm_eo; /* end of match */
|
|
||||||
} regmatch_t;
|
|
||||||
|
|
||||||
|
|
||||||
extern int regcomp(regex_t *, const char *, int);
|
|
||||||
#define REG_BASIC 0000
|
|
||||||
#define REG_EXTENDED 0001
|
|
||||||
#define REG_ICASE 0002
|
|
||||||
#define REG_NOSUB 0004
|
|
||||||
#define REG_NEWLINE 0010
|
|
||||||
#define REG_NOSPEC 0020
|
|
||||||
#define REG_PEND 0040
|
|
||||||
#define REG_DUMP 0200
|
|
||||||
|
|
||||||
|
|
||||||
#define REG_OKAY 0
|
|
||||||
#define REG_NOMATCH 1
|
|
||||||
#define REG_BADPAT 2
|
|
||||||
#define REG_ECOLLATE 3
|
|
||||||
#define REG_ECTYPE 4
|
|
||||||
#define REG_EESCAPE 5
|
|
||||||
#define REG_ESUBREG 6
|
|
||||||
#define REG_EBRACK 7
|
|
||||||
#define REG_EPAREN 8
|
|
||||||
#define REG_EBRACE 9
|
|
||||||
#define REG_BADBR 10
|
|
||||||
#define REG_ERANGE 11
|
|
||||||
#define REG_ESPACE 12
|
|
||||||
#define REG_BADRPT 13
|
|
||||||
#define REG_EMPTY 14
|
|
||||||
#define REG_ASSERT 15
|
|
||||||
#define REG_INVARG 16
|
|
||||||
#define REG_ATOI 255 /* convert name to number (!) */
|
|
||||||
#define REG_ITOA 0400 /* convert number to name (!) */
|
|
||||||
|
|
||||||
|
|
||||||
extern int regexec(const regex_t *, const char *, size_t, regmatch_t [], int);
|
|
||||||
#define REG_NOTBOL 00001
|
|
||||||
#define REG_NOTEOL 00002
|
|
||||||
#define REG_STARTEND 00004
|
|
||||||
#define REG_TRACE 00400 /* tracing of execution */
|
|
||||||
#define REG_LARGE 01000 /* force large representation */
|
|
||||||
#define REG_BACKR 02000 /* force use of backref code */
|
|
||||||
|
|
||||||
|
|
||||||
extern void regfree(regex_t *);
|
|
||||||
|
|
||||||
#ifdef __cplusplus
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
#endif
|
|
||||||
@ -1,321 +0,0 @@
|
|||||||
/*
|
|
||||||
Unix SMB/CIFS implementation.
|
|
||||||
|
|
||||||
a partial implementation of DES designed for use in the
|
|
||||||
SMB authentication protocol
|
|
||||||
|
|
||||||
Copyright (C) Andrew Tridgell 1998
|
|
||||||
|
|
||||||
This program is free software; you can redistribute it and/or modify
|
|
||||||
it under the terms of the GNU General Public License as published by
|
|
||||||
the Free Software Foundation; either version 2 of the License, or
|
|
||||||
(at your option) any later version.
|
|
||||||
|
|
||||||
This program is distributed in the hope that it will be useful,
|
|
||||||
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
GNU General Public License for more details.
|
|
||||||
|
|
||||||
You should have received a copy of the GNU General Public License
|
|
||||||
along with this program; if not, write to the Free Software
|
|
||||||
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include <string.h>
|
|
||||||
#include <ctype.h>
|
|
||||||
|
|
||||||
|
|
||||||
#define uchar unsigned char
|
|
||||||
|
|
||||||
static const uchar perm1[56] = {57, 49, 41, 33, 25, 17, 9,
|
|
||||||
1, 58, 50, 42, 34, 26, 18,
|
|
||||||
10, 2, 59, 51, 43, 35, 27,
|
|
||||||
19, 11, 3, 60, 52, 44, 36,
|
|
||||||
63, 55, 47, 39, 31, 23, 15,
|
|
||||||
7, 62, 54, 46, 38, 30, 22,
|
|
||||||
14, 6, 61, 53, 45, 37, 29,
|
|
||||||
21, 13, 5, 28, 20, 12, 4};
|
|
||||||
|
|
||||||
static const uchar perm2[48] = {14, 17, 11, 24, 1, 5,
|
|
||||||
3, 28, 15, 6, 21, 10,
|
|
||||||
23, 19, 12, 4, 26, 8,
|
|
||||||
16, 7, 27, 20, 13, 2,
|
|
||||||
41, 52, 31, 37, 47, 55,
|
|
||||||
30, 40, 51, 45, 33, 48,
|
|
||||||
44, 49, 39, 56, 34, 53,
|
|
||||||
46, 42, 50, 36, 29, 32};
|
|
||||||
|
|
||||||
static const uchar perm3[64] = {58, 50, 42, 34, 26, 18, 10, 2,
|
|
||||||
60, 52, 44, 36, 28, 20, 12, 4,
|
|
||||||
62, 54, 46, 38, 30, 22, 14, 6,
|
|
||||||
64, 56, 48, 40, 32, 24, 16, 8,
|
|
||||||
57, 49, 41, 33, 25, 17, 9, 1,
|
|
||||||
59, 51, 43, 35, 27, 19, 11, 3,
|
|
||||||
61, 53, 45, 37, 29, 21, 13, 5,
|
|
||||||
63, 55, 47, 39, 31, 23, 15, 7};
|
|
||||||
|
|
||||||
static const uchar perm4[48] = { 32, 1, 2, 3, 4, 5,
|
|
||||||
4, 5, 6, 7, 8, 9,
|
|
||||||
8, 9, 10, 11, 12, 13,
|
|
||||||
12, 13, 14, 15, 16, 17,
|
|
||||||
16, 17, 18, 19, 20, 21,
|
|
||||||
20, 21, 22, 23, 24, 25,
|
|
||||||
24, 25, 26, 27, 28, 29,
|
|
||||||
28, 29, 30, 31, 32, 1};
|
|
||||||
|
|
||||||
static const uchar perm5[32] = { 16, 7, 20, 21,
|
|
||||||
29, 12, 28, 17,
|
|
||||||
1, 15, 23, 26,
|
|
||||||
5, 18, 31, 10,
|
|
||||||
2, 8, 24, 14,
|
|
||||||
32, 27, 3, 9,
|
|
||||||
19, 13, 30, 6,
|
|
||||||
22, 11, 4, 25};
|
|
||||||
|
|
||||||
|
|
||||||
static const uchar perm6[64] ={ 40, 8, 48, 16, 56, 24, 64, 32,
|
|
||||||
39, 7, 47, 15, 55, 23, 63, 31,
|
|
||||||
38, 6, 46, 14, 54, 22, 62, 30,
|
|
||||||
37, 5, 45, 13, 53, 21, 61, 29,
|
|
||||||
36, 4, 44, 12, 52, 20, 60, 28,
|
|
||||||
35, 3, 43, 11, 51, 19, 59, 27,
|
|
||||||
34, 2, 42, 10, 50, 18, 58, 26,
|
|
||||||
33, 1, 41, 9, 49, 17, 57, 25};
|
|
||||||
|
|
||||||
|
|
||||||
static const uchar sc[16] = {1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1};
|
|
||||||
|
|
||||||
static const uchar sbox[8][4][16] = {
|
|
||||||
{{14, 4, 13, 1, 2, 15, 11, 8, 3, 10, 6, 12, 5, 9, 0, 7},
|
|
||||||
{0, 15, 7, 4, 14, 2, 13, 1, 10, 6, 12, 11, 9, 5, 3, 8},
|
|
||||||
{4, 1, 14, 8, 13, 6, 2, 11, 15, 12, 9, 7, 3, 10, 5, 0},
|
|
||||||
{15, 12, 8, 2, 4, 9, 1, 7, 5, 11, 3, 14, 10, 0, 6, 13}},
|
|
||||||
|
|
||||||
{{15, 1, 8, 14, 6, 11, 3, 4, 9, 7, 2, 13, 12, 0, 5, 10},
|
|
||||||
{3, 13, 4, 7, 15, 2, 8, 14, 12, 0, 1, 10, 6, 9, 11, 5},
|
|
||||||
{0, 14, 7, 11, 10, 4, 13, 1, 5, 8, 12, 6, 9, 3, 2, 15},
|
|
||||||
{13, 8, 10, 1, 3, 15, 4, 2, 11, 6, 7, 12, 0, 5, 14, 9}},
|
|
||||||
|
|
||||||
{{10, 0, 9, 14, 6, 3, 15, 5, 1, 13, 12, 7, 11, 4, 2, 8},
|
|
||||||
{13, 7, 0, 9, 3, 4, 6, 10, 2, 8, 5, 14, 12, 11, 15, 1},
|
|
||||||
{13, 6, 4, 9, 8, 15, 3, 0, 11, 1, 2, 12, 5, 10, 14, 7},
|
|
||||||
{1, 10, 13, 0, 6, 9, 8, 7, 4, 15, 14, 3, 11, 5, 2, 12}},
|
|
||||||
|
|
||||||
{{7, 13, 14, 3, 0, 6, 9, 10, 1, 2, 8, 5, 11, 12, 4, 15},
|
|
||||||
{13, 8, 11, 5, 6, 15, 0, 3, 4, 7, 2, 12, 1, 10, 14, 9},
|
|
||||||
{10, 6, 9, 0, 12, 11, 7, 13, 15, 1, 3, 14, 5, 2, 8, 4},
|
|
||||||
{3, 15, 0, 6, 10, 1, 13, 8, 9, 4, 5, 11, 12, 7, 2, 14}},
|
|
||||||
|
|
||||||
{{2, 12, 4, 1, 7, 10, 11, 6, 8, 5, 3, 15, 13, 0, 14, 9},
|
|
||||||
{14, 11, 2, 12, 4, 7, 13, 1, 5, 0, 15, 10, 3, 9, 8, 6},
|
|
||||||
{4, 2, 1, 11, 10, 13, 7, 8, 15, 9, 12, 5, 6, 3, 0, 14},
|
|
||||||
{11, 8, 12, 7, 1, 14, 2, 13, 6, 15, 0, 9, 10, 4, 5, 3}},
|
|
||||||
|
|
||||||
{{12, 1, 10, 15, 9, 2, 6, 8, 0, 13, 3, 4, 14, 7, 5, 11},
|
|
||||||
{10, 15, 4, 2, 7, 12, 9, 5, 6, 1, 13, 14, 0, 11, 3, 8},
|
|
||||||
{9, 14, 15, 5, 2, 8, 12, 3, 7, 0, 4, 10, 1, 13, 11, 6},
|
|
||||||
{4, 3, 2, 12, 9, 5, 15, 10, 11, 14, 1, 7, 6, 0, 8, 13}},
|
|
||||||
|
|
||||||
{{4, 11, 2, 14, 15, 0, 8, 13, 3, 12, 9, 7, 5, 10, 6, 1},
|
|
||||||
{13, 0, 11, 7, 4, 9, 1, 10, 14, 3, 5, 12, 2, 15, 8, 6},
|
|
||||||
{1, 4, 11, 13, 12, 3, 7, 14, 10, 15, 6, 8, 0, 5, 9, 2},
|
|
||||||
{6, 11, 13, 8, 1, 4, 10, 7, 9, 5, 0, 15, 14, 2, 3, 12}},
|
|
||||||
|
|
||||||
{{13, 2, 8, 4, 6, 15, 11, 1, 10, 9, 3, 14, 5, 0, 12, 7},
|
|
||||||
{1, 15, 13, 8, 10, 3, 7, 4, 12, 5, 6, 11, 0, 14, 9, 2},
|
|
||||||
{7, 11, 4, 1, 9, 12, 14, 2, 0, 6, 10, 13, 15, 3, 5, 8},
|
|
||||||
{2, 1, 14, 7, 4, 10, 8, 13, 15, 12, 9, 0, 3, 5, 6, 11}}};
|
|
||||||
|
|
||||||
static void permute(char *out, const char *in, const uchar *p, int n)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
for (i=0;i<n;i++)
|
|
||||||
out[i] = in[p[i]-1];
|
|
||||||
}
|
|
||||||
|
|
||||||
static void lshift(char *d, int count, int n)
|
|
||||||
{
|
|
||||||
char out[64];
|
|
||||||
int i;
|
|
||||||
for (i=0;i<n;i++)
|
|
||||||
out[i] = d[(i+count)%n];
|
|
||||||
for (i=0;i<n;i++)
|
|
||||||
d[i] = out[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
static void concat(char *out, char *in1, char *in2, int l1, int l2)
|
|
||||||
{
|
|
||||||
while (l1--)
|
|
||||||
*out++ = *in1++;
|
|
||||||
while (l2--)
|
|
||||||
*out++ = *in2++;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void xor(char *out, char *in1, char *in2, int n)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
for (i=0;i<n;i++)
|
|
||||||
out[i] = in1[i] ^ in2[i];
|
|
||||||
}
|
|
||||||
|
|
||||||
static void dohash(char *out, char *in, char *key)
|
|
||||||
{
|
|
||||||
int i, j, k;
|
|
||||||
char pk1[56];
|
|
||||||
char c[28];
|
|
||||||
char d[28];
|
|
||||||
char cd[56];
|
|
||||||
char ki[16][48];
|
|
||||||
char pd1[64];
|
|
||||||
char l[32], r[32];
|
|
||||||
char rl[64];
|
|
||||||
|
|
||||||
permute(pk1, key, perm1, 56);
|
|
||||||
|
|
||||||
for (i=0;i<28;i++)
|
|
||||||
c[i] = pk1[i];
|
|
||||||
for (i=0;i<28;i++)
|
|
||||||
d[i] = pk1[i+28];
|
|
||||||
|
|
||||||
for (i=0;i<16;i++) {
|
|
||||||
lshift(c, sc[i], 28);
|
|
||||||
lshift(d, sc[i], 28);
|
|
||||||
|
|
||||||
concat(cd, c, d, 28, 28);
|
|
||||||
permute(ki[i], cd, perm2, 48);
|
|
||||||
}
|
|
||||||
|
|
||||||
permute(pd1, in, perm3, 64);
|
|
||||||
|
|
||||||
for (j=0;j<32;j++) {
|
|
||||||
l[j] = pd1[j];
|
|
||||||
r[j] = pd1[j+32];
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i=0;i<16;i++) {
|
|
||||||
char er[48];
|
|
||||||
char erk[48];
|
|
||||||
char b[8][6];
|
|
||||||
char cb[32];
|
|
||||||
char pcb[32];
|
|
||||||
char r2[32];
|
|
||||||
|
|
||||||
permute(er, r, perm4, 48);
|
|
||||||
|
|
||||||
xor(erk, er, ki[i], 48);
|
|
||||||
|
|
||||||
for (j=0;j<8;j++)
|
|
||||||
for (k=0;k<6;k++)
|
|
||||||
b[j][k] = erk[j*6 + k];
|
|
||||||
|
|
||||||
for (j=0;j<8;j++) {
|
|
||||||
int m, n;
|
|
||||||
m = (b[j][0]<<1) | b[j][5];
|
|
||||||
|
|
||||||
n = (b[j][1]<<3) | (b[j][2]<<2) | (b[j][3]<<1) | b[j][4];
|
|
||||||
|
|
||||||
for (k=0;k<4;k++)
|
|
||||||
b[j][k] = (sbox[j][m][n] & (1<<(3-k)))?1:0;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (j=0;j<8;j++)
|
|
||||||
for (k=0;k<4;k++)
|
|
||||||
cb[j*4+k] = b[j][k];
|
|
||||||
permute(pcb, cb, perm5, 32);
|
|
||||||
|
|
||||||
xor(r2, l, pcb, 32);
|
|
||||||
|
|
||||||
for (j=0;j<32;j++)
|
|
||||||
l[j] = r[j];
|
|
||||||
|
|
||||||
for (j=0;j<32;j++)
|
|
||||||
r[j] = r2[j];
|
|
||||||
}
|
|
||||||
|
|
||||||
concat(rl, r, l, 32, 32);
|
|
||||||
|
|
||||||
permute(out, rl, perm6, 64);
|
|
||||||
}
|
|
||||||
|
|
||||||
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 void smbhash(unsigned char *out, const unsigned char *in, unsigned char *key)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
char outb[64];
|
|
||||||
char inb[64];
|
|
||||||
char keyb[64];
|
|
||||||
unsigned char key2[8];
|
|
||||||
|
|
||||||
str_to_key(key, key2);
|
|
||||||
|
|
||||||
for (i=0;i<64;i++) {
|
|
||||||
inb[i] = (in[i/8] & (1<<(7-(i%8)))) ? 1 : 0;
|
|
||||||
keyb[i] = (key2[i/8] & (1<<(7-(i%8)))) ? 1 : 0;
|
|
||||||
outb[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
dohash(outb, inb, keyb);
|
|
||||||
|
|
||||||
for (i=0;i<8;i++) {
|
|
||||||
out[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (i=0;i<64;i++) {
|
|
||||||
if (outb[i])
|
|
||||||
out[i/8] |= (1<<(7-(i%8)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Converts the password to uppercase, and creates the LM
|
|
||||||
* password hash.
|
|
||||||
*/
|
|
||||||
void lmpwdhash(const unsigned char *password,unsigned char *lmhash)
|
|
||||||
{
|
|
||||||
int i;
|
|
||||||
unsigned char p14[14];
|
|
||||||
static unsigned char sp8[8] = {0x4b, 0x47, 0x53, 0x21, 0x40, 0x23, 0x24, 0x25};
|
|
||||||
|
|
||||||
memset(p14, 0, sizeof(p14));
|
|
||||||
for (i = 0; i < 14 && password[i]; i++) {
|
|
||||||
p14[i] = toupper((int) password[i]);
|
|
||||||
}
|
|
||||||
|
|
||||||
smbhash(lmhash, sp8, p14);
|
|
||||||
smbhash(lmhash+8, sp8, p14+7);
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Take the NT or LM password, and return the MSCHAP response
|
|
||||||
*
|
|
||||||
* The win_password MUST be exactly 16 bytes long.
|
|
||||||
*/
|
|
||||||
void mschap(const unsigned char *win_password,
|
|
||||||
const unsigned char *challenge, unsigned char *response)
|
|
||||||
{
|
|
||||||
unsigned char p21[21];
|
|
||||||
|
|
||||||
memset(p21, 0, sizeof(p21));
|
|
||||||
memcpy(p21, win_password, 16);
|
|
||||||
|
|
||||||
smbhash(response, challenge, p21);
|
|
||||||
smbhash(response+8, challenge, p21+7);
|
|
||||||
smbhash(response+16, challenge, p21+14);
|
|
||||||
}
|
|
||||||
88
src/ntlm.c
88
src/ntlm.c
@ -1,88 +0,0 @@
|
|||||||
/*
|
|
||||||
3APA3A simpliest proxy server
|
|
||||||
(c) 2002-2021 by Vladimir Dubrovin <3proxy@3proxy.org>
|
|
||||||
|
|
||||||
please read License Agreement
|
|
||||||
|
|
||||||
*/
|
|
||||||
|
|
||||||
#include "proxy.h"
|
|
||||||
struct ntlmchal {
|
|
||||||
unsigned char sig[8];
|
|
||||||
unsigned char messtype[4];
|
|
||||||
unsigned char dom_len[2];
|
|
||||||
unsigned char dom_max_len[2];
|
|
||||||
unsigned char dom_offset[4];
|
|
||||||
unsigned char flags[4];
|
|
||||||
unsigned char challenge[8];
|
|
||||||
unsigned char reserved[8];
|
|
||||||
unsigned char addr_len[2];
|
|
||||||
unsigned char addr_max_len[2];
|
|
||||||
unsigned char addr_offset[4];
|
|
||||||
unsigned char data[1];
|
|
||||||
};
|
|
||||||
|
|
||||||
struct ntlmreq {
|
|
||||||
unsigned char sig[8];
|
|
||||||
unsigned char messtype[4];
|
|
||||||
unsigned char flags[4];
|
|
||||||
unsigned char dom_len[2];
|
|
||||||
unsigned char dom_max_len[2];
|
|
||||||
unsigned char dom_offset[4];
|
|
||||||
unsigned char pad1[2];
|
|
||||||
unsigned char host_len[2];
|
|
||||||
unsigned char host_max_len[2];
|
|
||||||
unsigned char host_offset[4];
|
|
||||||
unsigned char pad2[2];
|
|
||||||
unsigned char data[1];
|
|
||||||
};
|
|
||||||
|
|
||||||
int text2unicode(const char * text, char * buf, int buflen){
|
|
||||||
int count = 0;
|
|
||||||
buflen = ((buflen>>1)<<1);
|
|
||||||
if(!text || !buflen) return 0;
|
|
||||||
do {
|
|
||||||
buf[count++] = toupper(*text++);
|
|
||||||
buf[count++] = '\0';
|
|
||||||
} while (*text && count < buflen);
|
|
||||||
return count;
|
|
||||||
}
|
|
||||||
|
|
||||||
void unicode2text(const char *unicode, char * buf, int len){
|
|
||||||
int i;
|
|
||||||
if(!unicode || !len) return;
|
|
||||||
for(i=0; i<len; i++){
|
|
||||||
buf[i] = unicode[(i<<1)];
|
|
||||||
}
|
|
||||||
buf[i] = 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
void genchallenge(struct clientparam *param, char * challenge, char *buf){
|
|
||||||
struct ntlmchal *chal;
|
|
||||||
char tmpbuf[1024];
|
|
||||||
char hostname[128];
|
|
||||||
int len, i;
|
|
||||||
|
|
||||||
|
|
||||||
chal = (struct ntlmchal *)tmpbuf;
|
|
||||||
memset(chal, 0, 1024);
|
|
||||||
memcpy(chal->sig, "NTLMSSP", 8);
|
|
||||||
chal->messtype[0] = 2;
|
|
||||||
gethostname(hostname, 128);
|
|
||||||
hostname[15] = 0;
|
|
||||||
len = (((int)strlen(hostname)) << 1);
|
|
||||||
chal->dom_len[0] = len;
|
|
||||||
chal->dom_max_len[0] = len;
|
|
||||||
chal->dom_offset[0] = (unsigned char)((unsigned char *)chal->data - (unsigned char *)chal);
|
|
||||||
chal->flags[0] = 0x03;
|
|
||||||
chal->flags[1] = 0x82;
|
|
||||||
chal->flags[2] = 0x81;
|
|
||||||
chal->flags[3] = 0xA0;
|
|
||||||
text2unicode(hostname, (char *)chal->data, 64);
|
|
||||||
time((time_t *)challenge);
|
|
||||||
memcpy(challenge+4, SAADDR(¶m->sincr), 4);
|
|
||||||
challenge[1]^=*SAPORT(¶m->sincr);
|
|
||||||
for(i = 0; i < 8; i++) challenge[i] ^= myrand(challenge, 8);
|
|
||||||
memcpy(chal->challenge, challenge, 8);
|
|
||||||
en64((unsigned char *)tmpbuf, (unsigned char *)buf, (int)((unsigned char *)chal->data - (unsigned char *)chal) + len);
|
|
||||||
}
|
|
||||||
48
src/proxy.c
48
src/proxy.c
@ -381,54 +381,6 @@ for(;;){
|
|||||||
param->username = (unsigned char *)mystrdup((char *)username);
|
param->username = (unsigned char *)mystrdup((char *)username);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
#ifndef NOCRYPT
|
|
||||||
if(param->srv->usentlm && !strncasecmp((char *)sb, "ntlm", 4)){
|
|
||||||
sb+=4;
|
|
||||||
while(isspace(*sb))sb++;
|
|
||||||
i = de64(sb, username, 1023);
|
|
||||||
if(i<=16)continue;
|
|
||||||
username[i] = 0;
|
|
||||||
if(strncasecmp((char *)username, "NTLMSSP", 8)) continue;
|
|
||||||
if(username[8] == 1) {
|
|
||||||
while( (i = sockgetlinebuf(param, CLIENT, buf, BUFSIZE - 1, '\n', conf.timeouts[STRING_S])) > 2){
|
|
||||||
if(i> 15 && (!strncasecmp((char *)(buf), "content-length", 14))){
|
|
||||||
buf[i]=0;
|
|
||||||
sscanf((char *)buf + 15, "%"PRINTF_INT64_MODIFIER"u", &contentlength64);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
while( contentlength64 > 0 && (i = sockgetlinebuf(param, CLIENT, buf, (BUFSIZE < contentlength64)? BUFSIZE - 1:(int)contentlength64, '\n', conf.timeouts[STRING_S])) > 0){
|
|
||||||
if ((uint64_t)i > contentlength64) break;
|
|
||||||
contentlength64-=i;
|
|
||||||
}
|
|
||||||
contentlength64 = 0;
|
|
||||||
if(param->password)myfree(param->password);
|
|
||||||
param->password = myalloc(32);
|
|
||||||
param->pwtype = 2;
|
|
||||||
i = (int)strlen(proxy_stringtable[13]);
|
|
||||||
memcpy(buf, proxy_stringtable[13], i);
|
|
||||||
genchallenge(param, (char *)param->password, (char *)buf + i);
|
|
||||||
memcpy(buf + strlen((char *)buf), "\r\n\r\n", 5);
|
|
||||||
socksend(param, param->clisock, buf, (int)strlen((char *)buf), conf.timeouts[STRING_S]);
|
|
||||||
ckeepalive = keepalive = 1;
|
|
||||||
goto REQUESTEND;
|
|
||||||
}
|
|
||||||
if(username[8] == 3 && param->pwtype == 2 && i>=80) {
|
|
||||||
unsigned offset, len;
|
|
||||||
|
|
||||||
len = username[20] + (((unsigned)username[21]) << 8);
|
|
||||||
offset = username[24] + (((unsigned)username[25]) << 8);
|
|
||||||
if(len != 24 || len + offset > (unsigned)i) continue;
|
|
||||||
memcpy(param->password + 8, username + offset, 24);
|
|
||||||
len = username[36] + (((unsigned)username[37]) << 8);
|
|
||||||
offset = username[40] + (((unsigned)username[41]) << 8);
|
|
||||||
if(len> 255 || len + offset > (unsigned)i) continue;
|
|
||||||
if(param->username) myfree(param->username);
|
|
||||||
unicode2text((char *)username+offset, (char *)username+offset, (len>>1));
|
|
||||||
param->username = (unsigned char *)mystrdup((char *)username+offset);
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
#endif
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
if(!isconnect && (
|
if(!isconnect && (
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user