diff options
author | Damien Miller <djm@mindrot.org> | 2000-10-14 16:23:11 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2000-10-14 16:23:11 +1100 |
commit | 874d77bb134a21a5cf625956b60173376a993ba8 (patch) | |
tree | 93dd73b2ff1fbf0ad5f3978a2c4e0d8438a0bf7c /bsd-vis.c | |
parent | 89d9796fbedef4eed6956a2c095c7cc25330c28d (diff) |
- (djm) Big OpenBSD sync:
- 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
Diffstat (limited to 'bsd-vis.c')
-rw-r--r-- | bsd-vis.c | 137 |
1 files changed, 137 insertions, 0 deletions
diff --git a/bsd-vis.c b/bsd-vis.c new file mode 100644 index 000000000..94283a077 --- /dev/null +++ b/bsd-vis.c | |||
@@ -0,0 +1,137 @@ | |||
1 | /*- | ||
2 | * Copyright (c) 1989, 1993 | ||
3 | * The Regents of the University of California. All rights reserved. | ||
4 | * | ||
5 | * Redistribution and use in source and binary forms, with or without | ||
6 | * modification, are permitted provided that the following conditions | ||
7 | * are met: | ||
8 | * 1. Redistributions of source code must retain the above copyright | ||
9 | * notice, this list of conditions and the following disclaimer. | ||
10 | * 2. Redistributions in binary form must reproduce the above copyright | ||
11 | * notice, this list of conditions and the following disclaimer in the | ||
12 | * documentation and/or other materials provided with the distribution. | ||
13 | * 3. All advertising materials mentioning features or use of this software | ||
14 | * must display the following acknowledgement: | ||
15 | * This product includes software developed by the University of | ||
16 | * California, Berkeley and its contributors. | ||
17 | * 4. Neither the name of the University nor the names of its contributors | ||
18 | * may be used to endorse or promote products derived from this software | ||
19 | * without specific prior written permission. | ||
20 | * | ||
21 | * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND | ||
22 | * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | ||
23 | * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE | ||
24 | * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE | ||
25 | * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL | ||
26 | * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS | ||
27 | * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
28 | * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
29 | * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY | ||
30 | * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF | ||
31 | * SUCH DAMAGE. | ||
32 | */ | ||
33 | |||
34 | #if defined(LIBC_SCCS) && !defined(lint) | ||
35 | static char rcsid[] = "$OpenBSD: vis.c,v 1.5 2000/07/19 15:25:13 deraadt Exp $"; | ||
36 | #endif /* LIBC_SCCS and not lint */ | ||
37 | |||
38 | #ifndef HAVE_VIS | ||
39 | |||
40 | #include "includes.h" | ||
41 | |||
42 | #define isoctal(c) (((u_char)(c)) >= '0' && ((u_char)(c)) <= '7') | ||
43 | |||
44 | /* | ||
45 | * vis - visually encode characters | ||
46 | */ | ||
47 | char *vis(char *dst, int c, int flag, int nextc) | ||
48 | { | ||
49 | if (((u_int)c <= UCHAR_MAX && isascii((u_char)c) && | ||
50 | isgraph((u_char)c)) || | ||
51 | ((flag & VIS_SP) == 0 && c == ' ') || | ||
52 | ((flag & VIS_TAB) == 0 && c == '\t') || | ||
53 | ((flag & VIS_NL) == 0 && c == '\n') || | ||
54 | ((flag & VIS_SAFE) && (c == '\b' || c == '\007' || c == '\r'))) { | ||
55 | *dst++ = c; | ||
56 | if (c == '\\' && (flag & VIS_NOSLASH) == 0) | ||
57 | *dst++ = '\\'; | ||
58 | *dst = '\0'; | ||
59 | return (dst); | ||
60 | } | ||
61 | |||
62 | if (flag & VIS_CSTYLE) { | ||
63 | switch(c) { | ||
64 | case '\n': | ||
65 | *dst++ = '\\'; | ||
66 | *dst++ = 'n'; | ||
67 | goto done; | ||
68 | case '\r': | ||
69 | *dst++ = '\\'; | ||
70 | *dst++ = 'r'; | ||
71 | goto done; | ||
72 | case '\b': | ||
73 | *dst++ = '\\'; | ||
74 | *dst++ = 'b'; | ||
75 | goto done; | ||
76 | #ifdef __STDC__ | ||
77 | case '\a': | ||
78 | #else | ||
79 | case '\007': | ||
80 | #endif | ||
81 | *dst++ = '\\'; | ||
82 | *dst++ = 'a'; | ||
83 | goto done; | ||
84 | case '\v': | ||
85 | *dst++ = '\\'; | ||
86 | *dst++ = 'v'; | ||
87 | goto done; | ||
88 | case '\t': | ||
89 | *dst++ = '\\'; | ||
90 | *dst++ = 't'; | ||
91 | goto done; | ||
92 | case '\f': | ||
93 | *dst++ = '\\'; | ||
94 | *dst++ = 'f'; | ||
95 | goto done; | ||
96 | case ' ': | ||
97 | *dst++ = '\\'; | ||
98 | *dst++ = 's'; | ||
99 | goto done; | ||
100 | case '\0': | ||
101 | *dst++ = '\\'; | ||
102 | *dst++ = '0'; | ||
103 | if (isoctal(nextc)) { | ||
104 | *dst++ = '0'; | ||
105 | *dst++ = '0'; | ||
106 | } | ||
107 | goto done; | ||
108 | } | ||
109 | } | ||
110 | if (((c & 0177) == ' ') || (flag & VIS_OCTAL)) { | ||
111 | *dst++ = '\\'; | ||
112 | *dst++ = ((u_char)c >> 6 & 07) + '0'; | ||
113 | *dst++ = ((u_char)c >> 3 & 07) + '0'; | ||
114 | *dst++ = ((u_char)c & 07) + '0'; | ||
115 | goto done; | ||
116 | } | ||
117 | if ((flag & VIS_NOSLASH) == 0) | ||
118 | *dst++ = '\\'; | ||
119 | if (c & 0200) { | ||
120 | c &= 0177; | ||
121 | *dst++ = 'M'; | ||
122 | } | ||
123 | if (iscntrl(c)) { | ||
124 | *dst++ = '^'; | ||
125 | if (c == 0177) | ||
126 | *dst++ = '?'; | ||
127 | else | ||
128 | *dst++ = c + '@'; | ||
129 | } else { | ||
130 | *dst++ = '-'; | ||
131 | *dst++ = c; | ||
132 | } | ||
133 | done: | ||
134 | *dst = '\0'; | ||
135 | return (dst); | ||
136 | } | ||
137 | #endif /* HAVE_VIS */ | ||