summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-12-06 16:39:56 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-12-06 16:39:56 +0000
commit70a290c5f7a6ee9e24f5ddfee1c768550780e078 (patch)
treee7020de98ea3659b72eadd766c1b7e2c71ac6b96
parent11f790bbb1fb286006aa04e78fb9965110a4af90 (diff)
- mpech@cvs.openbsd.org 2001/11/19 19:02:16
[deattack.c radix.c] kill more registers millert@ ok
-rw-r--r--ChangeLog6
-rw-r--r--deattack.c6
-rw-r--r--radix.c20
3 files changed, 18 insertions, 14 deletions
diff --git a/ChangeLog b/ChangeLog
index 7ff15b28b..a9ca5ac43 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,6 +16,10 @@
16 [ssh-agent.1] 16 [ssh-agent.1]
17 clarify/state that private keys are not exposed to clients using the 17 clarify/state that private keys are not exposed to clients using the
18 agent; ok markus@ 18 agent; ok markus@
19 - mpech@cvs.openbsd.org 2001/11/19 19:02:16
20 [deattack.c radix.c]
21 kill more registers
22 millert@ ok
19 23
2020011126 2420011126
21 - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c, 25 - (tim) [contrib/cygwin/README, openbsd-compat/bsd-cygwin_util.c,
@@ -6938,4 +6942,4 @@
6938 - Wrote replacements for strlcpy and mkdtemp 6942 - Wrote replacements for strlcpy and mkdtemp
6939 - Released 1.0pre1 6943 - Released 1.0pre1
6940 6944
6941$Id: ChangeLog,v 1.1671 2001/12/06 16:37:51 mouring Exp $ 6945$Id: ChangeLog,v 1.1672 2001/12/06 16:39:56 mouring Exp $
diff --git a/deattack.c b/deattack.c
index 1a89be4b8..44220491d 100644
--- a/deattack.c
+++ b/deattack.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: deattack.c,v 1.14 2001/06/23 15:12:18 itojun Exp $ */ 1/* $OpenBSD: deattack.c,v 1.15 2001/11/19 19:02:16 mpech Exp $ */
2 2
3/* 3/*
4 * Cryptographic attack detector for ssh - source code 4 * Cryptographic attack detector for ssh - source code
@@ -85,9 +85,9 @@ detect_attack(u_char *buf, u_int32_t len, u_char *IV)
85{ 85{
86 static u_int16_t *h = (u_int16_t *) NULL; 86 static u_int16_t *h = (u_int16_t *) NULL;
87 static u_int32_t n = HASH_MINSIZE / HASH_ENTRYSIZE; 87 static u_int32_t n = HASH_MINSIZE / HASH_ENTRYSIZE;
88 register u_int32_t i, j; 88 u_int32_t i, j;
89 u_int32_t l; 89 u_int32_t l;
90 register u_char *c; 90 u_char *c;
91 u_char *d; 91 u_char *d;
92 92
93 if (len > (SSH_MAXBLOCKS * SSH_BLOCKSIZE) || 93 if (len > (SSH_MAXBLOCKS * SSH_BLOCKSIZE) ||
diff --git a/radix.c b/radix.c
index 26b1ebe52..e60435736 100644
--- a/radix.c
+++ b/radix.c
@@ -25,7 +25,7 @@
25#include "includes.h" 25#include "includes.h"
26#include "uuencode.h" 26#include "uuencode.h"
27 27
28RCSID("$OpenBSD: radix.c,v 1.16 2001/06/23 15:12:19 itojun Exp $"); 28RCSID("$OpenBSD: radix.c,v 1.17 2001/11/19 19:02:16 mpech Exp $");
29 29
30#ifdef AFS 30#ifdef AFS
31#include <krb.h> 31#include <krb.h>
@@ -39,7 +39,7 @@ typedef u_short my_u_short;
39/* Nasty macros from BIND-4.9.2 */ 39/* Nasty macros from BIND-4.9.2 */
40 40
41#define GETSHORT(s, cp) { \ 41#define GETSHORT(s, cp) { \
42 register my_u_char *t_cp = (my_u_char *)(cp); \ 42 my_u_char *t_cp = (my_u_char *)(cp); \
43 (s) = (((my_u_short)t_cp[0]) << 8) \ 43 (s) = (((my_u_short)t_cp[0]) << 8) \
44 | (((my_u_short)t_cp[1])) \ 44 | (((my_u_short)t_cp[1])) \
45 ; \ 45 ; \
@@ -47,7 +47,7 @@ typedef u_short my_u_short;
47} 47}
48 48
49#define GETLONG(l, cp) { \ 49#define GETLONG(l, cp) { \
50 register my_u_char *t_cp = (my_u_char *)(cp); \ 50 my_u_char *t_cp = (my_u_char *)(cp); \
51 (l) = (((my_u_int32_t)t_cp[0]) << 24) \ 51 (l) = (((my_u_int32_t)t_cp[0]) << 24) \
52 | (((my_u_int32_t)t_cp[1]) << 16) \ 52 | (((my_u_int32_t)t_cp[1]) << 16) \
53 | (((my_u_int32_t)t_cp[2]) << 8) \ 53 | (((my_u_int32_t)t_cp[2]) << 8) \
@@ -57,16 +57,16 @@ typedef u_short my_u_short;
57} 57}
58 58
59#define PUTSHORT(s, cp) { \ 59#define PUTSHORT(s, cp) { \
60 register my_u_short t_s = (my_u_short)(s); \ 60 my_u_short t_s = (my_u_short)(s); \
61 register my_u_char *t_cp = (my_u_char *)(cp); \ 61 my_u_char *t_cp = (my_u_char *)(cp); \
62 *t_cp++ = t_s >> 8; \ 62 *t_cp++ = t_s >> 8; \
63 *t_cp = t_s; \ 63 *t_cp = t_s; \
64 (cp) += 2; \ 64 (cp) += 2; \
65} 65}
66 66
67#define PUTLONG(l, cp) { \ 67#define PUTLONG(l, cp) { \
68 register my_u_int32_t t_l = (my_u_int32_t)(l); \ 68 my_u_int32_t t_l = (my_u_int32_t)(l); \
69 register my_u_char *t_cp = (my_u_char *)(cp); \ 69 my_u_char *t_cp = (my_u_char *)(cp); \
70 *t_cp++ = t_l >> 24; \ 70 *t_cp++ = t_l >> 24; \
71 *t_cp++ = t_l >> 16; \ 71 *t_cp++ = t_l >> 16; \
72 *t_cp++ = t_l >> 8; \ 72 *t_cp++ = t_l >> 8; \
@@ -75,9 +75,9 @@ typedef u_short my_u_short;
75} 75}
76 76
77#define GETSTRING(s, p, p_l) { \ 77#define GETSTRING(s, p, p_l) { \
78 register char *p_targ = (p) + p_l; \ 78 char *p_targ = (p) + p_l; \
79 register char *s_c = (s); \ 79 char *s_c = (s); \
80 register char *p_c = (p); \ 80 char *p_c = (p); \
81 while (*p_c && (p_c < p_targ)) { \ 81 while (*p_c && (p_c < p_targ)) { \
82 *s_c++ = *p_c++; \ 82 *s_c++ = *p_c++; \
83 } \ 83 } \