summaryrefslogtreecommitdiff
path: root/compat.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-12-06 18:00:18 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-12-06 18:00:18 +0000
commit1c37c6a51842f8bed3283ef18ec16cf6a0ae8640 (patch)
treee17ea7a703397ef0b7f7c76d668bb5ac0d4f4fec /compat.c
parent3c36bb29ca67d459ef9d8c1961415d77efc20e55 (diff)
- deraadt@cvs.openbsd.org 2001/12/05 10:06:12
[authfd.c authfile.c bufaux.c channels.c compat.c kex.c kexgex.c key.c misc.c packet.c servconf.c ssh-agent.c sshconnect2.c sshconnect.c sshd.c ssh-dss.c ssh-keygen.c ssh-rsa.c] minor KNF
Diffstat (limited to 'compat.c')
-rw-r--r--compat.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/compat.c b/compat.c
index 1d3e97056..0b8d53822 100644
--- a/compat.c
+++ b/compat.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: compat.c,v 1.53 2001/09/20 13:50:40 markus Exp $"); 26RCSID("$OpenBSD: compat.c,v 1.54 2001/12/05 10:06:12 deraadt Exp $");
27 27
28#ifdef HAVE_LIBPCRE 28#ifdef HAVE_LIBPCRE
29# include <pcreposix.h> 29# include <pcreposix.h>
@@ -159,7 +159,7 @@ proto_spec(const char *spec)
159 return ret; 159 return ret;
160 q = s = xstrdup(spec); 160 q = s = xstrdup(spec);
161 for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) { 161 for ((p = strsep(&q, SEP)); p && *p != '\0'; (p = strsep(&q, SEP))) {
162 switch(atoi(p)) { 162 switch (atoi(p)) {
163 case 1: 163 case 1:
164 if (ret == SSH_PROTO_UNKNOWN) 164 if (ret == SSH_PROTO_UNKNOWN)
165 ret |= SSH_PROTO_1_PREFERRED; 165 ret |= SSH_PROTO_1_PREFERRED;
@@ -191,7 +191,7 @@ compat_cipher_proposal(char *cipher_prop)
191 fix_ciphers = xmalloc(len); 191 fix_ciphers = xmalloc(len);
192 *fix_ciphers = '\0'; 192 *fix_ciphers = '\0';
193 tmp = orig_prop = xstrdup(cipher_prop); 193 tmp = orig_prop = xstrdup(cipher_prop);
194 while((cp = strsep(&tmp, ",")) != NULL) { 194 while ((cp = strsep(&tmp, ",")) != NULL) {
195 if (strncmp(cp, "aes", 3) && strncmp(cp, "rijndael", 8)) { 195 if (strncmp(cp, "aes", 3) && strncmp(cp, "rijndael", 8)) {
196 if (*fix_ciphers) 196 if (*fix_ciphers)
197 strlcat(fix_ciphers, ",", len); 197 strlcat(fix_ciphers, ",", len);