Permalink
Browse files

NetBSD 1.6.1

  • Loading branch information...
1 parent b244f10 commit ecc2dbb58ad8a31c1b9a1f319214bdfc00d8da79 itojun committed Apr 22, 2003
@@ -1,15 +1,22 @@
# from: @(#)Makefile 8.2 (Berkeley) 12/15/93
-# $NetBSD: Makefile,v 1.10.2.2 2000/06/24 06:59:34 thorpej Exp $
+# $NetBSD: Makefile,v 1.15 2002/03/22 18:10:21 thorpej Exp $
.include <bsd.own.mk>
+WARNS?= 1
+
LIB= telnet
SRCS= auth.c encrypt.c genget.c getent.c misc.c
CPPFLAGS+= -DHAS_CGETENT
CPPFLAGS+= -I${.CURDIR}
-.if (${MKKERBEROS} != "no")
+# XXX See doc/HACKS gcc-3-libtelnet
+.if defined(HAVE_GCC3)
+COPTS+= -O0
+.endif
+
+.if (${USE_KERBEROS} != "no")
SRCS+= enc_des.c kerberos.c
SRCS+= kerberos5.c
@@ -1,4 +1,4 @@
-/* $NetBSD: auth-proto.h,v 1.8.8.1 2001/04/05 23:25:44 he Exp $ */
+/* $NetBSD: auth-proto.h,v 1.9 2001/01/06 23:36:07 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -1,4 +1,4 @@
-/* $NetBSD: auth.c,v 1.10.4.1 2000/06/22 07:09:02 thorpej Exp $ */
+/* $NetBSD: auth.c,v 1.11 2000/06/22 06:47:42 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)auth.c 8.3 (Berkeley) 5/30/95"
#else
-__RCSID("$NetBSD: auth.c,v 1.10.4.1 2000/06/22 07:09:02 thorpej Exp $");
+__RCSID("$NetBSD: auth.c,v 1.11 2000/06/22 06:47:42 thorpej Exp $");
#endif
#endif /* not lint */
@@ -1,4 +1,4 @@
-/* $NetBSD: enc-proto.h,v 1.4.2.1 2000/06/22 07:09:02 thorpej Exp $ */
+/* $NetBSD: enc-proto.h,v 1.4 2000/06/22 06:47:42 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -1,4 +1,4 @@
-/* $NetBSD: enc_des.c,v 1.4.2.2 2001/04/05 23:25:53 he Exp $ */
+/* $NetBSD: enc_des.c,v 1.6 2001/11/30 04:44:24 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)enc_des.c 8.3 (Berkeley) 5/30/95"; */
#else
-__RCSID("$NetBSD: enc_des.c,v 1.4.2.2 2001/04/05 23:25:53 he Exp $");
+__RCSID("$NetBSD: enc_des.c,v 1.6 2001/11/30 04:44:24 lukem Exp $");
#endif
#endif /* not lint */
@@ -602,31 +602,31 @@ cfb64_encrypt(s, c)
int c;
{
register struct stinfo *stp = &fb[CFB].streams[DIR_ENCRYPT-1];
- register int index;
+ register int idx;
- index = stp->str_index;
+ idx = stp->str_index;
while (c-- > 0) {
- if (index == sizeof(Block)) {
+ if (idx == sizeof(Block)) {
Block b;
des_ecb_encrypt(&stp->str_output, &b, stp->str_sched, 1);
memmove((void *)stp->str_feed, (void *)b, sizeof(Block));
- index = 0;
+ idx = 0;
}
/* On encryption, we store (feed ^ data) which is cypher */
- *s = stp->str_output[index] = (stp->str_feed[index] ^ *s);
+ *s = stp->str_output[idx] = (stp->str_feed[idx] ^ *s);
s++;
- index++;
+ idx++;
}
- stp->str_index = index;
+ stp->str_index = idx;
}
int
cfb64_decrypt(data)
int data;
{
register struct stinfo *stp = &fb[CFB].streams[DIR_DECRYPT-1];
- int index;
+ int idx;
if (data == -1) {
/*
@@ -639,18 +639,18 @@ cfb64_decrypt(data)
return(0);
}
- index = stp->str_index++;
- if (index == sizeof(Block)) {
+ idx = stp->str_index++;
+ if (idx == sizeof(Block)) {
Block b;
des_ecb_encrypt(&stp->str_output, &b, stp->str_sched, 1);
memmove((void *)stp->str_feed, (void *)b, sizeof(Block));
stp->str_index = 1; /* Next time will be 1 */
- index = 0; /* But now use 0 */
+ idx = 0; /* But now use 0 */
}
/* On decryption we store (data) which is cypher. */
- stp->str_output[index] = data;
- return(data ^ stp->str_feed[index]);
+ stp->str_output[idx] = data;
+ return(data ^ stp->str_feed[idx]);
}
/*
@@ -678,28 +678,28 @@ ofb64_encrypt(s, c)
int c;
{
register struct stinfo *stp = &fb[OFB].streams[DIR_ENCRYPT-1];
- register int index;
+ register int idx;
- index = stp->str_index;
+ idx = stp->str_index;
while (c-- > 0) {
- if (index == sizeof(Block)) {
+ if (idx == sizeof(Block)) {
Block b;
des_ecb_encrypt(&stp->str_feed, &b, stp->str_sched, 1);
memmove((void *)stp->str_feed, (void *)b, sizeof(Block));
- index = 0;
+ idx = 0;
}
- *s++ ^= stp->str_feed[index];
- index++;
+ *s++ ^= stp->str_feed[idx];
+ idx++;
}
- stp->str_index = index;
+ stp->str_index = idx;
}
int
ofb64_decrypt(data)
int data;
{
register struct stinfo *stp = &fb[OFB].streams[DIR_DECRYPT-1];
- int index;
+ int idx;
if (data == -1) {
/*
@@ -712,16 +712,16 @@ ofb64_decrypt(data)
return(0);
}
- index = stp->str_index++;
- if (index == sizeof(Block)) {
+ idx = stp->str_index++;
+ if (idx == sizeof(Block)) {
Block b;
des_ecb_encrypt(&stp->str_feed, &b, stp->str_sched, 1);
memmove((void *)stp->str_feed, (void *)b, sizeof(Block));
stp->str_index = 1; /* Next time will be 1 */
- index = 0; /* But now use 0 */
+ idx = 0; /* But now use 0 */
}
- return(data ^ stp->str_feed[index]);
+ return(data ^ stp->str_feed[idx]);
}
# endif /* DES_ENCRYPTION */
# endif /* AUTHENTICATION */
@@ -1,4 +1,4 @@
-/* $NetBSD: encrypt.c,v 1.6.10.2 2001/04/05 23:25:47 he Exp $ */
+/* $NetBSD: encrypt.c,v 1.8 2001/01/06 23:36:36 christos Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)encrypt.c 8.2 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: encrypt.c,v 1.6.10.2 2001/04/05 23:25:47 he Exp $");
+__RCSID("$NetBSD: encrypt.c,v 1.8 2001/01/06 23:36:36 christos Exp $");
#endif /* not lint */
/*
@@ -1,4 +1,4 @@
-/* $NetBSD: encrypt.h,v 1.5.10.1 2000/06/22 07:09:03 thorpej Exp $ */
+/* $NetBSD: encrypt.h,v 1.6 2000/06/22 06:47:43 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -1,4 +1,4 @@
-/* $NetBSD: kerberos.c,v 1.4.2.2 2001/04/05 23:25:54 he Exp $ */
+/* $NetBSD: kerberos.c,v 1.6 2001/11/30 04:48:14 lukem Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)kerberos.c 8.3 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: kerberos.c,v 1.4.2.2 2001/04/05 23:25:54 he Exp $");
+__RCSID("$NetBSD: kerberos.c,v 1.6 2001/11/30 04:48:14 lukem Exp $");
#endif
#endif /* not lint */
@@ -100,7 +100,6 @@ static unsigned char str_name[1024] = { IAC, SB, TELOPT_AUTHENTICATION,
#define KRB_SERVICE_NAME "rcmd"
-static KTEXT_ST auth;
static char name[ANAME_SZ];
static AUTH_DAT adat = { 0 };
#ifdef ENCRYPTION
@@ -267,6 +266,7 @@ kerberos4_is(ap, data, cnt)
Session_Key skey;
Block datablock;
#endif /* ENCRYPTION */
+ KTEXT_ST auth;
char realm[REALM_SZ];
char instance[INST_SZ];
int r;
@@ -436,16 +436,16 @@ kerberos4_reply(ap, data, cnt)
}
int
-kerberos4_status(ap, name, level)
+kerberos4_status(ap, kname, level)
Authenticator *ap;
- char *name;
+ char *kname;
int level;
{
if (level < AUTH_USER)
return(level);
if (UserNameRequested && !kuserok(&adat, UserNameRequested)) {
- strcpy(name, UserNameRequested);
+ strcpy(kname, UserNameRequested);
return(AUTH_VALID);
} else
return(AUTH_USER);
@@ -1,4 +1,4 @@
-/* $NetBSD: kerberos5.c,v 1.4.2.3 2001/04/05 23:25:57 he Exp $ */
+/* $NetBSD: kerberos5.c,v 1.8 2001/09/17 12:34:43 assar Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -212,7 +212,7 @@ kerberos5_send(Authenticator *ap)
}
return (0);
}
- krb5_auth_setkeytype(telnet_context, auth_context, KEYTYPE_DES);
+ krb5_auth_con_setkeytype(telnet_context, auth_context, KEYTYPE_DES);
foo[0] = ap->type;
foo[1] = ap->way;
@@ -1,4 +1,4 @@
-/* $NetBSD: key-proto.h,v 1.4.2.1 2000/06/22 07:09:03 thorpej Exp $ */
+/* $NetBSD: key-proto.h,v 1.4 2000/06/22 06:47:45 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -1,4 +1,4 @@
-/* $NetBSD: krb4encpwd.c,v 1.1.2.1 2000/06/22 07:09:03 thorpej Exp $ */
+/* $NetBSD: krb4encpwd.c,v 1.1 2000/06/22 06:47:46 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)krb4encpwd.c 8.3 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: krb4encpwd.c,v 1.1.2.1 2000/06/22 07:09:03 thorpej Exp $");
+__RCSID("$NetBSD: krb4encpwd.c,v 1.1 2000/06/22 06:47:46 thorpej Exp $");
#endif
#endif /* not lint */
@@ -1,4 +1,4 @@
-/* $NetBSD: misc.c,v 1.9.4.1 2000/06/22 07:09:03 thorpej Exp $ */
+/* $NetBSD: misc.c,v 1.10 2000/06/22 06:47:46 thorpej Exp $ */
/*-
* Copyright (c) 1991, 1993
@@ -38,7 +38,7 @@
#if 0
static char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: misc.c,v 1.9.4.1 2000/06/22 07:09:03 thorpej Exp $");
+__RCSID("$NetBSD: misc.c,v 1.10 2000/06/22 06:47:46 thorpej Exp $");
#endif
#endif /* not lint */
@@ -1,5 +1,5 @@
-# $NetBSD: shlib_version,v 1.6.2.1 2001/04/05 23:25:50 he Exp $
+# $NetBSD: shlib_version,v 1.8 2001/04/12 07:48:09 itojun Exp $
# Remember to update distrib/sets/lists/base/shl.* when changing
#
-major=3
-minor=1
+major=4
+minor=0
@@ -1,4 +1,4 @@
-/* $NetBSD: spx.c,v 1.1.2.1 2000/06/22 07:09:03 thorpej Exp $ */
+/* $NetBSD: spx.c,v 1.1 2000/06/22 06:47:46 thorpej Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -39,7 +39,7 @@
#if 0
static char sccsid[] = "@(#)spx.c 8.2 (Berkeley) 5/30/95";
#else
-__RCSID("$NetBSD: spx.c,v 1.1.2.1 2000/06/22 07:09:03 thorpej Exp $");
+__RCSID("$NetBSD: spx.c,v 1.1 2000/06/22 06:47:46 thorpej Exp $");
#endif
#endif /* not lint */

0 comments on commit ecc2dbb

Please sign in to comment.