From ef4c4e0df77edc72cee078a7e288781be7610ddf Mon Sep 17 00:00:00 2001 From: markm Date: Tue, 30 Jul 1996 21:09:48 +0000 Subject: [PATCH] Some breakeages sneaked in. This fixes them. (this relates to a name change in a library that was not properly backed up by the author) Reported by: too mant :-( --- eBones/lib/libtelnet/encrypt.h | 2 +- eBones/lib/libtelnet/krb4encpwd.c | 1 - eBones/lib/libtelnet/spx.c | 1 - secure/lib/libdes/new_rkey.c | 5 ++--- secure/lib/libtelnet/encrypt.h | 2 +- secure/lib/libtelnet/krb4encpwd.c | 1 - secure/lib/libtelnet/spx.c | 1 - 7 files changed, 4 insertions(+), 9 deletions(-) diff --git a/eBones/lib/libtelnet/encrypt.h b/eBones/lib/libtelnet/encrypt.h index e0ae385f13f3..1c942dc6e7e8 100644 --- a/eBones/lib/libtelnet/encrypt.h +++ b/eBones/lib/libtelnet/encrypt.h @@ -62,7 +62,7 @@ typedef unsigned char Block[8]; typedef unsigned char *BlockT; -typedef struct { Block _; } Schedule[16]; +typedef struct { Block __; } Schedule[16]; #define VALIDKEY(key) ( key[0] | key[1] | key[2] | key[3] | \ key[4] | key[5] | key[6] | key[7]) diff --git a/eBones/lib/libtelnet/krb4encpwd.c b/eBones/lib/libtelnet/krb4encpwd.c index 00f32e8532b9..5c484c288cd0 100644 --- a/eBones/lib/libtelnet/krb4encpwd.c +++ b/eBones/lib/libtelnet/krb4encpwd.c @@ -115,7 +115,6 @@ static AUTH_DAT adat = { 0 }; #ifdef ENCRYPTION static Block session_key = { 0 }; #endif /* ENCRYPTION */ -static Schedule sched; static char challenge[REALM_SZ]; static int diff --git a/eBones/lib/libtelnet/spx.c b/eBones/lib/libtelnet/spx.c index 5b625c7cfad2..40260307cef6 100644 --- a/eBones/lib/libtelnet/spx.c +++ b/eBones/lib/libtelnet/spx.c @@ -101,7 +101,6 @@ static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION, #ifdef ENCRYPTION static Block session_key = { 0 }; #endif /* ENCRYPTION */ -static Schedule sched; static Block challenge = { 0 }; diff --git a/secure/lib/libdes/new_rkey.c b/secure/lib/libdes/new_rkey.c index f84ea670baa5..cd3e0102ad17 100644 --- a/secure/lib/libdes/new_rkey.c +++ b/secure/lib/libdes/new_rkey.c @@ -77,7 +77,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: new_rkey.c,v 1.1.1.3 1996/07/29 17:54:29 markm Exp $ + * $Id$ */ /* 21-Nov-95 - eay - I've finally put this into libdes, I have made a @@ -161,9 +161,8 @@ des_new_random_key(new_key) * to a truly nasty sequence using system * supplied volatile variables. */ -/* Name shortened for VMS - there is a macro for the old name */ void -des_init_random_num_generator(key) +des_init_random_number_generator(key) des_cblock *key; { /* 64-bit structures */ diff --git a/secure/lib/libtelnet/encrypt.h b/secure/lib/libtelnet/encrypt.h index e0ae385f13f3..1c942dc6e7e8 100644 --- a/secure/lib/libtelnet/encrypt.h +++ b/secure/lib/libtelnet/encrypt.h @@ -62,7 +62,7 @@ typedef unsigned char Block[8]; typedef unsigned char *BlockT; -typedef struct { Block _; } Schedule[16]; +typedef struct { Block __; } Schedule[16]; #define VALIDKEY(key) ( key[0] | key[1] | key[2] | key[3] | \ key[4] | key[5] | key[6] | key[7]) diff --git a/secure/lib/libtelnet/krb4encpwd.c b/secure/lib/libtelnet/krb4encpwd.c index 00f32e8532b9..5c484c288cd0 100644 --- a/secure/lib/libtelnet/krb4encpwd.c +++ b/secure/lib/libtelnet/krb4encpwd.c @@ -115,7 +115,6 @@ static AUTH_DAT adat = { 0 }; #ifdef ENCRYPTION static Block session_key = { 0 }; #endif /* ENCRYPTION */ -static Schedule sched; static char challenge[REALM_SZ]; static int diff --git a/secure/lib/libtelnet/spx.c b/secure/lib/libtelnet/spx.c index 5b625c7cfad2..40260307cef6 100644 --- a/secure/lib/libtelnet/spx.c +++ b/secure/lib/libtelnet/spx.c @@ -101,7 +101,6 @@ static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION, #ifdef ENCRYPTION static Block session_key = { 0 }; #endif /* ENCRYPTION */ -static Schedule sched; static Block challenge = { 0 };