diff options
author | kris <kris@FreeBSD.org> | 2000-09-10 09:35:38 +0000 |
---|---|---|
committer | kris <kris@FreeBSD.org> | 2000-09-10 09:35:38 +0000 |
commit | 24372e6c107e496b6909e6a488fe2303cef77299 (patch) | |
tree | 3c5f04df23b54861f107ea20953c1aa478ade5f7 /crypto/openssh/bufaux.c | |
parent | 06ca4c9ec0ae64896cd4d42f586cdf3fa0c033ef (diff) | |
download | FreeBSD-src-24372e6c107e496b6909e6a488fe2303cef77299.zip FreeBSD-src-24372e6c107e496b6909e6a488fe2303cef77299.tar.gz |
Resolve conflicts and update for OpenSSH 2.2.0
Reviewed by: gshapiro, peter, green
Diffstat (limited to 'crypto/openssh/bufaux.c')
-rw-r--r-- | crypto/openssh/bufaux.c | 38 |
1 files changed, 29 insertions, 9 deletions
diff --git a/crypto/openssh/bufaux.c b/crypto/openssh/bufaux.c index d813594..192c0c5 100644 --- a/crypto/openssh/bufaux.c +++ b/crypto/openssh/bufaux.c @@ -1,24 +1,44 @@ /* - * - * bufaux.c - * * Author: Tatu Ylonen <ylo@cs.hut.fi> - * * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland * All rights reserved - * - * Created: Wed Mar 29 02:24:47 1995 ylo - * * Auxiliary functions for storing and retrieving various data types to/from * Buffers. * + * As far as I am concerned, the code I have written for this software + * can be used freely for any purpose. Any derived versions of this + * software must be clearly marked as such, and if the derived work is + * incompatible with the protocol description in the RFC file, it must be + * called by a name other than "ssh" or "Secure Shell". + * + * * SSH2 packet format added by Markus Friedl + * 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 + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. * - * $FreeBSD$ + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$Id: bufaux.c,v 1.11 2000/04/14 10:30:30 markus Exp $"); +RCSID("$OpenBSD: bufaux.c,v 1.13 2000/09/07 20:27:50 deraadt Exp $"); +RCSID("$FreeBSD$"); #include "ssh.h" #include <openssl/bn.h> |