summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-23 21:21:30 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-23 21:21:30 +0000
commit836f0e9d9a847ad0510ff50b2bedc58e295e0913 (patch)
tree7a8e14798be0aae3c9d234eb9c38e8ca42dd3e76
parent2953d0fb4eda727762c52eaa005ca56c621d0d25 (diff)
- deraadt@cvs.openbsd.org 2002/06/23 03:26:19
[cipher.c key.c] KNF
-rw-r--r--ChangeLog5
-rw-r--r--cipher.c14
-rw-r--r--key.c10
3 files changed, 25 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 93bef7c3..bf795be2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
- deraadt@cvs.openbsd.org 2002/06/23 03:25:50
[tildexpand.c]
KNF
+ - deraadt@cvs.openbsd.org 2002/06/23 03:26:19
+ [cipher.c key.c]
+ KNF
20020623
- (stevesk) [configure.ac] bug #255 LOGIN_NEEDS_UTMPX for AIX.
@@ -1047,4 +1050,4 @@
- (stevesk) entropy.c: typo in debug message
- (djm) ssh-keygen -i needs seeded RNG; report from markus@
-$Id: ChangeLog,v 1.2254 2002/06/23 21:20:34 mouring Exp $
+$Id: ChangeLog,v 1.2255 2002/06/23 21:21:30 mouring Exp $
diff --git a/cipher.c b/cipher.c
index b18c701f..6db340d7 100644
--- a/cipher.c
+++ b/cipher.c
@@ -35,7 +35,7 @@
*/
#include "includes.h"
-RCSID("$OpenBSD: cipher.c,v 1.59 2002/06/19 18:01:00 markus Exp $");
+RCSID("$OpenBSD: cipher.c,v 1.60 2002/06/23 03:26:52 deraadt Exp $");
#include "xmalloc.h"
#include "log.h"
@@ -95,11 +95,13 @@ cipher_blocksize(Cipher *c)
{
return (c->block_size);
}
+
u_int
cipher_keylen(Cipher *c)
{
return (c->key_len);
}
+
u_int
cipher_get_number(Cipher *c)
{
@@ -314,6 +316,7 @@ struct ssh1_3des_ctx
{
EVP_CIPHER_CTX k1, k2, k3;
};
+
static int
ssh1_3des_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
int enc)
@@ -356,6 +359,7 @@ ssh1_3des_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
#endif
return (1);
}
+
static int
ssh1_3des_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, u_int len)
{
@@ -377,6 +381,7 @@ ssh1_3des_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src, u_int len)
#endif
return (1);
}
+
static int
ssh1_3des_cleanup(EVP_CIPHER_CTX *ctx)
{
@@ -389,6 +394,7 @@ ssh1_3des_cleanup(EVP_CIPHER_CTX *ctx)
}
return (1);
}
+
static const EVP_CIPHER *
evp_ssh1_3des(void)
{
@@ -430,7 +436,9 @@ swap_bytes(const u_char *src, u_char *dst, int n)
*dst++ = c[3];
}
}
+
static int (*orig_bf)(EVP_CIPHER_CTX *, u_char *, const u_char *, u_int) = NULL;
+
static int
bf_ssh1_cipher(EVP_CIPHER_CTX *ctx, u_char *out, const u_char *in, u_int len)
{
@@ -441,6 +449,7 @@ bf_ssh1_cipher(EVP_CIPHER_CTX *ctx, u_char *out, const u_char *in, u_int len)
swap_bytes(out, out, len);
return (ret);
}
+
static const EVP_CIPHER *
evp_ssh1_bf(void)
{
@@ -483,6 +492,7 @@ ssh_rijndael_init(EVP_CIPHER_CTX *ctx, const u_char *key, const u_char *iv,
memcpy(c->r_iv, iv, RIJNDAEL_BLOCKSIZE);
return (1);
}
+
static int
ssh_rijndael_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src,
u_int len)
@@ -528,6 +538,7 @@ ssh_rijndael_cbc(EVP_CIPHER_CTX *ctx, u_char *dest, const u_char *src,
}
return (1);
}
+
static int
ssh_rijndael_cleanup(EVP_CIPHER_CTX *ctx)
{
@@ -540,6 +551,7 @@ ssh_rijndael_cleanup(EVP_CIPHER_CTX *ctx)
}
return (1);
}
+
static const EVP_CIPHER *
evp_rijndael(void)
{
diff --git a/key.c b/key.c
index 2d850c8e..fb1f8410 100644
--- a/key.c
+++ b/key.c
@@ -32,7 +32,7 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "includes.h"
-RCSID("$OpenBSD: key.c,v 1.44 2002/05/31 13:16:48 markus Exp $");
+RCSID("$OpenBSD: key.c,v 1.45 2002/06/23 03:26:19 deraadt Exp $");
#include <openssl/evp.h>
@@ -89,6 +89,7 @@ key_new(int type)
}
return k;
}
+
Key *
key_new_private(int type)
{
@@ -120,6 +121,7 @@ key_new_private(int type)
}
return k;
}
+
void
key_free(Key *k)
{
@@ -359,6 +361,7 @@ read_bignum(char **cpp, BIGNUM * value)
*cpp = cp;
return 1;
}
+
static int
write_bignum(FILE *f, BIGNUM *num)
{
@@ -485,6 +488,7 @@ key_read(Key *ret, char **cpp)
}
return success;
}
+
int
key_write(Key *key, FILE *f)
{
@@ -516,6 +520,7 @@ key_write(Key *key, FILE *f)
}
return success;
}
+
char *
key_type(Key *k)
{
@@ -532,6 +537,7 @@ key_type(Key *k)
}
return "unknown";
}
+
char *
key_ssh_name(Key *k)
{
@@ -545,6 +551,7 @@ key_ssh_name(Key *k)
}
return "ssh-unknown";
}
+
u_int
key_size(Key *k)
{
@@ -807,7 +814,6 @@ key_verify(
}
/* Converts a private to a public key */
-
Key *
key_demote(Key *k)
{