Module Name: src Committed By: christos Date: Mon Nov 22 22:19:54 UTC 2010
Modified Files: src/crypto/external/bsd/openssh/bin/ssh: Makefile src/crypto/external/bsd/openssh/bin/sshd: Makefile src/crypto/external/bsd/openssh/dist: roaming.h roaming_client.c roaming_common.c src/crypto/external/bsd/openssh/lib: Makefile shlib_version Log Message: - Remove ifdefs for roaming support, and enable by default - Put roaming_dummy.c in libssh.a to satisfy linking needs for most programs other than ssh and sshd. ssh and sshd override the shared library (and static library) functions by linking in their own copy of the roaming functions. - Bump libssh major. - Fix compilation issue in evp hash buffer. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/bin/ssh/Makefile cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/bin/sshd/Makefile cvs rdiff -u -r1.2 -r1.3 src/crypto/external/bsd/openssh/dist/roaming.h \ src/crypto/external/bsd/openssh/dist/roaming_client.c cvs rdiff -u -r1.4 -r1.5 \ src/crypto/external/bsd/openssh/dist/roaming_common.c cvs rdiff -u -r1.5 -r1.6 src/crypto/external/bsd/openssh/lib/Makefile cvs rdiff -u -r1.4 -r1.5 src/crypto/external/bsd/openssh/lib/shlib_version Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/crypto/external/bsd/openssh/bin/ssh/Makefile diff -u src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.2 src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.3 --- src/crypto/external/bsd/openssh/bin/ssh/Makefile:1.2 Sun Nov 21 14:19:22 2010 +++ src/crypto/external/bsd/openssh/bin/ssh/Makefile Mon Nov 22 17:19:53 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/11/21 19:19:22 adam Exp $ +# $NetBSD: Makefile,v 1.3 2010/11/22 22:19:53 christos Exp $ .include <bsd.own.mk> @@ -7,7 +7,7 @@ PROG= ssh SRCS= ssh.c readconf.c clientloop.c sshtty.c \ sshconnect.c sshconnect1.c sshconnect2.c mux.c \ - roaming_client.c + roaming_common.c roaming_client.c COPTS.sshconnect1.c= -fno-strict-aliasing .if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC) Index: src/crypto/external/bsd/openssh/bin/sshd/Makefile diff -u src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.2 src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.3 --- src/crypto/external/bsd/openssh/bin/sshd/Makefile:1.2 Sun Nov 21 14:19:23 2010 +++ src/crypto/external/bsd/openssh/bin/sshd/Makefile Mon Nov 22 17:19:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2010/11/21 19:19:23 adam Exp $ +# $NetBSD: Makefile,v 1.3 2010/11/22 22:19:54 christos Exp $ .include <bsd.own.mk> @@ -14,7 +14,8 @@ auth-skey.c auth-bsdauth.c auth2-hostbased.c auth2-kbdint.c \ auth2-none.c auth2-passwd.c auth2-pubkey.c \ monitor_mm.c monitor.c monitor_wrap.c \ - kexdhs.c kexgexs.c sftp-server.c sftp-common.c auth2-jpake.c + kexdhs.c kexgexs.c sftp-server.c sftp-common.c auth2-jpake.c \ + roaming_common.c roaming_serv.c .if (defined(HAVE_GCC) && ${HAVE_GCC} == 4) || defined(HAVE_PCC) COPTS.auth-options.c= -Wno-pointer-sign Index: src/crypto/external/bsd/openssh/dist/roaming.h diff -u src/crypto/external/bsd/openssh/dist/roaming.h:1.2 src/crypto/external/bsd/openssh/dist/roaming.h:1.3 --- src/crypto/external/bsd/openssh/dist/roaming.h:1.2 Sun Nov 21 13:59:04 2010 +++ src/crypto/external/bsd/openssh/dist/roaming.h Mon Nov 22 17:19:54 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: roaming.h,v 1.2 2010/11/21 18:59:04 adam Exp $ */ +/* $NetBSD: roaming.h,v 1.3 2010/11/22 22:19:54 christos Exp $ */ /* $OpenBSD: roaming.h,v 1.5 2009/10/24 11:11:58 andreas Exp $ */ /* * Copyright (c) 2004-2009 AppGate Network Security AB @@ -29,9 +29,7 @@ int get_snd_buf_size(void); int get_recv_buf_size(void); void add_recv_bytes(u_int64_t); -#ifdef ROAMING_RECONNECT int wait_for_roaming_reconnect(void); -#endif void roaming_reply(int, u_int32_t, void *); void set_out_buffer_size(size_t); ssize_t roaming_write(int, const void *, size_t, int *); Index: src/crypto/external/bsd/openssh/dist/roaming_client.c diff -u src/crypto/external/bsd/openssh/dist/roaming_client.c:1.2 src/crypto/external/bsd/openssh/dist/roaming_client.c:1.3 --- src/crypto/external/bsd/openssh/dist/roaming_client.c:1.2 Sun Nov 21 13:59:04 2010 +++ src/crypto/external/bsd/openssh/dist/roaming_client.c Mon Nov 22 17:19:54 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: roaming_client.c,v 1.2 2010/11/21 18:59:04 adam Exp $ */ +/* $NetBSD: roaming_client.c,v 1.3 2010/11/22 22:19:54 christos Exp $ */ /* $OpenBSD: roaming_client.c,v 1.3 2010/01/18 01:50:27 dtucker Exp $ */ /* * Copyright (c) 2004-2009 AppGate Network Security AB @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include "includes.h" -__RCSID("$NetBSD: roaming_client.c,v 1.2 2010/11/21 18:59:04 adam Exp $"); +__RCSID("$NetBSD: roaming_client.c,v 1.3 2010/11/22 22:19:54 christos Exp $"); #include <sys/queue.h> #include <sys/types.h> @@ -56,9 +56,7 @@ static u_int32_t roaming_id; static u_int64_t cookie; -#ifdef ROAMING_RECONNECT static u_int64_t lastseenchall; -#endif static u_int64_t key1, key2, oldkey1, oldkey2; void @@ -88,7 +86,6 @@ client_register_global_confirm(roaming_reply, NULL); } -#ifdef ROAMING_RECONNECT static void roaming_auth_required(void) { @@ -127,7 +124,6 @@ debug("Received %llu bytes", (unsigned long long)get_recv_bytes()); debug("Sent roaming_auth packet"); } -#endif int resume_kex(void) @@ -139,7 +135,6 @@ return 1; } -#ifdef ROAMING_RECONNECT static int roaming_resume(void) { @@ -282,4 +277,3 @@ fflush(stderr); exit(0); } -#endif Index: src/crypto/external/bsd/openssh/dist/roaming_common.c diff -u src/crypto/external/bsd/openssh/dist/roaming_common.c:1.4 src/crypto/external/bsd/openssh/dist/roaming_common.c:1.5 --- src/crypto/external/bsd/openssh/dist/roaming_common.c:1.4 Sun Nov 21 13:59:04 2010 +++ src/crypto/external/bsd/openssh/dist/roaming_common.c Mon Nov 22 17:19:54 2010 @@ -1,4 +1,4 @@ -/* $NetBSD: roaming_common.c,v 1.4 2010/11/21 18:59:04 adam Exp $ */ +/* $NetBSD: roaming_common.c,v 1.5 2010/11/22 22:19:54 christos Exp $ */ /* $OpenBSD: roaming_common.c,v 1.8 2010/01/12 00:59:29 djm Exp $ */ /* * Copyright (c) 2004-2009 AppGate Network Security AB @@ -16,7 +16,7 @@ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. */ #include "includes.h" -__RCSID("$NetBSD: roaming_common.c,v 1.4 2010/11/21 18:59:04 adam Exp $"); +__RCSID("$NetBSD: roaming_common.c,v 1.5 2010/11/22 22:19:54 christos Exp $"); #include <sys/types.h> #include <sys/socket.h> @@ -144,7 +144,6 @@ if (out_buf_size > 0) buf_append(buf, ret); } -#ifdef ROAMING_RECONNECT if (out_buf_size > 0 && (ret == 0 || (ret == -1 && errno == EPIPE))) { if (wait_for_roaming_reconnect() != 0) { @@ -155,7 +154,6 @@ errno = EAGAIN; } } -#endif return ret; } @@ -174,10 +172,8 @@ debug("roaming_read failed for %d ret=%ld errno=%d", fd, (long)ret, errno); ret = 0; -#ifdef ROAMING_RECONNECT if (wait_for_roaming_reconnect() == 0) *cont = 1; -#endif } return ret; } @@ -228,7 +224,7 @@ { const EVP_MD *md = EVP_sha1(); EVP_MD_CTX ctx; - char hash[EVP_MAX_MD_SIZE]; + u_char hash[EVP_MAX_MD_SIZE]; Buffer b; buffer_init(&b); Index: src/crypto/external/bsd/openssh/lib/Makefile diff -u src/crypto/external/bsd/openssh/lib/Makefile:1.5 src/crypto/external/bsd/openssh/lib/Makefile:1.6 --- src/crypto/external/bsd/openssh/lib/Makefile:1.5 Sun Nov 21 14:19:23 2010 +++ src/crypto/external/bsd/openssh/lib/Makefile Mon Nov 22 17:19:54 2010 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2010/11/21 19:19:23 adam Exp $ +# $NetBSD: Makefile,v 1.6 2010/11/22 22:19:54 christos Exp $ .include <bsd.own.mk> @@ -12,7 +12,7 @@ ssh-dss.c ssh-rsa.c dh.c kexdh.c kexgex.c \ kexdhc.c kexgexc.c msg.c progressmeter.c dns.c \ monitor_fdpass.c addrmatch.c schnorr.c jpake.c ssh-pkcs11.c \ - roaming_common.c + roaming_dummy.c # umac.c SRCS+= fmt_scaled.c random.c strtonum.c SRCS+= readpassphrase.c getpeereid.c getrrsetbyname.c Index: src/crypto/external/bsd/openssh/lib/shlib_version diff -u src/crypto/external/bsd/openssh/lib/shlib_version:1.4 src/crypto/external/bsd/openssh/lib/shlib_version:1.5 --- src/crypto/external/bsd/openssh/lib/shlib_version:1.4 Sun Nov 21 14:19:23 2010 +++ src/crypto/external/bsd/openssh/lib/shlib_version Mon Nov 22 17:19:54 2010 @@ -1,5 +1,5 @@ -# $NetBSD: shlib_version,v 1.4 2010/11/21 19:19:23 adam Exp $ +# $NetBSD: shlib_version,v 1.5 2010/11/22 22:19:54 christos Exp $ # Remember to update distrib/sets/lists/base/shl.* when changing # -major=15 -minor=1 +major=16 +minor=0