summaryrefslogtreecommitdiff
path: root/cipher.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-03-22 02:54:23 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-03-22 02:54:23 +0000
commit6328ab39891ea64ccd5c91e9be2ec5c4f843bbd0 (patch)
tree1cbd94cc201fc901cf33ea52191421eda89e6dd0 /cipher.c
parent08105192fdb9441284ac37e309f6359d74aee596 (diff)
- markus@cvs.openbsd.org 2002/03/19 10:49:35
[auth-krb5.c auth-rh-rsa.c auth.c cipher.c key.c misc.h packet.c session.c sftp-client.c sftp-glob.h sftp.c ssh-add.c ssh.c sshconnect2.c sshd.c ttymodes.c] KNF whitespace
Diffstat (limited to 'cipher.c')
-rw-r--r--cipher.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/cipher.c b/cipher.c
index 7a9c9c491..b899fcd22 100644
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
35 */ 35 */
36 36
37#include "includes.h" 37#include "includes.h"
38RCSID("$OpenBSD: cipher.c,v 1.53 2002/03/18 17:13:15 markus Exp $"); 38RCSID("$OpenBSD: cipher.c,v 1.54 2002/03/19 10:49:35 markus Exp $");
39 39
40#include "xmalloc.h" 40#include "xmalloc.h"
41#include "log.h" 41#include "log.h"
@@ -78,17 +78,17 @@ struct Cipher {
78 78
79/*--*/ 79/*--*/
80 80
81u_int 81u_int
82cipher_blocksize(Cipher *c) 82cipher_blocksize(Cipher *c)
83{ 83{
84 return (c->block_size); 84 return (c->block_size);
85} 85}
86u_int 86u_int
87cipher_keylen(Cipher *c) 87cipher_keylen(Cipher *c)
88{ 88{
89 return (c->key_len); 89 return (c->key_len);
90} 90}
91u_int 91u_int
92cipher_get_number(Cipher *c) 92cipher_get_number(Cipher *c)
93{ 93{
94 return (c->number); 94 return (c->number);
@@ -509,7 +509,7 @@ ssh_rijndael_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src,
509 rijndael_decrypt(&c->r_ctx, cnow, plain); 509 rijndael_decrypt(&c->r_ctx, cnow, plain);
510} 510}
511 511
512/* 512/*
513 * Exports an IV from the CipherContext required to export the key 513 * Exports an IV from the CipherContext required to export the key
514 * state back from the unprivileged child to the privileged parent 514 * state back from the unprivileged child to the privileged parent
515 * process. 515 * process.
@@ -612,7 +612,7 @@ cipher_set_keyiv(CipherContext *cc, u_char *iv)
612 memcpy(desc->k2.iv, iv + 8, 8); 612 memcpy(desc->k2.iv, iv + 8, 8);
613 memcpy(desc->k3.iv, iv + 16, 8); 613 memcpy(desc->k3.iv, iv + 16, 8);
614 return; 614 return;
615 } 615 }
616 default: 616 default:
617 fatal("%s: bad cipher %d", __FUNCTION__, c->number); 617 fatal("%s: bad cipher %d", __FUNCTION__, c->number);
618 } 618 }