zx/bforce
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

added crypt support

Browse Source
This commit is contained in:
Alexander Skovpen 2014-06-10 21:27:30 +04:00
parent abe396a046
commit f467bc8f13
9 changed files with 2054 additions and 711 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
debian/Makefile vendored
View File

@ -33,9 +33,9 @@ POST_INSTALL = :
NORMAL_UNINSTALL = :
PRE_UNINSTALL = :
POST_UNINSTALL = :
build_triplet = i686-pc-linux-gnu
host_triplet = i686-pc-linux-gnu
target_triplet = i686-pc-linux-gnu
build_triplet = x86_64-unknown-linux-gnu
host_triplet = x86_64-unknown-linux-gnu
target_triplet = x86_64-unknown-linux-gnu
subdir = ../debian
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
am__aclocal_m4_deps = $(top_srcdir)/configure.in
@ -56,38 +56,38 @@ ECHO_N = -n
ECHO_T =
EGREP = /bin/grep -E
EXEEXT =
GROUP = sergey
GROUP = ftn
INSTALL_DATA = ${INSTALL} -m 644
INSTALL_PROGRAM = ${INSTALL}
INSTALL_SCRIPT = ${INSTALL}
LDFLAGS =
LIBOBJS =
LIBS = -lrt
LIBS =
LTLIBOBJS =
OBJEXT = o
OWNER = sergey
OWNER = ftn
PACKAGE_BUGREPORT = sergey@fidoman.ru
PACKAGE_NAME = bforce
PACKAGE_STRING = bforce 0.24
PACKAGE_TARNAME = bforce
PACKAGE_VERSION = 0.24
PATH_SEPARATOR = :
SHELL = /bin/bash
YACC = byacc
SHELL = /bin/sh
YACC = bison -y
ac_ct_CC = gcc
bindir = ${exec_prefix}/bin
build = i686-pc-linux-gnu
build = x86_64-unknown-linux-gnu
build_alias =
build_cpu = i686
build_cpu = x86_64
build_os = linux-gnu
build_vendor = pc
build_vendor = unknown
datadir = ${prefix}/share
exec_prefix = ${prefix}
host = i686-pc-linux-gnu
host = x86_64-unknown-linux-gnu
host_alias =
host_cpu = i686
host_cpu = x86_64
host_os = linux-gnu
host_vendor = pc
host_vendor = unknown
includedir = ${prefix}/include
infodir = ${prefix}/share/info
libdir = ${exec_prefix}/lib
@ -95,16 +95,16 @@ libexecdir = ${exec_prefix}/libexec
localstatedir = ${prefix}/var
mandir = ${prefix}/share/man
oldincludedir = /usr/include
prefix = /home/sergey/bforce
prefix = /usr/local
program_transform_name = s,x,x,
sbindir = ${exec_prefix}/sbin
sharedstatedir = ${prefix}/com
sysconfdir = ${prefix}/etc
target = i686-pc-linux-gnu
sysconfdir = /usr/local/etc/ftn/bforce
target = x86_64-unknown-linux-gnu
target_alias =
target_cpu = i686
target_cpu = x86_64
target_os = linux-gnu
target_vendor = pc
target_vendor = unknown
# $Id$
EXTRA_DIST = copyright changelog rules conffiles \

15
source/Makefile
View File

@ -6,14 +6,14 @@
# $Id$
#
prefix=/home/sergey/bforce
prefix=/usr/local
exec_prefix=${prefix}
CC = gcc
INCLUDES = -I./include
CFLAGS = -g -O2 -fno-builtin
LIBS = -lrt
YACC = byacc
LIBS =
YACC = bison -y
INSTALL = /usr/bin/install -c
INSTALL_PROGRAM = ${INSTALL}
INSTALL_DATA = ${INSTALL} -m 644
@ -21,9 +21,9 @@ SRCDIR = .
SRCDIRCONF = $(SRCDIR)/../examples
CONTRIBDIR = $(SRCDIR)/../contrib
OWNER = sergey
GROUP = sergey
CONFDIR = ${prefix}/etc
OWNER = ftn
GROUP = ftn
CONFDIR = /usr/local/etc/ftn/bforce
BINDIR = ${exec_prefix}/bin
LOGDIR = /var/log/bforce
SPOOLDIR = /var/spool/bforce
@ -103,7 +103,8 @@ BFORCE_OBJS = bforce/bforce.o \
bforce/u_misc.o bforce/u_string.o \
bforce/u_time.o bforce/u_file.o \
bforce/u_pkt.o bforce/u_recode.o \
bforce/u_plock.o bforce/netspool.o
bforce/u_plock.o bforce/netspool.o \
bforce/prot_binkp_crypt.o
.c.o:
@echo Compiling $*.c

3
source/Makefile.in
View File

@ -103,7 +103,8 @@ BFORCE_OBJS = bforce/bforce.o \
bforce/u_misc.o bforce/u_string.o \
bforce/u_time.o bforce/u_file.o \
bforce/u_pkt.o bforce/u_recode.o \
bforce/u_plock.o bforce/netspool.o
bforce/u_plock.o bforce/netspool.o \
bforce/prot_binkp_crypt.o
.c.o:
@echo Compiling $*.c

2524
source/bforce/expression.c
View File

File diff suppressed because it is too large Load Diff

20
source/bforce/prot_binkp.c
View File

@ -137,6 +137,8 @@ int binkp_loop(s_binkp_state *bstate) {
return PRC_ERROR;
}
writebuf[1] = block_length&0xff;
if (bstate->mode==bmode_transfer && bstate->remote_data->options&BINKP_OPT_CRYPT)
encrypt_buf(writebuf, have_to_write, bstate->remote_data->keys_out);
}
if (m==2 || m==3) {
DEB((D_24554, "no more to send"));
@ -204,6 +206,8 @@ int binkp_loop(s_binkp_state *bstate) {
log("read: remote socket shutdown");
return PRC_REMOTEABORTED;
}
if (bstate->mode==bmode_transfer && bstate->remote_data->options & BINKP_OPT_CRYPT)
decrypt_buf(readbuf+read_pos, n, bstate->remote_data->keys_in);
DEB((D_24554, "got %d bytes", n));
want_read -= n;
read_pos += n;
@ -266,6 +270,11 @@ int binkp_loop(s_binkp_state *bstate) {
int binkp_outgoing(s_binkp_sysinfo *local_data, s_binkp_sysinfo *remote_data)
{
char *p;
init_keys(remote_data->keys_out, local_data->passwd ? local_data->passwd : "-");
init_keys(remote_data->keys_in, "-");
for (p=local_data->passwd ? local_data->passwd : "-"; *p; p++)
update_keys(remote_data->keys_in, (int)*p);
s_binkp_state s;
s.mode = bmode_outgoing_handshake;
s.local_data = local_data;
@ -399,7 +408,7 @@ case 6:
case 7:
if (bstate->mode==bmode_outgoing_handshake) {
buf[0]=BPMSG_NUL;
strcpy(buf+1, "OPT MB");
strcpy(buf+1, "OPT MB CRYPT");
if (!nodelist_checkflag (state.node.flags, "NR"))
strcat(buf+1, " NR");
// ND is too complicated and have unclear gain
@ -506,6 +515,15 @@ case 4:
if (bstate->mode==bmode_incoming_handshake) {
DEB((D_24554, "incoming handshake is complete"));
bstate->complete = true;
char *p;
char pbuf[32];
for (i=0;i<state.n_remoteaddr;i++)
if( !session_get_password(state.remoteaddrs[i].addr, pbuf, sizeof(pbuf)) ){
init_keys(bstate->remote_data->keys_in, pbuf?pbuf:"-");
init_keys(bstate->remote_data->keys_out, "-");
for (p=pbuf?pbuf:"-"; *p; p++)
update_keys(bstate->remote_data->keys_out, (int)*p);
}
}
else {
DEB((D_24554, "outgoing handshake: everything is sent"));

148
source/bforce/prot_binkp_crypt.c Normal file
View File

@ -0,0 +1,148 @@
/*
* crypt.c -- crypt binkp traffic
*
* crypt.c is a part of binkd project
*
* Copyright (c) 1990-2000 Info-ZIP.
* Copyright (C) 2001 Pavel Gulchouck <gul@gul.kiev.ua> 2:463/68
*
* 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. See COPYING.
*
* This encryption code is a direct transcription of the algorithm from
* Roger Schlafly.
*/
/*
* $Id: crypt.c,v 2.4 2005/10/10 15:44:24 stas Exp $
*
* $Log: crypt.c,v $
* Revision 2.4 2005/10/10 15:44:24 stas
* Move CRC32's define into crypt.h
*
* Revision 2.3 2001/02/21 06:25:21 gul
* changed crlf to cr in the source file
*
* Revision 2.2 2001/02/20 12:01:50 gul
* rename encrypt to encrypt_buf to avoid conflict with unistd.h
*
* Revision 2.1 2001/02/15 16:05:59 gul
* crypt bugfix
*
* Revision 2.0 2001/02/15 11:02:16 gul
* Added crypt traffic possibility
*
*
*/
#include "includes.h"
#include "session.h"
#include "prot_common.h"
#include "prot_binkp.h"
unsigned long crc_32_tab[256] = {
0x00000000L, 0x77073096L, 0xee0e612cL, 0x990951baL, 0x076dc419L,
0x706af48fL, 0xe963a535L, 0x9e6495a3L, 0x0edb8832L, 0x79dcb8a4L,
0xe0d5e91eL, 0x97d2d988L, 0x09b64c2bL, 0x7eb17cbdL, 0xe7b82d07L,
0x90bf1d91L, 0x1db71064L, 0x6ab020f2L, 0xf3b97148L, 0x84be41deL,
0x1adad47dL, 0x6ddde4ebL, 0xf4d4b551L, 0x83d385c7L, 0x136c9856L,
0x646ba8c0L, 0xfd62f97aL, 0x8a65c9ecL, 0x14015c4fL, 0x63066cd9L,
0xfa0f3d63L, 0x8d080df5L, 0x3b6e20c8L, 0x4c69105eL, 0xd56041e4L,
0xa2677172L, 0x3c03e4d1L, 0x4b04d447L, 0xd20d85fdL, 0xa50ab56bL,
0x35b5a8faL, 0x42b2986cL, 0xdbbbc9d6L, 0xacbcf940L, 0x32d86ce3L,
0x45df5c75L, 0xdcd60dcfL, 0xabd13d59L, 0x26d930acL, 0x51de003aL,
0xc8d75180L, 0xbfd06116L, 0x21b4f4b5L, 0x56b3c423L, 0xcfba9599L,
0xb8bda50fL, 0x2802b89eL, 0x5f058808L, 0xc60cd9b2L, 0xb10be924L,
0x2f6f7c87L, 0x58684c11L, 0xc1611dabL, 0xb6662d3dL, 0x76dc4190L,
0x01db7106L, 0x98d220bcL, 0xefd5102aL, 0x71b18589L, 0x06b6b51fL,
0x9fbfe4a5L, 0xe8b8d433L, 0x7807c9a2L, 0x0f00f934L, 0x9609a88eL,
0xe10e9818L, 0x7f6a0dbbL, 0x086d3d2dL, 0x91646c97L, 0xe6635c01L,
0x6b6b51f4L, 0x1c6c6162L, 0x856530d8L, 0xf262004eL, 0x6c0695edL,
0x1b01a57bL, 0x8208f4c1L, 0xf50fc457L, 0x65b0d9c6L, 0x12b7e950L,
0x8bbeb8eaL, 0xfcb9887cL, 0x62dd1ddfL, 0x15da2d49L, 0x8cd37cf3L,
0xfbd44c65L, 0x4db26158L, 0x3ab551ceL, 0xa3bc0074L, 0xd4bb30e2L,
0x4adfa541L, 0x3dd895d7L, 0xa4d1c46dL, 0xd3d6f4fbL, 0x4369e96aL,
0x346ed9fcL, 0xad678846L, 0xda60b8d0L, 0x44042d73L, 0x33031de5L,
0xaa0a4c5fL, 0xdd0d7cc9L, 0x5005713cL, 0x270241aaL, 0xbe0b1010L,
0xc90c2086L, 0x5768b525L, 0x206f85b3L, 0xb966d409L, 0xce61e49fL,
0x5edef90eL, 0x29d9c998L, 0xb0d09822L, 0xc7d7a8b4L, 0x59b33d17L,
0x2eb40d81L, 0xb7bd5c3bL, 0xc0ba6cadL, 0xedb88320L, 0x9abfb3b6L,
0x03b6e20cL, 0x74b1d29aL, 0xead54739L, 0x9dd277afL, 0x04db2615L,
0x73dc1683L, 0xe3630b12L, 0x94643b84L, 0x0d6d6a3eL, 0x7a6a5aa8L,
0xe40ecf0bL, 0x9309ff9dL, 0x0a00ae27L, 0x7d079eb1L, 0xf00f9344L,
0x8708a3d2L, 0x1e01f268L, 0x6906c2feL, 0xf762575dL, 0x806567cbL,
0x196c3671L, 0x6e6b06e7L, 0xfed41b76L, 0x89d32be0L, 0x10da7a5aL,
0x67dd4accL, 0xf9b9df6fL, 0x8ebeeff9L, 0x17b7be43L, 0x60b08ed5L,
0xd6d6a3e8L, 0xa1d1937eL, 0x38d8c2c4L, 0x4fdff252L, 0xd1bb67f1L,
0xa6bc5767L, 0x3fb506ddL, 0x48b2364bL, 0xd80d2bdaL, 0xaf0a1b4cL,
0x36034af6L, 0x41047a60L, 0xdf60efc3L, 0xa867df55L, 0x316e8eefL,
0x4669be79L, 0xcb61b38cL, 0xbc66831aL, 0x256fd2a0L, 0x5268e236L,
0xcc0c7795L, 0xbb0b4703L, 0x220216b9L, 0x5505262fL, 0xc5ba3bbeL,
0xb2bd0b28L, 0x2bb45a92L, 0x5cb36a04L, 0xc2d7ffa7L, 0xb5d0cf31L,
0x2cd99e8bL, 0x5bdeae1dL, 0x9b64c2b0L, 0xec63f226L, 0x756aa39cL,
0x026d930aL, 0x9c0906a9L, 0xeb0e363fL, 0x72076785L, 0x05005713L,
0x95bf4a82L, 0xe2b87a14L, 0x7bb12baeL, 0x0cb61b38L, 0x92d28e9bL,
0xe5d5be0dL, 0x7cdcefb7L, 0x0bdbdf21L, 0x86d3d2d4L, 0xf1d4e242L,
0x68ddb3f8L, 0x1fda836eL, 0x81be16cdL, 0xf6b9265bL, 0x6fb077e1L,
0x18b74777L, 0x88085ae6L, 0xff0f6a70L, 0x66063bcaL, 0x11010b5cL,
0x8f659effL, 0xf862ae69L, 0x616bffd3L, 0x166ccf45L, 0xa00ae278L,
0xd70dd2eeL, 0x4e048354L, 0x3903b3c2L, 0xa7672661L, 0xd06016f7L,
0x4969474dL, 0x3e6e77dbL, 0xaed16a4aL, 0xd9d65adcL, 0x40df0b66L,
0x37d83bf0L, 0xa9bcae53L, 0xdebb9ec5L, 0x47b2cf7fL, 0x30b5ffe9L,
0xbdbdf21cL, 0xcabac28aL, 0x53b39330L, 0x24b4a3a6L, 0xbad03605L,
0xcdd70693L, 0x54de5729L, 0x23d967bfL, 0xb3667a2eL, 0xc4614ab8L,
0x5d681b02L, 0x2a6f2b94L, 0xb40bbe37L, 0xc30c8ea1L, 0x5a05df1bL,
0x2d02ef8dL
};
int update_keys (unsigned long keys[3], int c)
{
int keyshift;
keys[0] = CRC32(keys[0], c);
keys[1] += keys[0] & 0xff;
keys[1] = keys[1] * 134775813L + 1;
keyshift = (int)(keys[1] >> 24);
keys[2] = CRC32(keys[2], keyshift);
return c;
}
void init_keys (unsigned long keys[3], const char *passwd)
{
keys[0] = 305419896L;
keys[1] = 591751049L;
keys[2] = 878082192L;
while (*passwd)
{
update_keys(keys, (int)*passwd);
passwd++;
}
}
int decrypt_byte (unsigned long keys[3])
{
unsigned temp; /* POTENTIAL BUG: temp*(temp^1) may overflow in an
* unpredictable manner on 16-bit systems; not a problem
* with any known compiler so far, though */
temp = ((unsigned)keys[2] & 0xffff) | 2;
return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
}
void decrypt_buf (char *buf, unsigned int bufsize, unsigned long keys[3])
{
while (bufsize--)
update_keys(keys, *buf++ ^= decrypt_byte(keys));
}
void encrypt_buf (char *buf, unsigned int bufsize, unsigned long keys[3])
{
int t;
while (bufsize--)
{
t=decrypt_byte(keys);
update_keys(keys, *buf);
*buf++ ^= t;
}
}

4
source/bforce/prot_binkp_misc.c
View File

@ -140,6 +140,7 @@ void binkp_log_options(s_binkp_sysinfo *remote)
{
if (remote->options & BINKP_OPT_MB) log ("We are in MB mode.");
if (remote->options & BINKP_OPT_NR) log ("We are in NR mode.");
if (remote->options & BINKP_OPT_CRYPT) log ("We are in CRYPT mode.");
}
/*****************************************************************************
@ -310,6 +311,9 @@ void binkp_parse_options(s_binkp_sysinfo *binkp, char *options)
if( !strcmp(p, "NR") ) {
binkp->options |= BINKP_OPT_NR;
} else
if( !strcmp(p, "CRYPT") ) {
binkp->options |= BINKP_OPT_CRYPT;
} else
if( !strcmp(p, "MB") )
binkp->options |= BINKP_OPT_MB;
else if( !strcmp(p, "MPWD") )

2
source/include/config.h
View File

@ -61,7 +61,7 @@
#define BFORCE_LOCK_DIR "/var/lock/"
/* Do you want to use syslog? */
#define USE_SYSLOG 1
/* #undef USE_SYSLOG */
/* Netspool */
#define NETSPOOL 1

11
source/include/prot_binkp.h
View File

@ -53,6 +53,7 @@
#define BINKP_OPT_MD5 0x08 /* CRAM-MD5 authentication */
#define BINKP_OPT_SHA1 0x10 /* CRAM-SHA1 authentication */
#define BINKP_OPT_DES 0x20 /* CRAM-DES authentication */
#define BINKP_OPT_CRYPT 0x40 /* CRYPT support */
typedef enum binkp_mode {
bmode_failoff,
@ -85,6 +86,8 @@ typedef struct {
bool has_TRF;
int TRF_PKT;
int TRF_other;
unsigned long keys_out[3]; /* Encription keys for outbound */
unsigned long keys_in[3]; /* Encription keys for inbound */
} s_binkp_sysinfo;
@ -180,5 +183,13 @@ int binkp_remote_traffic(s_handshake_protocol *THIS, s_traffic *dest);
/* prot_binkp_api.c */
extern s_handshake_protocol handshake_protocol_binkp;
#define CRC32(c, b) (crc_32_tab[((int)(c) ^ (b)) & 0xff] ^ ((c) >> 8))
extern unsigned long crc_32_tab[256];
int update_keys (unsigned long keys[3], int c);
void init_keys (unsigned long keys[3], const char *passwd);
int decrypt_byte (unsigned long keys[3]);
void decrypt_buf (char *buf, unsigned int bufsize, unsigned long keys[3]);
void encrypt_buf (char *buf, unsigned int bufsize, unsigned long keys[3]);
#endif /* _P_BINKP_H_ */