[joerg@crater.dragonflybsd.org: cvs commit: src/usr.sbin/keyserv Makefile setkey.c src/secure/libexec/telnetd Makefile src/secure/usr.bin/telnet Makefile src/kerberos5/libexec/telnetd Makefile src/kerberos5/usr.bin/telnet Makefile src/crypto/telnet/libtel

[Michal Belczyk <belczyk@xxxxxxxxxxxxx>]

The commits below broke telnetd for me, at least when I try to login
from any of FreeBSD (5) machines I have here (telnetd on DragonFly
crashes).

Patch:

Index: crypto/telnet/libtelnet/pk.c
===================================================================
RCS file: /home/dcvs/src/crypto/telnet/libtelnet/pk.c,v
retrieving revision 1.3
diff -u -r1.3 pk.c
--- crypto/telnet/libtelnet/pk.c	11 Jan 2005 13:22:41 -0000	1.3
+++ crypto/telnet/libtelnet/pk.c	17 Jul 2005 16:39:11 -0000
@@ -125,7 +125,7 @@
 void
 common_key(char *xsecret, char *xpublic, IdeaData *ideakey, DesData *deskey)
 {
-        BIGNUM *public, *secret, *common, *modulus;
+        BIGNUM *public = NULL, *secret = NULL, *common, *modulus = NULL;
 	BN_CTX *ctx;
 
 	if ((ctx = BN_CTX_new()) == NULL)
Index: usr.sbin/keyserv/setkey.c
===================================================================
RCS file: /home/dcvs/src/usr.sbin/keyserv/setkey.c,v
retrieving revision 1.8
diff -u -r1.8 setkey.c
--- usr.sbin/keyserv/setkey.c	11 Jan 2005 13:22:40 -0000	1.8
+++ usr.sbin/keyserv/setkey.c	17 Jul 2005 17:17:16 -0000
@@ -153,7 +153,7 @@
 	char xsecret_hold[1024];
 	des_block deskey;
 	int error;
-	BIGNUM *public, *secret, *common;
+	BIGNUM *public = NULL, *secret = NULL, *common;
 	BN_CTX *ctx;
 	char zero[8];
 
@@ -219,7 +219,7 @@
 {
 	char *xsecret;
 	char xsecret_hold[1024];
-	BIGNUM *public, *secret, *common;
+	BIGNUM *public = NULL, *secret = NULL, *common;
 	BN_CTX *ctx;
 	char zero[8];
 

----- Forwarded message from Joerg Sonnenberger <joerg@xxxxxxxxxxxxxxxxxxxxxxx> -----

From: Joerg Sonnenberger <joerg@xxxxxxxxxxxxxxxxxxxxxxx>
Date: Tue, 11 Jan 2005 05:22:41 -0800 (PST)
Subject: cvs commit: src/usr.sbin/keyserv Makefile setkey.c
         src/secure/libexec/telnetd Makefile src/secure/usr.bin/telnet
         Makefile src/kerberos5/libexec/telnetd Makefile
         src/kerberos5/usr.bin/telnet Makefile src/crypto/telnet/libtelnet ...

joerg       2005/01/11 05:22:41 PST

DragonFly src repository

  Modified files:
    usr.sbin/keyserv     Makefile setkey.c 
    secure/libexec/telnetd Makefile 
    secure/usr.bin/telnet Makefile 
    kerberos5/libexec/telnetd Makefile 
    kerberos5/usr.bin/telnet Makefile 
    crypto/telnet/libtelnet pk.c 
  Log:
  Convert to keyserv, telnetd and telnet to libcrypto's BIGNUM
  implementatation.
  
  Revision  Changes    Path
  1.4       +3 -2      src/usr.sbin/keyserv/Makefile
  1.8       +70 -44    src/usr.sbin/keyserv/setkey.c
  1.3       +3 -4      src/secure/libexec/telnetd/Makefile
  1.3       +3 -3      src/secure/usr.bin/telnet/Makefile
  1.4       +2 -2      src/kerberos5/libexec/telnetd/Makefile
  1.4       +2 -2      src/kerberos5/usr.bin/telnet/Makefile
  1.3       +128 -78   src/crypto/telnet/libtelnet/pk.c


http://www.dragonflybsd.org/cvsweb/src/usr.sbin/keyserv/Makefile.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/usr.sbin/keyserv/setkey.c.diff?r1=1.7&r2=1.8&f=u
http://www.dragonflybsd.org/cvsweb/src/secure/libexec/telnetd/Makefile.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/secure/usr.bin/telnet/Makefile.diff?r1=1.2&r2=1.3&f=u
http://www.dragonflybsd.org/cvsweb/src/kerberos5/libexec/telnetd/Makefile.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/kerberos5/usr.bin/telnet/Makefile.diff?r1=1.3&r2=1.4&f=u
http://www.dragonflybsd.org/cvsweb/src/crypto/telnet/libtelnet/pk.c.diff?r1=1.2&r2=1.3&f=u

----- End forwarded message -----

-- 
Michal Belczyk