NetBSD Problem Report #45805

From www@NetBSD.org  Mon Jan  9 09:21:49 2012
Return-Path: <www@NetBSD.org>
Received: from mail.netbsd.org (mail.netbsd.org [204.152.190.11])
	by www.NetBSD.org (Postfix) with ESMTP id 64AA463B8F3
	for <gnats-bugs@gnats.NetBSD.org>; Mon,  9 Jan 2012 09:21:49 +0000 (UTC)
Message-Id: <20120109092148.843CA63B8E0@www.NetBSD.org>
Date: Mon,  9 Jan 2012 09:21:48 +0000 (UTC)
From: onborodin@gmail.com
Reply-To: onborodin@gmail.com
To: gnats-bugs@NetBSD.org
Subject: telnet/telnetd with -DAUTHENTICATION -DENCRYPTION (rfc2941)
X-Send-Pr-Version: www-1.0

>Number:         45805
>Category:       bin
>Synopsis:       telnet/telnetd with -DAUTHENTICATION -DENCRYPTION (rfc2941)
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    christos
>State:          closed
>Class:          change-request
>Submitter-Id:   net
>Arrival-Date:   Mon Jan 09 09:25:00 +0000 2012
>Closed-Date:    Sat Jun 30 21:36:08 +0000 2012
>Last-Modified:  Sat Jun 30 21:36:08 +0000 2012
>Originator:     Borodin Oleg
>Release:        NetBSD 5.1
>Organization:
Greenwood Corp.
>Environment:
NetBSD zeenet.home 5.1 NetBSD 5.1 (ZEE) #1: Sun Jan  8 22:29:40 EET 2012  ziggi@zeenet.home:/usr/src/sys/arch/i386/compile/ZEE i386

>Description:

Build telnet/telnetd  with SRA/RSA/DES auth/enc (compilation option -DAUTHENTICATION -DENCRYPTION)

I cross tested, it work ok. 

# uname -a
FreeBSD zee.home 9.0-RC2 FreeBSD 9.0-RC2 #0 r227981: Sat Nov 26 00:27:21 FET 2011     root@zee.home:/usr/obj/data/bsd9src/sys/ZEE2  i386

# telnet 192.168.55.12
Trying 192.168.55.12...
Connected to 192.168.55.12.
Escape character is '^]'.
Trying SRA secure login:
User (root): ziggi
Password: 
[ SRA accepts you ]

NetBSD/i386 (zeenet.home) (pts/4)

Last login: Mon Jan  9 12:29:06 2012 from zee on pts/4
Copyright (c) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
    2006, 2007, 2008, 2009, 2010
    The NetBSD Foundation, Inc.  All rights reserved.
Copyright (c) 1982, 1986, 1989, 1991, 1993
    The Regents of the University of California.  All rights reserved.

NetBSD 5.1 (ZEE) #1: Sun Jan 8 22:29:40 EET 2012

bash$ 

>How-To-Repeat:

>Fix:
--- ./lib/libtelnet/Makefile.orig       2008-08-29 03:02:22.000000000 +0300
+++ ./lib/libtelnet/Makefile    2012-01-09 12:08:20.000000000 +0200
@@ -15,6 +15,12 @@
 CPPFLAGS+= -DHAS_CGETENT
 CPPFLAGS+= -I${.CURDIR}

+
+SRCS+=  enc_des.c
+CPPFLAGS+= -DENCRYPTION -DAUTHENTICATION
+CPPFLAGS+= -DDES_ENCRYPTION
+
+
 .if (${USE_KERBEROS} != "no")
 SRCS+= enc_des.c
 CPPFLAGS+= -DENCRYPTION -DAUTHENTICATION
@@ -34,6 +40,13 @@
 .for f in auth enc_des kerberos5 pk
 COPTS.${f}.c+=  -Wno-pointer-sign
 .endfor
+
+.else # USE_KERBEROS = no
+
+CPPFLAGS+= -DENCRYPTION -DAUTHENTICATION
+CPPFLAGS+= -DDES_ENCRYPTION
+SRCS+=  enc_des.c
+
 .endif

 .include <bsd.lib.mk>


--- ./libexec/telnetd/Makefile.orig     2006-03-20 06:03:23.000000000 +0200
+++ ./libexec/telnetd/Makefile  2012-01-09 12:13:33.000000000 +0200
@@ -34,6 +35,17 @@
 LDADD+=         -ldes -lcom_err -L${VERS} -lvers -lroken
 DPADD+=        ${LIBDES} ${LIBCOM_ERR} ${LIBROKEN}

+.else
+
+CPPFLAGS+= -DAUTHENTICATION -DENCRYPTION
+LDADD+= -lcrypto -lcrypt -ldes
+DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
+
+.if (${USE_PAM} != "no")
+LDADD+= -lpam ${PAM_STATIC_LDADD}
+DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
+.endif
+
 .endif

 .include <bsd.prog.mk>
--- ./usr.bin/telnet/Makefile.orig      2012-01-09 13:05:17.000000000 +0200
+++ ./usr.bin/telnet/Makefile   2012-01-09 12:11:52.000000000 +0200
@@ -73,6 +73,20 @@

 LDADD+= -ldes -lcom_err -lroken
 DPADD+=        ${LIBDES} ${LIBCOM_ERR} ${LIBROKEN}
+
+.else #USE_KERBEROS
+
+
+CPPFLAGS+= -DAUTHENTICATION -DENCRYPTION
+LDADD+= -lcrypto -lcrypt -ldes
+DPADD+= ${LIBCRYPTO} ${LIBCRYPT}
+
+.if (${USE_PAM} != "no")
+LDADD+= -lpam ${PAM_STATIC_LDADD}
+DPADD+= ${LIBPAM} ${PAM_STATIC_DPADD}
+.endif
+
+
 .endif


>Release-Note:

>Audit-Trail:
From: "Christos Zoulas" <christos@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/45805 CVS commit: src/lib/libtelnet
Date: Mon, 9 Jan 2012 10:25:34 -0500

 Module Name:	src
 Committed By:	christos
 Date:		Mon Jan  9 15:25:34 UTC 2012

 Modified Files:
 	src/lib/libtelnet: Makefile auth.c enc-proto.h enc_des.c encrypt.c
 	    encrypt.h genget.c kerberos5.c misc.h sra.c

 Log Message:
 PR/45805: Borodin Oleg: telnet/telnetd with -DAUTHENTICATION -DENCRYPTION
 (rfc2941)
 - minimal fixes to compile with WARNS=4
 - separate kerberos (USE_KERBEROS) from encryption (MKCRYPTO)


 To generate a diff of this commit:
 cvs rdiff -u -r1.33 -r1.34 src/lib/libtelnet/Makefile
 cvs rdiff -u -r1.19 -r1.20 src/lib/libtelnet/auth.c
 cvs rdiff -u -r1.8 -r1.9 src/lib/libtelnet/enc-proto.h \
     src/lib/libtelnet/encrypt.h src/lib/libtelnet/misc.h
 cvs rdiff -u -r1.14 -r1.15 src/lib/libtelnet/enc_des.c
 cvs rdiff -u -r1.15 -r1.16 src/lib/libtelnet/encrypt.c
 cvs rdiff -u -r1.11 -r1.12 src/lib/libtelnet/genget.c
 cvs rdiff -u -r1.18 -r1.19 src/lib/libtelnet/kerberos5.c
 cvs rdiff -u -r1.10 -r1.11 src/lib/libtelnet/sra.c

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

Responsible-Changed-From-To: bin-bug-people->christos
Responsible-Changed-By: wiz@NetBSD.org
Responsible-Changed-When: Mon, 09 Jan 2012 15:42:52 +0000
Responsible-Changed-Why:
christos committed something.


State-Changed-From-To: open->feedback
State-Changed-By: wiz@NetBSD.org
State-Changed-When: Mon, 09 Jan 2012 15:42:52 +0000
State-Changed-Why:
Ok to close?


From: "Christos Zoulas" <christos@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/45805 CVS commit: src/usr.bin/telnet
Date: Mon, 9 Jan 2012 11:08:56 -0500

 Module Name:	src
 Committed By:	christos
 Date:		Mon Jan  9 16:08:56 UTC 2012

 Modified Files:
 	src/usr.bin/telnet: Makefile authenc.c commands.c externs.h main.c
 	    sys_bsd.c telnet.c utilities.c

 Log Message:
 PR/45805: Borodin Oleg: telnet/telnetd with -DAUTHENTICATION -DENCRYPTION
 (rfc2941)
 - Minimal diffs to separate MKCRYPTO from USE_KERBEROS


 To generate a diff of this commit:
 cvs rdiff -u -r1.48 -r1.49 src/usr.bin/telnet/Makefile
 cvs rdiff -u -r1.12 -r1.13 src/usr.bin/telnet/authenc.c
 cvs rdiff -u -r1.67 -r1.68 src/usr.bin/telnet/commands.c
 cvs rdiff -u -r1.35 -r1.36 src/usr.bin/telnet/externs.h
 cvs rdiff -u -r1.27 -r1.28 src/usr.bin/telnet/main.c
 cvs rdiff -u -r1.32 -r1.33 src/usr.bin/telnet/sys_bsd.c
 cvs rdiff -u -r1.34 -r1.35 src/usr.bin/telnet/telnet.c
 cvs rdiff -u -r1.22 -r1.23 src/usr.bin/telnet/utilities.c

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

From: "Christos Zoulas" <christos@netbsd.org>
To: gnats-bugs@gnats.NetBSD.org
Cc: 
Subject: PR/45805 CVS commit: src/libexec/telnetd
Date: Mon, 9 Jan 2012 11:36:48 -0500

 Module Name:	src
 Committed By:	christos
 Date:		Mon Jan  9 16:36:48 UTC 2012

 Modified Files:
 	src/libexec/telnetd: Makefile ext.h state.c sys_term.c telnetd.c
 	    utility.c

 Log Message:
 PR/45805: Borodin Oleg: telnet/telnetd with -DAUTHENTICATION -DENCRYPTION
 (rfc2941)
 - separate MKCRYPTO from USE_KERBEROS
 - WARNS=4


 To generate a diff of this commit:
 cvs rdiff -u -r1.48 -r1.49 src/libexec/telnetd/Makefile
 cvs rdiff -u -r1.20 -r1.21 src/libexec/telnetd/ext.h
 cvs rdiff -u -r1.28 -r1.29 src/libexec/telnetd/state.c
 cvs rdiff -u -r1.44 -r1.45 src/libexec/telnetd/sys_term.c
 cvs rdiff -u -r1.52 -r1.53 src/libexec/telnetd/telnetd.c
 cvs rdiff -u -r1.31 -r1.32 src/libexec/telnetd/utility.c

 Please note that diffs are not public domain; they are subject to the
 copyright notices on the relevant files.

State-Changed-From-To: feedback->closed
State-Changed-By: dholland@NetBSD.org
State-Changed-When: Sat, 30 Jun 2012 21:36:08 +0000
State-Changed-Why:
Fixed. The change will be in netbsd-6.


>Unformatted:

Home	PR Database Search