From 44697233257d80aa46402e7a6207ef8d6fe359e4 Mon Sep 17 00:00:00 2001 From: Ben Lindstrom Date: Wed, 4 Jul 2001 03:32:30 +0000 Subject: [PATCH] - markus@cvs.openbsd.org 2001/06/25 08:25:41 [channels.c channels.h cipher.c clientloop.c compat.c compat.h hostfile.c kex.c kex.h key.c key.h nchan.c packet.c serverloop.c session.c session.h sftp-server.c ssh-add.c ssh-agent.c uuencode.h] update copyright for 2001 --- ChangeLog | 10 +++++++++- channels.c | 5 ++--- channels.h | 4 ++-- cipher.c | 4 ++-- clientloop.c | 4 ++-- compat.c | 4 ++-- compat.h | 4 ++-- hostfile.c | 4 ++-- kex.c | 4 ++-- kex.h | 4 ++-- key.c | 4 ++-- key.h | 4 ++-- nchan.c | 4 ++-- packet.c | 4 ++-- serverloop.c | 4 ++-- session.c | 4 ++-- session.h | 4 ++-- sftp-server.c | 4 ++-- ssh-add.c | 4 ++-- ssh-agent.c | 7 +++---- uuencode.h | 4 ++-- 21 files changed, 50 insertions(+), 44 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2ad013f0d..d4999db48 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +20010704 + - OpenBSD CVS Sync + - markus@cvs.openbsd.org 2001/06/25 08:25:41 + [channels.c channels.h cipher.c clientloop.c compat.c compat.h + hostfile.c kex.c kex.h key.c key.h nchan.c packet.c serverloop.c + session.c session.h sftp-server.c ssh-add.c ssh-agent.c uuencode.h] + update copyright for 2001 + 20010629 - (bal) Removed net_aton() since we don't use it any more - (bal) Fixed _DISABLE_VPOSIX in readpassphrase.c. @@ -5824,4 +5832,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1344 2001/06/29 19:51:48 stevesk Exp $ +$Id: ChangeLog,v 1.1345 2001/07/04 03:32:30 mouring Exp $ diff --git a/channels.c b/channels.c index ce4c5952d..2721ec6bc 100644 --- a/channels.c +++ b/channels.c @@ -12,9 +12,8 @@ * incompatible with the protocol description in the RFC file, it must be * called by a name other than "ssh" or "Secure Shell". * - * * SSH2 support added by Markus Friedl. - * Copyright (c) 1999,2000 Markus Friedl. All rights reserved. + * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. * Copyright (c) 1999 Dug Song. All rights reserved. * Copyright (c) 1999 Theo de Raadt. All rights reserved. * @@ -40,7 +39,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: channels.c,v 1.127 2001/06/23 15:12:17 itojun Exp $"); +RCSID("$OpenBSD: channels.c,v 1.128 2001/06/25 08:25:35 markus Exp $"); #include "ssh.h" #include "ssh1.h" diff --git a/channels.h b/channels.h index 419b63623..0ce8372bd 100644 --- a/channels.h +++ b/channels.h @@ -10,7 +10,7 @@ * called by a name other than "ssh" or "Secure Shell". */ /* - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,7 +32,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: channels.h,v 1.39 2001/06/20 13:56:39 markus Exp $"); */ +/* RCSID("$OpenBSD: channels.h,v 1.40 2001/06/25 08:25:36 markus Exp $"); */ #ifndef CHANNEL_H #define CHANNEL_H diff --git a/cipher.c b/cipher.c index a7aacf284..5f63cd4b2 100644 --- a/cipher.c +++ b/cipher.c @@ -11,7 +11,7 @@ * * * Copyright (c) 1999 Niels Provos. All rights reserved. - * Copyright (c) 1999,2000 Markus Friedl. All rights reserved. + * Copyright (c) 1999, 2000 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: cipher.c,v 1.45 2001/06/23 15:12:18 itojun Exp $"); +RCSID("$OpenBSD: cipher.c,v 1.46 2001/06/25 08:25:36 markus Exp $"); #include "xmalloc.h" #include "log.h" diff --git a/clientloop.c b/clientloop.c index c96aea56f..05bcc3add 100644 --- a/clientloop.c +++ b/clientloop.c @@ -35,7 +35,7 @@ * * * SSH2 support added by Markus Friedl. - * Copyright (c) 1999,2000 Markus Friedl. All rights reserved. + * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -59,7 +59,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: clientloop.c,v 1.77 2001/06/23 15:12:18 itojun Exp $"); +RCSID("$OpenBSD: clientloop.c,v 1.78 2001/06/25 08:25:36 markus Exp $"); #include "ssh.h" #include "ssh1.h" diff --git a/compat.c b/compat.c index cdfd2cf6d..77bba28a2 100644 --- a/compat.c +++ b/compat.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999,2000 Markus Friedl. All rights reserved. + * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: compat.c,v 1.50 2001/04/30 16:02:49 markus Exp $"); +RCSID("$OpenBSD: compat.c,v 1.51 2001/06/25 08:25:37 markus Exp $"); #ifdef HAVE_LIBPCRE # include diff --git a/compat.h b/compat.h index 0ccc1ed37..33eb7c1e8 100644 --- a/compat.h +++ b/compat.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999 Markus Friedl. All rights reserved. + * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -21,7 +21,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* RCSID("$OpenBSD: compat.h,v 1.25 2001/04/30 15:50:46 markus Exp $"); */ +/* RCSID("$OpenBSD: compat.h,v 1.26 2001/06/25 08:25:37 markus Exp $"); */ #ifndef COMPAT_H #define COMPAT_H diff --git a/hostfile.c b/hostfile.c index 39a1a8313..eeed920fa 100644 --- a/hostfile.c +++ b/hostfile.c @@ -11,7 +11,7 @@ * called by a name other than "ssh" or "Secure Shell". * * - * Copyright (c) 1999,2000 Markus Friedl. All rights reserved. + * Copyright (c) 1999, 2000 Markus Friedl. All rights reserved. * Copyright (c) 1999 Niels Provos. All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: hostfile.c,v 1.27 2001/06/23 15:12:18 itojun Exp $"); +RCSID("$OpenBSD: hostfile.c,v 1.28 2001/06/25 08:25:37 markus Exp $"); #include "packet.h" #include "match.h" diff --git a/kex.c b/kex.c index 25b3b8f8a..1a412ce0f 100644 --- a/kex.c +++ b/kex.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: kex.c,v 1.35 2001/06/23 15:12:18 itojun Exp $"); +RCSID("$OpenBSD: kex.c,v 1.36 2001/06/25 08:25:37 markus Exp $"); #include diff --git a/kex.h b/kex.h index eca36b36a..ac7ad33f7 100644 --- a/kex.h +++ b/kex.h @@ -1,7 +1,7 @@ -/* $OpenBSD: kex.h,v 1.23 2001/06/23 02:34:28 markus Exp $ */ +/* $OpenBSD: kex.h,v 1.24 2001/06/25 08:25:37 markus Exp $ */ /* - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/key.c b/key.c index cbe08a4c1..2000c2755 100644 --- a/key.c +++ b/key.c @@ -9,7 +9,7 @@ * called by a name other than "ssh" or "Secure Shell". * * - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: key.c,v 1.27 2001/06/23 15:12:19 itojun Exp $"); +RCSID("$OpenBSD: key.c,v 1.28 2001/06/25 08:25:37 markus Exp $"); #include diff --git a/key.h b/key.h index cee31c30a..7f4e5f017 100644 --- a/key.h +++ b/key.h @@ -1,7 +1,7 @@ -/* $OpenBSD: key.h,v 1.12 2001/04/17 10:53:24 markus Exp $ */ +/* $OpenBSD: key.h,v 1.13 2001/06/25 08:25:38 markus Exp $ */ /* - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/nchan.c b/nchan.c index 8916c13f4..8e1be2d36 100644 --- a/nchan.c +++ b/nchan.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999 Markus Friedl. All rights reserved. + * Copyright (c) 1999, 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: nchan.c,v 1.29 2001/06/23 15:12:19 itojun Exp $"); +RCSID("$OpenBSD: nchan.c,v 1.30 2001/06/25 08:25:38 markus Exp $"); #include "ssh1.h" #include "ssh2.h" diff --git a/packet.c b/packet.c index 5365abaec..9aa686aa7 100644 --- a/packet.c +++ b/packet.c @@ -13,7 +13,7 @@ * * * SSH2 packet format added by Markus Friedl. - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,7 +37,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: packet.c,v 1.68 2001/06/23 15:12:19 itojun Exp $"); +RCSID("$OpenBSD: packet.c,v 1.69 2001/06/25 08:25:38 markus Exp $"); #include "xmalloc.h" #include "buffer.h" diff --git a/serverloop.c b/serverloop.c index 1ffa4dbfb..2eb8603d1 100644 --- a/serverloop.c +++ b/serverloop.c @@ -11,7 +11,7 @@ * called by a name other than "ssh" or "Secure Shell". * * SSH2 support by Markus Friedl. - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: serverloop.c,v 1.70 2001/06/23 15:12:19 itojun Exp $"); +RCSID("$OpenBSD: serverloop.c,v 1.71 2001/06/25 08:25:39 markus Exp $"); #include "xmalloc.h" #include "packet.h" diff --git a/session.c b/session.c index e50fd68bc..7d0e0723c 100644 --- a/session.c +++ b/session.c @@ -9,7 +9,7 @@ * called by a name other than "ssh" or "Secure Shell". * * SSH2 support by Markus Friedl. - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -33,7 +33,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: session.c,v 1.94 2001/06/23 15:12:20 itojun Exp $"); +RCSID("$OpenBSD: session.c,v 1.95 2001/06/25 08:25:39 markus Exp $"); #include "ssh.h" #include "ssh1.h" diff --git a/session.h b/session.h index 842e9412a..bda1e50b5 100644 --- a/session.h +++ b/session.h @@ -1,7 +1,7 @@ -/* $OpenBSD: session.h,v 1.6 2001/03/21 11:43:45 markus Exp $ */ +/* $OpenBSD: session.h,v 1.7 2001/06/25 08:25:39 markus Exp $ */ /* - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/sftp-server.c b/sftp-server.c index e6353bceb..5f1b37b01 100644 --- a/sftp-server.c +++ b/sftp-server.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -22,7 +22,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: sftp-server.c,v 1.28 2001/06/23 15:12:20 itojun Exp $"); +RCSID("$OpenBSD: sftp-server.c,v 1.29 2001/06/25 08:25:40 markus Exp $"); #include "buffer.h" #include "bufaux.h" diff --git a/ssh-add.c b/ssh-add.c index 84a8c20f9..d6a55446d 100644 --- a/ssh-add.c +++ b/ssh-add.c @@ -11,7 +11,7 @@ * called by a name other than "ssh" or "Secure Shell". * * SSH2 implementation, - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-add.c,v 1.40 2001/06/24 05:35:33 markus Exp $"); +RCSID("$OpenBSD: ssh-add.c,v 1.41 2001/06/25 08:25:40 markus Exp $"); #include diff --git a/ssh-agent.c b/ssh-agent.c index 6d94c6c29..54b375fce 100644 --- a/ssh-agent.c +++ b/ssh-agent.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-agent.c,v 1.55 2001/06/23 15:12:20 itojun Exp $ */ +/* $OpenBSD: ssh-agent.c,v 1.56 2001/06/25 08:25:40 markus Exp $ */ /* * Author: Tatu Ylonen @@ -12,8 +12,7 @@ * incompatible with the protocol description in the RFC file, it must be * called by a name other than "ssh" or "Secure Shell". * - * SSH2 implementation, - * Copyright (c) 2000 Markus Friedl. All rights reserved. + * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -37,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-agent.c,v 1.55 2001/06/23 15:12:20 itojun Exp $"); +RCSID("$OpenBSD: ssh-agent.c,v 1.56 2001/06/25 08:25:40 markus Exp $"); #include #include diff --git a/uuencode.h b/uuencode.h index 42f83c2c0..1a2d63f52 100644 --- a/uuencode.h +++ b/uuencode.h @@ -1,7 +1,7 @@ -/* $OpenBSD: uuencode.h,v 1.5 2001/01/29 01:58:19 niklas Exp $ */ +/* $OpenBSD: uuencode.h,v 1.6 2001/06/25 08:25:41 markus Exp $ */ /* - * Copyright (c) 1999 Markus Friedl. All rights reserved. + * Copyright (c) 2000 Markus Friedl. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions