d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add support for 56 bit MPPE encryption.

Browse Source 
MFC after:	3 days
This commit is contained in:
Archie Cobbs 2001-12-15 02:07:32 +00:00
parent 8754b1ac25
commit 34fd23818a
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=87971
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
sys/netgraph/ng_mppc.c
View File

@ -164,7 +164,7 @@ static struct ng_type ng_mppc_typestruct = {
};
NETGRAPH_INIT(mppc, &ng_mppc_typestruct);
/* Fixed bit pattern to weaken keysize down to 40 bits */
/* Fixed bit pattern to weaken keysize down to 40 or 56 bits */
static const u_char ng_mppe_weakenkey[3] = { 0xd1, 0x26, 0x9e };
#define ERROUT(x) do { error = (x); goto done; } while (0)
@ -295,10 +295,10 @@ ng_mppc_rcvmsg(node_p node, item_p item, hook_p lasthook)
bcopy(cfg->startkey, d->key, keylen);
ng_mppc_getkey(cfg->startkey, d->key, keylen);
if ((cfg->bits & MPPE_128) == 0) {
bcopy(&ng_mppe_weakenkey, d->key,
sizeof(ng_mppe_weakenkey));
}
if ((cfg->bits & MPPE_40) != 0)
bcopy(&ng_mppe_weakenkey, d->key, 3);
else if ((cfg->bits & MPPE_56) != 0)
bcopy(&ng_mppe_weakenkey, d->key, 1);
rc4_init(&d->rc4, d->key, keylen);
}
#endif
@ -779,8 +779,10 @@ ng_mppc_updatekey(u_int32_t bits,
ng_mppc_getkey(key0, key, keylen);
rc4_init(rc4, key, keylen);
rc4_crypt(rc4, key, key, keylen);
if ((bits & MPPE_128) == 0)
bcopy(&ng_mppe_weakenkey, key, sizeof(ng_mppe_weakenkey));
if ((bits & MPPE_40) != 0)
bcopy(&ng_mppe_weakenkey, key, 3);
else if ((bits & MPPE_56) != 0)
bcopy(&ng_mppe_weakenkey, key, 1);
rc4_init(rc4, key, keylen);
}

5
sys/netgraph/ng_mppc.h
View File

@ -60,10 +60,11 @@
/* MPPC/MPPE PPP negotiation bits */
#define MPPC_BIT 0x00000001 /* mppc compression bits */
#define MPPE_40 0x00000020 /* use 40 bit key */
#define MPPE_56 0x00000080 /* use 56 bit key */
#define MPPE_128 0x00000040 /* use 128 bit key */
#define MPPE_BITS 0x00000060 /* mppe encryption bits */
#define MPPE_BITS 0x000000e0 /* mppe encryption bits */
#define MPPE_STATELESS 0x01000000 /* use stateless mode */
#define MPPC_VALID_BITS 0x01000061 /* possibly valid bits */
#define MPPC_VALID_BITS 0x010000e1 /* possibly valid bits */
/* Config struct (per-direction) */
struct ng_mppc_config {