mirror of
git://anongit.mindrot.org/openssh.git
synced 2024-11-24 10:53:24 +08:00
874d77bb13
- markus@cvs.openbsd.org 2000/09/30 10:27:44 [log.c] allow loglevel debug - markus@cvs.openbsd.org 2000/10/03 11:59:57 [packet.c] hmac->mac - markus@cvs.openbsd.org 2000/10/03 12:03:03 [auth-krb4.c auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c auth1.c] move fake-auth from auth1.c to individual auth methods, disables s/key in debug-msg - markus@cvs.openbsd.org 2000/10/03 12:16:48 ssh.c do not resolve canonname, i have no idea why this was added oin ossh - markus@cvs.openbsd.org 2000/10/09 15:30:44 ssh-keygen.1 ssh-keygen.c -X now reads private ssh.com DSA keys, too. - markus@cvs.openbsd.org 2000/10/09 15:32:34 auth-options.c clear options on every call. - markus@cvs.openbsd.org 2000/10/09 15:51:00 authfd.c authfd.h interop with ssh-agent2, from <res@shore.net> - markus@cvs.openbsd.org 2000/10/10 14:20:45 compat.c use rexexp for version string matching - provos@cvs.openbsd.org 2000/10/10 22:02:18 [kex.c kex.h myproposal.h ssh.h ssh2.h sshconnect2.c sshd.c dh.c dh.h] First rough implementation of the diffie-hellman group exchange. The client can ask the server for bigger groups to perform the diffie-hellman in, thus increasing the attack complexity when using ciphers with longer keys. University of Windsor provided network, T the company. - markus@cvs.openbsd.org 2000/10/11 13:59:52 [auth-rsa.c auth2.c] clear auth options unless auth sucessfull - markus@cvs.openbsd.org 2000/10/11 14:00:27 [auth-options.h] clear auth options unless auth sucessfull - markus@cvs.openbsd.org 2000/10/11 14:03:27 [scp.1 scp.c] support 'scp -o' with help from mouring@pconline.com - markus@cvs.openbsd.org 2000/10/11 14:11:35 [dh.c] Wall - markus@cvs.openbsd.org 2000/10/11 14:14:40 [auth.h auth2.c readconf.c readconf.h readpass.c servconf.c servconf.h] [ssh.h sshconnect2.c sshd_config auth2-skey.c cli.c cli.h] add support for s/key (kbd-interactive) to ssh2, based on work by mkiernan@avantgo.com and me - markus@cvs.openbsd.org 2000/10/11 14:27:24 [auth.c auth1.c auth2.c authfile.c cipher.c cipher.h kex.c kex.h] [myproposal.h packet.c readconf.c session.c ssh.c ssh.h sshconnect1.c] [sshconnect2.c sshd.c] new cipher framework - markus@cvs.openbsd.org 2000/10/11 14:45:21 [cipher.c] remove DES - markus@cvs.openbsd.org 2000/10/12 03:59:20 [cipher.c cipher.h sshconnect1.c sshconnect2.c sshd.c] enable DES in SSH-1 clients only - markus@cvs.openbsd.org 2000/10/12 08:21:13 [kex.h packet.c] remove unused - markus@cvs.openbsd.org 2000/10/13 12:34:46 [sshd.c] Kludge for F-Secure Macintosh < 1.0.2; appro@fy.chalmers.se - markus@cvs.openbsd.org 2000/10/13 12:59:15 [cipher.c cipher.h myproposal.h rijndael.c rijndael.h] rijndael/aes support - markus@cvs.openbsd.org 2000/10/13 13:10:54 [sshd.8] more info about -V - markus@cvs.openbsd.org 2000/10/13 13:12:02 [myproposal.h] prefer no compression
138 lines
3.7 KiB
C
138 lines
3.7 KiB
C
/*-
|
|
* Copyright (c) 1989, 1993
|
|
* The Regents of the University of California. 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.
|
|
* 3. All advertising materials mentioning features or use of this software
|
|
* must display the following acknowledgement:
|
|
* This product includes software developed by the University of
|
|
* California, Berkeley and its contributors.
|
|
* 4. Neither the name of the University nor the names of its contributors
|
|
* may be used to endorse or promote products derived from this software
|
|
* without specific prior written permission.
|
|
*
|
|
* THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``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 REGENTS OR CONTRIBUTORS 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.
|
|
*/
|
|
|
|
#if defined(LIBC_SCCS) && !defined(lint)
|
|
static char rcsid[] = "$OpenBSD: vis.c,v 1.5 2000/07/19 15:25:13 deraadt Exp $";
|
|
#endif /* LIBC_SCCS and not lint */
|
|
|
|
#ifndef HAVE_VIS
|
|
|
|
#include "includes.h"
|
|
|
|
#define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7')
|
|
|
|
/*
|
|
* vis - visually encode characters
|
|
*/
|
|
char *vis(char *dst, int c, int flag, int nextc)
|
|
{
|
|
if (((u_int)c <= UCHAR_MAX && isascii((u_char)c) &&
|
|
isgraph((u_char)c)) ||
|
|
((flag & VIS_SP) == 0 && c == ' ') ||
|
|
((flag & VIS_TAB) == 0 && c == '\t') ||
|
|
((flag & VIS_NL) == 0 && c == '\n') ||
|
|
((flag & VIS_SAFE) && (c == '\b' || c == '\007' || c == '\r'))) {
|
|
*dst++ = c;
|
|
if (c == '\\' && (flag & VIS_NOSLASH) == 0)
|
|
*dst++ = '\\';
|
|
*dst = '\0';
|
|
return (dst);
|
|
}
|
|
|
|
if (flag & VIS_CSTYLE) {
|
|
switch(c) {
|
|
case '\n':
|
|
*dst++ = '\\';
|
|
*dst++ = 'n';
|
|
goto done;
|
|
case '\r':
|
|
*dst++ = '\\';
|
|
*dst++ = 'r';
|
|
goto done;
|
|
case '\b':
|
|
*dst++ = '\\';
|
|
*dst++ = 'b';
|
|
goto done;
|
|
#ifdef __STDC__
|
|
case '\a':
|
|
#else
|
|
case '\007':
|
|
#endif
|
|
*dst++ = '\\';
|
|
*dst++ = 'a';
|
|
goto done;
|
|
case '\v':
|
|
*dst++ = '\\';
|
|
*dst++ = 'v';
|
|
goto done;
|
|
case '\t':
|
|
*dst++ = '\\';
|
|
*dst++ = 't';
|
|
goto done;
|
|
case '\f':
|
|
*dst++ = '\\';
|
|
*dst++ = 'f';
|
|
goto done;
|
|
case ' ':
|
|
*dst++ = '\\';
|
|
*dst++ = 's';
|
|
goto done;
|
|
case '\0':
|
|
*dst++ = '\\';
|
|
*dst++ = '0';
|
|
if (isoctal(nextc)) {
|
|
*dst++ = '0';
|
|
*dst++ = '0';
|
|
}
|
|
goto done;
|
|
}
|
|
}
|
|
if (((c & 0177) == ' ') || (flag & VIS_OCTAL)) {
|
|
*dst++ = '\\';
|
|
*dst++ = ((u_char)c >> 6 & 07) + '0';
|
|
*dst++ = ((u_char)c >> 3 & 07) + '0';
|
|
*dst++ = ((u_char)c & 07) + '0';
|
|
goto done;
|
|
}
|
|
if ((flag & VIS_NOSLASH) == 0)
|
|
*dst++ = '\\';
|
|
if (c & 0200) {
|
|
c &= 0177;
|
|
*dst++ = 'M';
|
|
}
|
|
if (iscntrl(c)) {
|
|
*dst++ = '^';
|
|
if (c == 0177)
|
|
*dst++ = '?';
|
|
else
|
|
*dst++ = c + '@';
|
|
} else {
|
|
*dst++ = '-';
|
|
*dst++ = c;
|
|
}
|
|
done:
|
|
*dst = '\0';
|
|
return (dst);
|
|
}
|
|
#endif /* HAVE_VIS */
|