diff options
| author | Damien Miller <djm@mindrot.org> | 2001-12-21 14:45:46 +1100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2001-12-21 14:45:46 +1100 |
| commit | 9f0f5c64bc4b6144e3fed6a7f538f7c21819a492 (patch) | |
| tree | f79317ab211f59181a61b526f566e9c8cfe70c73 /cipher.c | |
| parent | 89681214ca2f50a1b1ed6164c3afe1ce14995ffc (diff) | |
- deraadt@cvs.openbsd.org 2001/12/19 07:18:56
[auth1.c auth2.c auth2-chall.c auth-bsdauth.c auth.c authfile.c auth.h]
[auth-krb4.c auth-rhosts.c auth-skey.c bufaux.c canohost.c channels.c]
[cipher.c clientloop.c compat.c compress.c deattack.c key.c log.c mac.c]
[match.c misc.c nchan.c packet.c readconf.c rijndael.c rijndael.h scard.c]
[servconf.c servconf.h serverloop.c session.c sftp.c sftp-client.c]
[sftp-glob.c sftp-int.c sftp-server.c ssh-add.c ssh-agent.c ssh.c]
[sshconnect1.c sshconnect2.c sshconnect.c sshd.8 sshd.c sshd_config]
[ssh-keygen.c sshlogin.c sshpty.c sshtty.c ttymodes.c uidswap.c]
basic KNF done while i was looking for something else
Diffstat (limited to 'cipher.c')
| -rw-r--r-- | cipher.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: cipher.c,v 1.47 2001/08/23 11:31:59 markus Exp $"); +RCSID("$OpenBSD: cipher.c,v 1.48 2001/12/19 07:18:56 deraadt Exp $"); #include "xmalloc.h" #include "log.h" @@ -184,14 +184,14 @@ blowfish_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) } static void blowfish_cbc_encrypt(CipherContext *cc, u_char *dest, const u_char *src, - u_int len) + u_int len) { BF_cbc_encrypt((void *)src, dest, len, &cc->u.bf.key, cc->u.bf.iv, BF_ENCRYPT); } static void blowfish_cbc_decrypt(CipherContext *cc, u_char *dest, const u_char *src, - u_int len) + u_int len) { BF_cbc_encrypt((void *)src, dest, len, &cc->u.bf.key, cc->u.bf.iv, BF_DECRYPT); @@ -289,7 +289,7 @@ rijndael_setkey(CipherContext *cc, const u_char *key, u_int keylen) static void rijndael_setiv(CipherContext *cc, const u_char *iv, u_int ivlen) { - if (iv == NULL || ivlen != RIJNDAEL_BLOCKSIZE) + if (iv == NULL || ivlen != RIJNDAEL_BLOCKSIZE) fatal("bad/no IV for %s.", cc->cipher->name); memcpy(cc->u.rijndael.iv, iv, RIJNDAEL_BLOCKSIZE); } @@ -417,7 +417,7 @@ u_int cipher_mask_ssh1(int client) { u_int mask = 0; - mask |= 1 << SSH_CIPHER_3DES; /* Mandatory */ + mask |= 1 << SSH_CIPHER_3DES; /* Mandatory */ mask |= 1 << SSH_CIPHER_BLOWFISH; if (client) { mask |= 1 << SSH_CIPHER_DES; @@ -457,7 +457,7 @@ ciphers_valid(const char *names) return 0; ciphers = cp = xstrdup(names); for ((p = strsep(&cp, CIPHER_SEP)); p && *p != '\0'; - (p = strsep(&cp, CIPHER_SEP))) { + (p = strsep(&cp, CIPHER_SEP))) { c = cipher_by_name(p); if (c == NULL || c->number != SSH_CIPHER_SSH2) { debug("bad cipher %s [%s]", p, names); |