- (djm) Update spec files for new x11-askpass

- [email protected] 2001/09/28 09:49:31
     [scard.c]
     Fix segv when smartcard communication error occurs during key load.
     ok markus@

ChangeLog

@@ -1,7 +1,19 @@
+20010928
+ - (djm) OpenBSD CVS sync:
+   - [email protected] 2001/09/28 09:49:31
+     [scard.c]
+     Fix segv when smartcard communication error occurs during key load. 
+     ok markus@
+ - (djm) Update spec files for new x11-askpass
+
+20010926
+ - (djm) Disable AC_SYS_LARGEFILE, it breaks on several systems
+
 20010925
  - (djm) Pull in auth-krb5.c from OpenBSD CVS. NB. it is not currently used.
  - (djm) Sync $sysconfdir/moduli
  - (djm) Add AC_SYS_LARGEFILE configure test
+ - (djm) Avoid bad and unportable sprintf usage in compat code
 
 20010923
  - (bal) updated ssh.c to mirror minor getopts 'extern int' formating done
@@ -6568,4 +6580,4 @@
  - Wrote replacements for strlcpy and mkdtemp
  - Released 1.0pre1
 
-$Id: ChangeLog,v 1.1562 2001/09/25 06:39:35 djm Exp $
+$Id: ChangeLog,v 1.1559.2.5 2001/09/28 10:02:35 djm Exp $

TODO

@@ -91,4 +91,4 @@ Packaging:
 - HP-UX: Provide DEPOT package scripts.
   ([email protected])
 
-$Id: TODO,v 1.43 2001/09/25 03:01:49 djm Exp $
+$Id: TODO,v 1.42.2.1 2001/09/25 06:46:11 djm Exp $

configure.in

@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.314 2001/09/25 06:39:35 djm Exp $
+# $Id: configure.in,v 1.313.2.2 2001/09/25 22:39:38 djm Exp $
 
 AC_INIT(ssh.c)
 
@@ -22,7 +22,8 @@ AC_PATH_PROG(TEST_MINUS_S_SH, ksh)
 AC_PATH_PROG(TEST_MINUS_S_SH, sh)
 
 # System features
-AC_SYS_LARGEFILE
+# Disabled until it works on SCO and HPUX
+#AC_SYS_LARGEFILE
 
 if test -z "$AR" ; then
 	AC_MSG_ERROR([*** 'ar' missing, please install or fix your \$PATH ***])

contrib/caldera/openssh.spec

@@ -1,7 +1,7 @@
-%define askpass		1.2.2
+%define askpass		1.2.4.1
 
 Name        	: openssh
-Version     	: 2.9.9p1
+Version     	: 2.9.9p2
 Release     	: 3
 Group       	: System/Network
 
@@ -310,4 +310,4 @@ fi
 * Mon Jan 01 1998 ...
 Template Version: 1.31
 
-$Id: openssh.spec,v 1.19 2001/09/24 23:15:15 mouring Exp $
+$Id: openssh.spec,v 1.19.2.2 2001/09/28 10:02:36 djm Exp $

contrib/redhat/openssh.spec

@@ -1,8 +1,8 @@
 # Version of OpenSSH
-%define oversion 2.9.9p1
+%define oversion 2.9.9p2
 
 # Version of ssh-askpass
-%define aversion 1.2.4
+%define aversion 1.2.4.1
 
 # Do we want to disable building of x11-askpass? (1=yes 0=no)
 %define no_x11_askpass 0
@@ -38,7 +38,7 @@
 
 %define exact_openssl_version   %(rpm -q openssl | cut -d - -f 2)
 
-Summary: The OpenSSH implementation of SSH.
+Summary: The OpenSSH implementation of SSH protocol versions 1 and 2
 Name: openssh
 Version: %{oversion}
 Release: 1

contrib/suse/openssh.spec

@@ -1,6 +1,6 @@
-Summary: OpenSSH, a free Secure Shell (SSH) implementation
+Summary: OpenSSH, a free Secure Shell (SSH) protocol implementation
 Name: openssh
-Version: 2.9.9p1
+Version: 2.9.9p2
 URL: http://www.openssh.com/
 Release: 1
 Source0: openssh-%{version}.tar.gz

openbsd-compat/inet_ntop.c

@@ -104,7 +104,8 @@ inet_ntop4(src, dst, size)
 	static const char fmt[] = "%u.%u.%u.%u";
 	char tmp[sizeof "255.255.255.255"];
 
-	if (sprintf(tmp, fmt, src[0], src[1], src[2], src[3]) > size) {
+	if (snprintf(tmp, sizeof(tmp), fmt, src[0], src[1], src[2],
+	    src[3]) > size) {
 		errno = ENOSPC;
 		return (NULL);
 	}
@@ -190,7 +191,8 @@ inet_ntop6(src, dst, size)
 			tp += strlen(tp);
 			break;
 		}
-		tp += sprintf(tp, "%x", words[i]);
+		snprintf(tp, sizeof(tmp - (tp - tmp)), "%x", words[i]);
+		tp += strlen(tp);
 	}
 	/* Was it a trailing run of 0x00's? */
 	if (best.base != -1 && (best.base + best.len) == (IN6ADDRSZ / INT16SZ))

scard.c

@@ -24,7 +24,7 @@
 
 #include "includes.h"
 #ifdef SMARTCARD
-RCSID("$OpenBSD: scard.c,v 1.14 2001/09/17 20:22:14 markus Exp $"); 
+RCSID("$OpenBSD: scard.c,v 1.15 2001/09/28 09:49:31 djm Exp $");
 
 #include <openssl/engine.h>
 #include <sectok.h>
@@ -123,6 +123,7 @@ sc_read_pubkey(Key * k)
 	int len, sw, status = -1;
 
 	len = sw = 0;
+	n = NULL;
 
 	if (sc_fd < 0) {
 		status = sc_init();

version.h

@@ -1,3 +1,3 @@
 /* $OpenBSD: version.h,v 1.24 2001/09/24 20:31:54 markus Exp $ */
 
-#define SSH_VERSION	"OpenSSH_2.9.9p1"
+#define SSH_VERSION	"OpenSSH_2.9.9p2"