- mpech@cvs.openbsd.org 2001/11/19 19:02:16
[deattack.c radix.c] kill more registers millert@ ok
This commit is contained in:
parent
11f790bbb1
commit
70a290c5f7
|
@ -16,6 +16,10 @@
|
||||||
[ssh-agent.1]
|
[ssh-agent.1]
|
||||||
clarify/state that private keys are not exposed to clients using the
|
clarify/state that private keys are not exposed to clients using the
|
||||||
agent; ok markus@
|
agent; ok markus@
|
||||||
|
- mpech@cvs.openbsd.org 2001/11/19 19:02:16
|
||||||
|
[deattack.c radix.c]
|
||||||
|
kill more registers
|
||||||
|
millert@ ok
|
||||||
|
|
||||||
20011126
|
20011126
|
||||||
- (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,
|
- (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,
|
||||||
|
@ -6938,4 +6942,4 @@
|
||||||
- Wrote replacements for strlcpy and mkdtemp
|
- Wrote replacements for strlcpy and mkdtemp
|
||||||
- Released 1.0pre1
|
- Released 1.0pre1
|
||||||
|
|
||||||
$Id: ChangeLog,v 1.1671 2001/12/06 16:37:51 mouring Exp $
|
$Id: ChangeLog,v 1.1672 2001/12/06 16:39:56 mouring Exp $
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
/* $OpenBSD: deattack.c,v 1.14 2001/06/23 15:12:18 itojun Exp $ */
|
/* $OpenBSD: deattack.c,v 1.15 2001/11/19 19:02:16 mpech Exp $ */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Cryptographic attack detector for ssh - source code
|
* Cryptographic attack detector for ssh - source code
|
||||||
|
@ -85,9 +85,9 @@ detect_attack(u_char *buf, u_int32_t len, u_char *IV)
|
||||||
{
|
{
|
||||||
static u_int16_t *h = (u_int16_t *) NULL;
|
static u_int16_t *h = (u_int16_t *) NULL;
|
||||||
static u_int32_t n = HASH_MINSIZE / HASH_ENTRYSIZE;
|
static u_int32_t n = HASH_MINSIZE / HASH_ENTRYSIZE;
|
||||||
register u_int32_t i, j;
|
u_int32_t i, j;
|
||||||
u_int32_t l;
|
u_int32_t l;
|
||||||
register u_char *c;
|
u_char *c;
|
||||||
u_char *d;
|
u_char *d;
|
||||||
|
|
||||||
if (len > (SSH_MAXBLOCKS * SSH_BLOCKSIZE) ||
|
if (len > (SSH_MAXBLOCKS * SSH_BLOCKSIZE) ||
|
||||||
|
|
20
radix.c
20
radix.c
|
@ -25,7 +25,7 @@
|
||||||
#include "includes.h"
|
#include "includes.h"
|
||||||
#include "uuencode.h"
|
#include "uuencode.h"
|
||||||
|
|
||||||
RCSID("$OpenBSD: radix.c,v 1.16 2001/06/23 15:12:19 itojun Exp $");
|
RCSID("$OpenBSD: radix.c,v 1.17 2001/11/19 19:02:16 mpech Exp $");
|
||||||
|
|
||||||
#ifdef AFS
|
#ifdef AFS
|
||||||
#include <krb.h>
|
#include <krb.h>
|
||||||
|
@ -39,7 +39,7 @@ typedef u_short my_u_short;
|
||||||
/* Nasty macros from BIND-4.9.2 */
|
/* Nasty macros from BIND-4.9.2 */
|
||||||
|
|
||||||
#define GETSHORT(s, cp) { \
|
#define GETSHORT(s, cp) { \
|
||||||
register my_u_char *t_cp = (my_u_char *)(cp); \
|
my_u_char *t_cp = (my_u_char *)(cp); \
|
||||||
(s) = (((my_u_short)t_cp[0]) << 8) \
|
(s) = (((my_u_short)t_cp[0]) << 8) \
|
||||||
| (((my_u_short)t_cp[1])) \
|
| (((my_u_short)t_cp[1])) \
|
||||||
; \
|
; \
|
||||||
|
@ -47,7 +47,7 @@ typedef u_short my_u_short;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define GETLONG(l, cp) { \
|
#define GETLONG(l, cp) { \
|
||||||
register my_u_char *t_cp = (my_u_char *)(cp); \
|
my_u_char *t_cp = (my_u_char *)(cp); \
|
||||||
(l) = (((my_u_int32_t)t_cp[0]) << 24) \
|
(l) = (((my_u_int32_t)t_cp[0]) << 24) \
|
||||||
| (((my_u_int32_t)t_cp[1]) << 16) \
|
| (((my_u_int32_t)t_cp[1]) << 16) \
|
||||||
| (((my_u_int32_t)t_cp[2]) << 8) \
|
| (((my_u_int32_t)t_cp[2]) << 8) \
|
||||||
|
@ -57,16 +57,16 @@ typedef u_short my_u_short;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define PUTSHORT(s, cp) { \
|
#define PUTSHORT(s, cp) { \
|
||||||
register my_u_short t_s = (my_u_short)(s); \
|
my_u_short t_s = (my_u_short)(s); \
|
||||||
register my_u_char *t_cp = (my_u_char *)(cp); \
|
my_u_char *t_cp = (my_u_char *)(cp); \
|
||||||
*t_cp++ = t_s >> 8; \
|
*t_cp++ = t_s >> 8; \
|
||||||
*t_cp = t_s; \
|
*t_cp = t_s; \
|
||||||
(cp) += 2; \
|
(cp) += 2; \
|
||||||
}
|
}
|
||||||
|
|
||||||
#define PUTLONG(l, cp) { \
|
#define PUTLONG(l, cp) { \
|
||||||
register my_u_int32_t t_l = (my_u_int32_t)(l); \
|
my_u_int32_t t_l = (my_u_int32_t)(l); \
|
||||||
register my_u_char *t_cp = (my_u_char *)(cp); \
|
my_u_char *t_cp = (my_u_char *)(cp); \
|
||||||
*t_cp++ = t_l >> 24; \
|
*t_cp++ = t_l >> 24; \
|
||||||
*t_cp++ = t_l >> 16; \
|
*t_cp++ = t_l >> 16; \
|
||||||
*t_cp++ = t_l >> 8; \
|
*t_cp++ = t_l >> 8; \
|
||||||
|
@ -75,9 +75,9 @@ typedef u_short my_u_short;
|
||||||
}
|
}
|
||||||
|
|
||||||
#define GETSTRING(s, p, p_l) { \
|
#define GETSTRING(s, p, p_l) { \
|
||||||
register char *p_targ = (p) + p_l; \
|
char *p_targ = (p) + p_l; \
|
||||||
register char *s_c = (s); \
|
char *s_c = (s); \
|
||||||
register char *p_c = (p); \
|
char *p_c = (p); \
|
||||||
while (*p_c && (p_c < p_targ)) { \
|
while (*p_c && (p_c < p_targ)) { \
|
||||||
*s_c++ = *p_c++; \
|
*s_c++ = *p_c++; \
|
||||||
} \
|
} \
|
||||||
|
|
Loading…
Reference in New Issue