From f3a2b348daf9fa6063c38d2d69563f732a2f80e7 Mon Sep 17 00:00:00 2001 From: rgrimes Date: Tue, 30 May 1995 06:12:45 +0000 Subject: Remove trailing whitespace. --- secure/lib/libcipher/crypt.c | 6 ++--- secure/lib/libcipher/test/cert.c | 6 ++--- secure/lib/libcrypt/crypt-des.c | 6 ++--- secure/lib/libcrypt/crypt.c | 6 ++--- secure/lib/libcrypt/test/Makefile | 8 +++---- secure/lib/libcrypt/test/cert.c | 6 ++--- secure/lib/libtelnet/auth-proto.h | 2 +- secure/lib/libtelnet/auth.c | 2 +- secure/lib/libtelnet/enc_des.c | 6 ++--- secure/lib/libtelnet/encrypt.c | 8 +++---- secure/lib/libtelnet/kerberos.c | 4 ++-- secure/lib/libtelnet/kerberos5.c | 44 ++++++++++++++++++------------------ secure/lib/libtelnet/krb4encpwd.c | 2 +- secure/lib/libtelnet/read_password.c | 8 +++---- secure/lib/libtelnet/rsaencpwd.c | 2 +- secure/libexec/telnetd/pathnames.h | 2 +- secure/libexec/telnetd/slc.c | 14 ++++++------ secure/libexec/telnetd/state.c | 2 +- secure/libexec/telnetd/sys_term.c | 6 ++--- secure/libexec/telnetd/telnetd.c | 6 ++--- secure/libexec/telnetd/termstat.c | 14 ++++++------ secure/libexec/telnetd/utility.c | 12 +++++----- secure/usr.bin/bdes/bdes.c | 2 +- secure/usr.bin/telnet/commands.c | 8 +++---- secure/usr.bin/telnet/main.c | 10 ++++---- secure/usr.bin/telnet/sys_bsd.c | 4 ++-- secure/usr.bin/telnet/telnet.c | 8 +++---- secure/usr.bin/telnet/utilities.c | 4 ++-- secure/usr.sbin/xntpd/lib/authdes.c | 8 +++---- 29 files changed, 108 insertions(+), 108 deletions(-) (limited to 'secure') diff --git a/secure/lib/libcipher/crypt.c b/secure/lib/libcipher/crypt.c index f6c3126..cbdefde 100644 --- a/secure/lib/libcipher/crypt.c +++ b/secure/lib/libcipher/crypt.c @@ -28,7 +28,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: crypt.c,v 1.1.1.1 1994/09/07 21:18:07 csgr Exp $ + * $Id: crypt.c,v 1.2 1994/09/07 21:48:46 csgr Exp $ * * This is an original implementation of the DES and the crypt(3) interfaces * by David Burren . @@ -316,7 +316,7 @@ des_init() /* * Invert the P-box permutation, and convert into OR-masks for - * handling the output of the S-box arrays setup above. + * handling the output of the S-box arrays setup above. */ for (i = 0; i < 32; i++) un_pbox[pbox[i] - 1] = i; @@ -414,7 +414,7 @@ des_setkey(const char *key) t0 = (k0 << shifts) | (k0 >> (28 - shifts)); t1 = (k1 << shifts) | (k1 >> (28 - shifts)); - de_keysl[15 - round] = + de_keysl[15 - round] = en_keysl[round] = comp_maskl[0][(t0 >> 21) & 0x7f] | comp_maskl[1][(t0 >> 14) & 0x7f] | comp_maskl[2][(t0 >> 7) & 0x7f] diff --git a/secure/lib/libcipher/test/cert.c b/secure/lib/libcipher/test/cert.c index 520f9bd..549c230 100644 --- a/secure/lib/libcipher/test/cert.c +++ b/secure/lib/libcipher/test/cert.c @@ -3,7 +3,7 @@ * shipped with UFC-crypt which is apparently derived from one distributed * with Phil Karns PD DES package. * - * $Id: cert.c,v 1.1 1994/09/07 08:55:26 g89r4222 Exp $ + * $Id: cert.c,v 1.1.1.1 1994/09/07 21:18:08 csgr Exp $ */ #include @@ -40,7 +40,7 @@ static struct crypt_test crypt16_tests[] = { }; -void good_bye() +void good_bye() { if(totfails == 0) { printf(" Passed validation\n"); @@ -59,7 +59,7 @@ char *cp; for(i = 0; i < 8; i++){ t = 0; - for(j = 0; j < 8; j++) + for(j = 0; j < 8; j++) t = t << 1 | *cp++; printf("%02x", t); } diff --git a/secure/lib/libcrypt/crypt-des.c b/secure/lib/libcrypt/crypt-des.c index 18a45669..59f502a 100644 --- a/secure/lib/libcrypt/crypt-des.c +++ b/secure/lib/libcrypt/crypt-des.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: crypt.c,v 1.4 1994/09/07 07:47:08 pst Exp $ + * $Id: crypt.c,v 1.5 1994/09/19 19:26:39 csgr Exp $ * * This is an original implementation of the DES and the crypt(3) interfaces * by David Burren . @@ -324,7 +324,7 @@ des_init() /* * Invert the P-box permutation, and convert into OR-masks for - * handling the output of the S-box arrays setup above. + * handling the output of the S-box arrays setup above. */ for (i = 0; i < 32; i++) un_pbox[pbox[i] - 1] = i; @@ -420,7 +420,7 @@ des_setkey(const char *key) t0 = (k0 << shifts) | (k0 >> (28 - shifts)); t1 = (k1 << shifts) | (k1 >> (28 - shifts)); - de_keysl[15 - round] = + de_keysl[15 - round] = en_keysl[round] = comp_maskl[0][(t0 >> 21) & 0x7f] | comp_maskl[1][(t0 >> 14) & 0x7f] | comp_maskl[2][(t0 >> 7) & 0x7f] diff --git a/secure/lib/libcrypt/crypt.c b/secure/lib/libcrypt/crypt.c index 18a45669..59f502a 100644 --- a/secure/lib/libcrypt/crypt.c +++ b/secure/lib/libcrypt/crypt.c @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: crypt.c,v 1.4 1994/09/07 07:47:08 pst Exp $ + * $Id: crypt.c,v 1.5 1994/09/19 19:26:39 csgr Exp $ * * This is an original implementation of the DES and the crypt(3) interfaces * by David Burren . @@ -324,7 +324,7 @@ des_init() /* * Invert the P-box permutation, and convert into OR-masks for - * handling the output of the S-box arrays setup above. + * handling the output of the S-box arrays setup above. */ for (i = 0; i < 32; i++) un_pbox[pbox[i] - 1] = i; @@ -420,7 +420,7 @@ des_setkey(const char *key) t0 = (k0 << shifts) | (k0 >> (28 - shifts)); t1 = (k1 << shifts) | (k1 >> (28 - shifts)); - de_keysl[15 - round] = + de_keysl[15 - round] = en_keysl[round] = comp_maskl[0][(t0 >> 21) & 0x7f] | comp_maskl[1][(t0 >> 14) & 0x7f] | comp_maskl[2][(t0 >> 7) & 0x7f] diff --git a/secure/lib/libcrypt/test/Makefile b/secure/lib/libcrypt/test/Makefile index 4f92a48..b65b09f 100644 --- a/secure/lib/libcrypt/test/Makefile +++ b/secure/lib/libcrypt/test/Makefile @@ -2,19 +2,19 @@ # Hacked Makefile to compile and run the DES-certification program, # but not install anything. # -# $Id: Makefile,v 1.2 1994/08/08 17:29:02 csgr Exp $ +# $Id: Makefile,v 1.3 1994/08/12 21:55:04 csgr Exp $ # .if exists (../obj) OBJDIR = obj .else -OBJDIR = +OBJDIR = .endif LIBCRYPT= $(.CURDIR)/../$(OBJDIR)/libdescrypt.a #CFLAGS+= -DHAVE_CRYPT16 -TARGETS=cert speedcrypt +TARGETS=cert speedcrypt all: ${TARGETS} @@ -23,7 +23,7 @@ test: all testcrypt testspeed testcrypt: cert @./cert -c -testspeed: cryptspeed +testspeed: cryptspeed cryptspeed: speedcrypt @./speedcrypt 30 1 diff --git a/secure/lib/libcrypt/test/cert.c b/secure/lib/libcrypt/test/cert.c index 4a9c088..b2e3ae5 100644 --- a/secure/lib/libcrypt/test/cert.c +++ b/secure/lib/libcrypt/test/cert.c @@ -3,7 +3,7 @@ * shipped with UFC-crypt which is apparently derived from one distributed * with Phil Karns PD DES package. * - * $Id: cert.c,v 1.1.1.1 1994/04/04 14:57:19 g89r4222 Exp $ + * $Id: cert.c,v 1.2 1994/08/08 17:29:03 csgr Exp $ */ #include @@ -40,7 +40,7 @@ static struct crypt_test crypt16_tests[] = { }; -void good_bye() +void good_bye() { if(totfails == 0) { printf(" Passed validation\n"); @@ -59,7 +59,7 @@ char *cp; for(i = 0; i < 8; i++){ t = 0; - for(j = 0; j < 8; j++) + for(j = 0; j < 8; j++) t = t << 1 | *cp++; printf("%02x", t); } diff --git a/secure/lib/libtelnet/auth-proto.h b/secure/lib/libtelnet/auth-proto.h index 06bba2b..111033d 100644 --- a/secure/lib/libtelnet/auth-proto.h +++ b/secure/lib/libtelnet/auth-proto.h @@ -40,7 +40,7 @@ * to require a specific license from the United States Government. * It is the responsibility of any person or organization contemplating * export to obtain such a license before exporting. - * + * * WITHIN THAT CONSTRAINT, permission to use, copy, modify, and * distribute this software and its documentation for any purpose and * without fee is hereby granted, provided that the above copyright diff --git a/secure/lib/libtelnet/auth.c b/secure/lib/libtelnet/auth.c index 485ac83..226a206 100644 --- a/secure/lib/libtelnet/auth.c +++ b/secure/lib/libtelnet/auth.c @@ -467,7 +467,7 @@ auth_send(data, cnt) * We requested strong authentication, however no mechanisms worked. * Therefore, exit on client end. */ - printf("Unable to securely authenticate user ... exit\n"); + printf("Unable to securely authenticate user ... exit\n"); exit(0); #endif /* KANNAN */ } diff --git a/secure/lib/libtelnet/enc_des.c b/secure/lib/libtelnet/enc_des.c index 15e8521..6f90520 100644 --- a/secure/lib/libtelnet/enc_des.c +++ b/secure/lib/libtelnet/enc_des.c @@ -580,7 +580,7 @@ fb64_stream_key(key, stp) * INPUT --(--------->(+)+---> DATA * | | * +-------------+ - * + * * * Given: * iV: Initial vector, 64 bits (8 bytes) long. @@ -641,7 +641,7 @@ cfb64_decrypt(data) des_ecb_encrypt(stp->str_output, b, stp->str_sched, 1); bcopy((void *)b, (void *)stp->str_feed, sizeof(Block)); stp->str_index = 1; /* Next time will be 1 */ - index = 0; /* But now use 0 */ + index = 0; /* But now use 0 */ } /* On decryption we store (data) which is cypher. */ @@ -714,7 +714,7 @@ ofb64_decrypt(data) des_ecb_encrypt(stp->str_feed, b, stp->str_sched, 1); bcopy((void *)b, (void *)stp->str_feed, sizeof(Block)); stp->str_index = 1; /* Next time will be 1 */ - index = 0; /* But now use 0 */ + index = 0; /* But now use 0 */ } return(data ^ stp->str_feed[index]); diff --git a/secure/lib/libtelnet/encrypt.c b/secure/lib/libtelnet/encrypt.c index 8662473..1ced89b 100644 --- a/secure/lib/libtelnet/encrypt.c +++ b/secure/lib/libtelnet/encrypt.c @@ -106,7 +106,7 @@ static long remote_supports_decrypt = 0; static Encryptions encryptions[] = { #ifdef DES_ENCRYPTION { "DES_CFB64", ENCTYPE_DES_CFB64, - cfb64_encrypt, + cfb64_encrypt, cfb64_decrypt, cfb64_init, cfb64_start, @@ -116,7 +116,7 @@ static Encryptions encryptions[] = { cfb64_keyid, cfb64_printsub }, { "DES_OFB64", ENCTYPE_DES_OFB64, - ofb64_encrypt, + ofb64_encrypt, ofb64_decrypt, ofb64_init, ofb64_start, @@ -708,7 +708,7 @@ encrypt_request_end() * Called when ENCRYPT REQUEST-START is received. If we receive * this before a type is picked, then that indicates that the * other side wants us to start encrypting data as soon as we - * can. + * can. */ void encrypt_request_start(data, cnt) @@ -851,7 +851,7 @@ encrypt_start_output(type) i = (*ep->start)(DIR_ENCRYPT, Server); if (encrypt_debug_mode) { printf(">>>%s: Encrypt start: %s (%d) %s\r\n", - Name, + Name, (i < 0) ? "failed" : "initial negotiation in progress", i, ENCTYPE_NAME(type)); diff --git a/secure/lib/libtelnet/kerberos.c b/secure/lib/libtelnet/kerberos.c index 7c5771c..5eef373 100644 --- a/secure/lib/libtelnet/kerberos.c +++ b/secure/lib/libtelnet/kerberos.c @@ -177,7 +177,7 @@ kerberos4_send(ap) CREDENTIALS cred; int r; - printf("[ Trying KERBEROS4 ... ]\n"); + printf("[ Trying KERBEROS4 ... ]\n"); if (!UserNameRequested) { if (auth_debug_mode) { printf("Kerberos V4: no user name supplied\r\n"); @@ -245,7 +245,7 @@ kerberos4_send(ap) des_ecb_encrypt(challenge, challenge, sched, 1); } #endif /* ENCRYPTION */ - + if (auth_debug_mode) { printf("CK: %d:", kerberos4_cksum(auth.dat, auth.length)); printd(auth.dat, auth.length); diff --git a/secure/lib/libtelnet/kerberos5.c b/secure/lib/libtelnet/kerberos5.c index d2eb34f..f167b38 100644 --- a/secure/lib/libtelnet/kerberos5.c +++ b/secure/lib/libtelnet/kerberos5.c @@ -1,7 +1,7 @@ /* - * $Source: /home/ncvs/src/lib/libtelnet/kerberos5.c,v $ - * $Author: rgrimes $ - * $Id: kerberos5.c,v 1.1.1.1 1994/05/27 05:00:20 rgrimes Exp $ + * $Source: /home/ncvs/src/secure/lib/libtelnet/kerberos5.c,v $ + * $Author: csgr $ + * $Id: kerberos5.c,v 1.1.1.1 1994/08/12 22:02:59 csgr Exp $ */ #if !defined(lint) && !defined(SABER) @@ -9,7 +9,7 @@ static #ifdef __STDC__ const #endif -char rcsid_kerberos5_c[] = "$Id: kerberos5.c,v 1.1.1.1 1994/05/27 05:00:20 rgrimes Exp $"; +char rcsid_kerberos5_c[] = "$Id: kerberos5.c,v 1.1.1.1 1994/08/12 22:02:59 csgr Exp $"; #endif /* lint */ /*- @@ -84,7 +84,7 @@ static char sccsid[] = "@(#)kerberos5.c 8.2 (Berkeley) 12/15/93"; /* kerberos 5 include files (ext-proto.h) will get an appropriate stdlib.h and string.h/strings.h */ - + #include "encrypt.h" #include "auth.h" #include "misc.h" @@ -204,7 +204,7 @@ kerberos5_send(ap) ksum.contents = sum; ksum.length = sizeof(sum); bzero((Voidptr )sum, sizeof(sum)); - + if (!UserNameRequested) { if (auth_debug_mode) { printf("Kerberos V5: no user name supplied\r\n"); @@ -254,7 +254,7 @@ kerberos5_send(ap) krb5_free_host_realm(realms); return(0); } - + bzero((char *)&creds, sizeof(creds)); creds.server = server; @@ -284,7 +284,7 @@ kerberos5_send(ap) ap_opts = AP_OPTS_MUTUAL_REQUIRED; else ap_opts = 0; - + r = krb5_mk_req_extended(ap_opts, &ksum, krb5_kdc_default_options, 0, #ifdef ENCRYPTION &newkey, @@ -441,7 +441,7 @@ kerberos5_is(ap, data, cnt) goto errout; } Data(ap, KRB_RESPONSE, outbuf.data, outbuf.length); - } + } if (krb5_unparse_name(authdat->ticket->enc_part2 ->client, &name)) name = 0; @@ -451,7 +451,7 @@ kerberos5_is(ap, data, cnt) name ? name : ""); } auth_finished(ap, AUTH_USER); - + free(name); if (authdat->authenticator->subkey && authdat->authenticator->subkey->keytype == KEYTYPE_DES) { @@ -463,7 +463,7 @@ kerberos5_is(ap, data, cnt) (Voidptr )session_key, sizeof(Block)); } else break; - + #ifdef ENCRYPTION skey.type = SK_DES; skey.length = 8; @@ -475,17 +475,17 @@ kerberos5_is(ap, data, cnt) case KRB_FORWARD: inbuf.data = (char *)data; inbuf.length = cnt; - if (r = rd_and_store_for_creds(&inbuf, authdat->ticket, + if (r = rd_and_store_for_creds(&inbuf, authdat->ticket, UserNameRequested)) { char errbuf[128]; - + (void) strcpy(errbuf, "Read forwarded creds failed: "); (void) strcat(errbuf, error_message(r)); Data(ap, KRB_FORWARD_REJECT, errbuf, -1); if (auth_debug_mode) printf("Could not read forwarded credentials\r\n"); } - else + else Data(ap, KRB_FORWARD_ACCEPT, 0, 0); if (auth_debug_mode) printf("Forwarded credentials obtained\r\n"); @@ -690,16 +690,16 @@ kerberos5_forward(ap) krb5_ccache ccache; int i; - if (!(local_creds = (krb5_creds *) + if (!(local_creds = (krb5_creds *) calloc(1, sizeof(*local_creds)))) { - if (auth_debug_mode) + if (auth_debug_mode) printf("Kerberos V5: could not allocate memory for credentials\r\n"); return; } if (r = krb5_sname_to_principal(RemoteHostName, "host", 1, &local_creds->server)) { - if (auth_debug_mode) + if (auth_debug_mode) printf("Kerberos V5: could not build server name - %s\r\n", error_message(r)); krb5_free_creds(local_creds); @@ -707,7 +707,7 @@ kerberos5_forward(ap) } if (r = krb5_cc_default(&ccache)) { - if (auth_debug_mode) + if (auth_debug_mode) printf("Kerberos V5: could not get default ccache - %s\r\n", error_message(r)); krb5_free_creds(local_creds); @@ -715,7 +715,7 @@ kerberos5_forward(ap) } if (r = krb5_cc_get_principal(ccache, &local_creds->client)) { - if (auth_debug_mode) + if (auth_debug_mode) printf("Kerberos V5: could not get default principal - %s\r\n", error_message(r)); krb5_free_creds(local_creds); @@ -724,7 +724,7 @@ kerberos5_forward(ap) /* Get ticket from credentials cache */ if (r = krb5_get_credentials(KRB5_GC_CACHED, ccache, local_creds)) { - if (auth_debug_mode) + if (auth_debug_mode) printf("Kerberos V5: could not obtain credentials - %s\r\n", error_message(r)); krb5_free_creds(local_creds); @@ -738,13 +738,13 @@ kerberos5_forward(ap) &local_creds->keyblock, forward_flags & OPTS_FORWARDABLE_CREDS, &forw_creds)) { - if (auth_debug_mode) + if (auth_debug_mode) printf("Kerberos V5: error getting forwarded creds - %s\r\n", error_message(r)); krb5_free_creds(local_creds); return; } - + /* Send forwarded credentials */ if (!Data(ap, KRB_FORWARD, forw_creds.data, forw_creds.length)) { if (auth_debug_mode) diff --git a/secure/lib/libtelnet/krb4encpwd.c b/secure/lib/libtelnet/krb4encpwd.c index 0f75d4d..3d17b53 100644 --- a/secure/lib/libtelnet/krb4encpwd.c +++ b/secure/lib/libtelnet/krb4encpwd.c @@ -266,7 +266,7 @@ krb4encpwd_is(ap, data, cnt) Data(ap, KRB4_ENCPWD_CHALLENGE, (void *)challenge, strlen(challenge)); } break; - + default: Data(ap, KRB4_ENCPWD_REJECT, 0, 0); break; diff --git a/secure/lib/libtelnet/read_password.c b/secure/lib/libtelnet/read_password.c index 5eaa895..d487ab6 100644 --- a/secure/lib/libtelnet/read_password.c +++ b/secure/lib/libtelnet/read_password.c @@ -36,8 +36,8 @@ static char sccsid[] = "@(#)read_password.c 8.2 (Berkeley) 12/15/93"; #endif /* not lint */ /* - * $Source: /home/ncvs/src/lib/libtelnet/read_password.c,v $ - * $Author: rgrimes $ + * $Source: /home/ncvs/src/secure/lib/libtelnet/read_password.c,v $ + * $Author: csgr $ * * Copyright 1985, 1986, 1987, 1988 by the Massachusetts Institute * of Technology. @@ -76,7 +76,7 @@ local_des_read_pw_string(s,max,prompt,verify) { int ok = 0; char *ptr; - + jmp_buf old_env; struct sgttyb tty_state; char key_string[BUFSIZ]; @@ -91,7 +91,7 @@ local_des_read_pw_string(s,max,prompt,verify) goto lose; /* save terminal state*/ - if (ioctl(0,TIOCGETP,(char *)&tty_state) == -1) + if (ioctl(0,TIOCGETP,(char *)&tty_state) == -1) return -1; /* push_signals(); diff --git a/secure/lib/libtelnet/rsaencpwd.c b/secure/lib/libtelnet/rsaencpwd.c index eda70fe..4c1cb48 100644 --- a/secure/lib/libtelnet/rsaencpwd.c +++ b/secure/lib/libtelnet/rsaencpwd.c @@ -304,7 +304,7 @@ rsaencpwd_is(ap, data, cnt) Data(ap, RSA_ENCPWD_CHALLENGEKEY, (void *)chalkey, chalkey_len); } break; - + default: Data(ap, RSA_ENCPWD_REJECT, 0, 0); break; diff --git a/secure/libexec/telnetd/pathnames.h b/secure/libexec/telnetd/pathnames.h index c8b0806..4e14a88 100644 --- a/secure/libexec/telnetd/pathnames.h +++ b/secure/libexec/telnetd/pathnames.h @@ -42,7 +42,7 @@ # endif #else - + # define _PATH_TTY "/dev/tty" # ifndef _PATH_LOGIN # define _PATH_LOGIN "/bin/login" diff --git a/secure/libexec/telnetd/slc.c b/secure/libexec/telnetd/slc.c index 145746a..a03bd9d 100644 --- a/secure/libexec/telnetd/slc.c +++ b/secure/libexec/telnetd/slc.c @@ -109,10 +109,10 @@ get_slc_defaults() init_termbuf(); for (i = 1; i <= NSLC; i++) { - slctab[i].defset.flag = + slctab[i].defset.flag = spcset(i, &slctab[i].defset.val, &slctab[i].sptr); - slctab[i].current.flag = SLC_NOSUPPORT; - slctab[i].current.val = 0; + slctab[i].current.flag = SLC_NOSUPPORT; + slctab[i].current.val = 0; } } /* end of get_slc_defaults */ @@ -286,7 +286,7 @@ change_slc(func, flag, val) register cc_t val; { register int hislevel, mylevel; - + hislevel = flag & SLC_LEVELBITS; mylevel = slctab[func].defset.flag & SLC_LEVELBITS; /* @@ -345,7 +345,7 @@ change_slc(func, flag, val) * request as he asks. * * If our level is DEFAULT, then just ack whatever was - * sent. + * sent. * * If he can't change and we can't change, * then degenerate to NOSUPPORT. @@ -372,7 +372,7 @@ change_slc(func, flag, val) slctab[func].defset.val; val = slctab[func].current.val; } - + } add_slc(func, flag, val); } @@ -423,7 +423,7 @@ check_slc() slctab[i].current.val); } } - + } /* check_slc */ /* diff --git a/secure/libexec/telnetd/state.c b/secure/libexec/telnetd/state.c index 2d327a5..fc5cbda 100644 --- a/secure/libexec/telnetd/state.c +++ b/secure/libexec/telnetd/state.c @@ -388,7 +388,7 @@ gotiac: switch (c) { * All state defaults are negative, and resp defaults to 0. * * When initiating a request to change state to new_state: - * + * * if ((want_resp == 0 && new_state == my_state) || want_state == new_state) { * do nothing; * } else { diff --git a/secure/libexec/telnetd/sys_term.c b/secure/libexec/telnetd/sys_term.c index 1e50216..000cfb5 100644 --- a/secure/libexec/telnetd/sys_term.c +++ b/secure/libexec/telnetd/sys_term.c @@ -1076,7 +1076,7 @@ getptyslave() #ifdef USE_TERMIO ttyfd = t; #endif - if (ioctl(t, I_PUSH, "ptem") < 0) + if (ioctl(t, I_PUSH, "ptem") < 0) fatal(net, "I_PUSH ptem"); if (ioctl(t, I_PUSH, "ldterm") < 0) fatal(net, "I_PUSH ldterm"); @@ -1576,7 +1576,7 @@ start_login(host, autologin, name) if (bftpd) { argv = addarg(argv, "-e"); argv = addarg(argv, BFTPPATH); - } else + } else #endif #if defined (SecurID) /* @@ -2061,7 +2061,7 @@ rmut() if (statbf.st_size && utmp) { nutmp = read(f, (char *)utmp, (int)statbf.st_size); nutmp /= sizeof(struct utmp); - + for (u = utmp ; u < &utmp[nutmp] ; u++) { if (SCMPN(u->ut_line, line+5) || u->ut_name[0]==0) diff --git a/secure/libexec/telnetd/telnetd.c b/secure/libexec/telnetd/telnetd.c index 6860534..66e040d 100644 --- a/secure/libexec/telnetd/telnetd.c +++ b/secure/libexec/telnetd/telnetd.c @@ -816,7 +816,7 @@ doit(who) #if defined(_SC_CRAY_SECURE_SYS) /* - * set ttyp line security label + * set ttyp line security label */ if (secflag) { char slave_dev[16]; @@ -1400,7 +1400,7 @@ telnet(f, p, host) } cleanup(0); } /* end of telnet */ - + #ifndef TCSIG # ifdef TIOCSIG # define TCSIG TIOCSIG @@ -1476,7 +1476,7 @@ int readstream(p, ibuf, bufsize) tp = (struct termio *) (ibuf+1 + sizeof(struct iocblk)); vstop = tp->c_cc[VSTOP]; vstart = tp->c_cc[VSTART]; - ixon = tp->c_iflag & IXON; + ixon = tp->c_iflag & IXON; break; default: errno = EAGAIN; diff --git a/secure/libexec/telnetd/termstat.c b/secure/libexec/telnetd/termstat.c index a3f6931..ec68442 100644 --- a/secure/libexec/telnetd/termstat.c +++ b/secure/libexec/telnetd/termstat.c @@ -320,7 +320,7 @@ localstat() nfrontp += 7; editmode = useeditmode; } - + /* * Check for changes to special characters in use. @@ -422,7 +422,7 @@ clientstat(code, parm1, parm2) uselinemode = 1; } } - + /* * Quit now if we can't do it. */ @@ -463,7 +463,7 @@ clientstat(code, parm1, parm2) send_will(TELOPT_ECHO, 1); } break; - + case LM_MODE: { register int ack, changed; @@ -512,7 +512,7 @@ clientstat(code, parm1, parm2) IAC, SE); nfrontp += 7; } - + editmode = useeditmode; } @@ -546,9 +546,9 @@ clientstat(code, parm1, parm2) (void) ioctl(pty, TIOCSWINSZ, (char *)&ws); } #endif /* TIOCSWINSZ */ - + break; - + case TELOPT_TSPEED: { def_tspeed = parm1; @@ -613,7 +613,7 @@ _termstat() * * Some things should not be done until after the login process has started * and all the pty modes are set to what they are supposed to be. This - * function is called when the pty state has been processed for the first time. + * function is called when the pty state has been processed for the first time. * It calls other functions that do things that were deferred in each module. */ void diff --git a/secure/libexec/telnetd/utility.c b/secure/libexec/telnetd/utility.c index 8c08bdc..c24feb3 100644 --- a/secure/libexec/telnetd/utility.c +++ b/secure/libexec/telnetd/utility.c @@ -713,7 +713,7 @@ printsub(direction, pointer, length) break; } break; - + case LM_SLC: sprintf(nfrontp, "SLC"); nfrontp += strlen(nfrontp); @@ -863,7 +863,7 @@ printsub(direction, pointer, length) nfrontp += strlen(nfrontp); break; - + default: sprintf(nfrontp, " %d", pointer[i]); nfrontp += strlen(nfrontp); @@ -966,7 +966,7 @@ printsub(direction, pointer, length) case TELOPT_AUTHENTICATION: sprintf(nfrontp, "AUTHENTICATION"); nfrontp += strlen(nfrontp); - + if (length < 2) { sprintf(nfrontp, " (empty suboption??\?)"); nfrontp += strlen(nfrontp); @@ -1171,13 +1171,13 @@ printdata(tag, ptr, cnt) nfrontp += strlen(nfrontp); for (i = 0; i < 20 && cnt; i++) { sprintf(nfrontp, "%02x", *ptr); - nfrontp += strlen(nfrontp); + nfrontp += strlen(nfrontp); if (isprint(*ptr)) { xbuf[i] = *ptr; } else { xbuf[i] = '.'; } - if (i % 2) { + if (i % 2) { *nfrontp = ' '; nfrontp++; } @@ -1187,6 +1187,6 @@ printdata(tag, ptr, cnt) xbuf[i] = '\0'; sprintf(nfrontp, " %s\r\n", xbuf ); nfrontp += strlen(nfrontp); - } + } } #endif /* DIAGNOSTICS */ diff --git a/secure/usr.bin/bdes/bdes.c b/secure/usr.bin/bdes/bdes.c index f702e01..257d549 100644 --- a/secure/usr.bin/bdes/bdes.c +++ b/secure/usr.bin/bdes/bdes.c @@ -1040,7 +1040,7 @@ compress(from, to) */ usage() { - (void)fprintf(stderr, "%s\n", + (void)fprintf(stderr, "%s\n", "usage: bdes [-abdp] [-F bit] [-f bit] [-k key] [-m bit] [-o bit] [-v vector]"); exit(1); } diff --git a/secure/usr.bin/telnet/commands.c b/secure/usr.bin/telnet/commands.c index dbbac49..3b7ee7b 100644 --- a/secure/usr.bin/telnet/commands.c +++ b/secure/usr.bin/telnet/commands.c @@ -234,7 +234,7 @@ control(c) * the "send" command. * */ - + struct sendlist { char *name; /* How user refers to it (case independent) */ char *help; /* Help information (0 ==> no help) */ @@ -2417,7 +2417,7 @@ tn(argc, argv) errno = oerrno; perror((char *)0); host->h_addr_list++; - memcpy((caddr_t)&sin.sin_addr, + memcpy((caddr_t)&sin.sin_addr, host->h_addr_list[0], host->h_length); (void) NetClose(net); continue; @@ -2804,10 +2804,10 @@ cmdrc(m1, m2) * *cpp: If *cpp was equal to NULL, it will be filled * in with a pointer to our static area that has * the option filled in. This will be 32bit aligned. - * + * * *lenp: This will be filled in with how long the option * pointed to by *cpp is. - * + * */ unsigned long sourceroute(arg, cpp, lenp) diff --git a/secure/usr.bin/telnet/main.c b/secure/usr.bin/telnet/main.c index ce22840..e802271 100644 --- a/secure/usr.bin/telnet/main.c +++ b/secure/usr.bin/telnet/main.c @@ -65,7 +65,7 @@ tninit() init_terminal(); init_network(); - + init_telnet(); init_sys(); @@ -192,7 +192,7 @@ main(argc, argv) case 'f': #if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD) if (forward_flags & OPTS_FORWARD_CREDS) { - fprintf(stderr, + fprintf(stderr, "%s: Only one of -f and -F allowed.\n", prompt); usage(); @@ -200,14 +200,14 @@ main(argc, argv) forward_flags |= OPTS_FORWARD_CREDS; #else fprintf(stderr, - "%s: Warning: -f ignored, no Kerberos V5 support.\n", + "%s: Warning: -f ignored, no Kerberos V5 support.\n", prompt); #endif break; case 'F': #if defined(AUTHENTICATION) && defined(KRB5) && defined(FORWARD) if (forward_flags & OPTS_FORWARD_CREDS) { - fprintf(stderr, + fprintf(stderr, "%s: Only one of -f and -F allowed.\n", prompt); usage(); @@ -216,7 +216,7 @@ main(argc, argv) forward_flags |= OPTS_FORWARDABLE_CREDS; #else fprintf(stderr, - "%s: Warning: -F ignored, no Kerberos V5 support.\n", + "%s: Warning: -F ignored, no Kerberos V5 support.\n", prompt); #endif break; diff --git a/secure/usr.bin/telnet/sys_bsd.c b/secure/usr.bin/telnet/sys_bsd.c index 85414e2..c55f85a 100644 --- a/secure/usr.bin/telnet/sys_bsd.c +++ b/secure/usr.bin/telnet/sys_bsd.c @@ -223,7 +223,7 @@ TerminalSpecialChars(c) /* * Flush output to the terminal */ - + void TerminalFlushOutput() { @@ -946,7 +946,7 @@ process_rings(netin, netout, netex, ttyin, ttyout, poll) if (netout) { FD_SET(net, &obits); - } + } if (ttyout) { FD_SET(tout, &obits); } diff --git a/secure/usr.bin/telnet/telnet.c b/secure/usr.bin/telnet/telnet.c index 97f63e6..687ac83 100644 --- a/secure/usr.bin/telnet/telnet.c +++ b/secure/usr.bin/telnet/telnet.c @@ -177,7 +177,7 @@ init_telnet() ClearArray(options); connected = In3270 = ISend = localflow = donebinarytoggle = 0; -#if defined(AUTHENTICATION) || defined(ENCRYPTION) +#if defined(AUTHENTICATION) || defined(ENCRYPTION) auth_encrypt_connect(connected); #endif /* defined(AUTHENTICATION) || defined(ENCRYPTION) */ restartany = -1; @@ -689,7 +689,7 @@ mklist(buf, name) else if (islower(c)) *cp = toupper(c); } - + /* * Check for an old V6 2 character name. If the second * name points to the beginning of the buffer, and is @@ -1834,7 +1834,7 @@ telrcv() case TS_IAC: process_iac: switch (c) { - + case WILL: telrcv_state = TS_WILL; continue; @@ -2249,7 +2249,7 @@ telnet(user) { sys_telnet_init(); -#if defined(AUTHENTICATION) || defined(ENCRYPTION) +#if defined(AUTHENTICATION) || defined(ENCRYPTION) { static char local_host[256] = { 0 }; diff --git a/secure/usr.bin/telnet/utilities.c b/secure/usr.bin/telnet/utilities.c index 70cf567..2f451ca 100644 --- a/secure/usr.bin/telnet/utilities.c +++ b/secure/usr.bin/telnet/utilities.c @@ -593,7 +593,7 @@ printsub(direction, pointer, length) break; } break; - + case LM_SLC: fprintf(NetTrace, "SLC"); for (i = 2; i < length - 2; i += 3) { @@ -725,7 +725,7 @@ printsub(direction, pointer, length) fprintf(NetTrace, "\n"); break; - + default: fprintf(NetTrace, " %d", pointer[i]); break; diff --git a/secure/usr.sbin/xntpd/lib/authdes.c b/secure/usr.sbin/xntpd/lib/authdes.c index 7756d92..d6d8d1b 100644 --- a/secure/usr.sbin/xntpd/lib/authdes.c +++ b/secure/usr.sbin/xntpd/lib/authdes.c @@ -261,7 +261,7 @@ DESauth_subkeys(key, encryptkeys, decryptkeys) | (PC1_DL[(tmp >> 17) & 0xf] << 1) | (PC1_DL[(tmp >> 9) & 0xf] << 2) | (PC1_DL[(tmp >> 1) & 0xf] << 3); - + tmp = *(key+1); /* right part of key */ c |= PC1_CR[(tmp >> 28) & 0xf] | (PC1_CR[(tmp >> 20) & 0xf] << 1) @@ -775,7 +775,7 @@ DESauth_des(data, subkeys) | (IP[(temp >> 8) & 0xff] << 2) | (IP[temp & 0xff] << 3); #endif - + /* * Same thing again except for the right half. */ @@ -791,7 +791,7 @@ DESauth_des(data, subkeys) | (IP[(temp >> 8) & 0xff] << 2) | (IP[temp & 0xff] << 3); #endif - + /* * Do the 16 rounds through the cipher function. We actually * do two at a time, one on the left half and one on the right @@ -816,7 +816,7 @@ DESauth_des(data, subkeys) left ^= SP[6][((temp >> 2) & 0x3f) ^ *kp++]; left ^= SP[7][(((right << 1) | ((right & 0x80000000)?1:0)) & 0x3f) ^ *kp++]; - + /* * Careful here. Right now `right' is actually the * left side and `left' is the right side. Do the -- cgit v1.1