diff options
| author | Markus Friedl <markus@cvs.openbsd.org> | 2002-05-16 22:02:51 +0000 |
|---|---|---|
| committer | Markus Friedl <markus@cvs.openbsd.org> | 2002-05-16 22:02:51 +0000 |
| commit | 3ed6a41e4cd4b3e534217e4a432ff171e945f9d9 (patch) | |
| tree | f4d0d6db8555fa0b428b1f07b95e30f2b73768a4 /usr.bin/ssh | |
| parent | 1ce174a7b8b5dd10f45feb4c736912e3d1a76763 (diff) | |
fix warnings (openssl 0.9.7 requires const)
Diffstat (limited to 'usr.bin/ssh')
| -rw-r--r-- | usr.bin/ssh/cipher.c | 16 | ||||
| -rw-r--r-- | usr.bin/ssh/kex.h | 4 | ||||
| -rw-r--r-- | usr.bin/ssh/mac.c | 4 |
3 files changed, 12 insertions, 12 deletions
diff --git a/usr.bin/ssh/cipher.c b/usr.bin/ssh/cipher.c index b09e37940c4..c3bc744886f 100644 --- a/usr.bin/ssh/cipher.c +++ b/usr.bin/ssh/cipher.c @@ -35,7 +35,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: cipher.c,v 1.55 2002/04/03 09:26:11 markus Exp $"); +RCSID("$OpenBSD: cipher.c,v 1.56 2002/05/16 22:02:50 markus Exp $"); #include "xmalloc.h" #include "log.h" @@ -44,16 +44,16 @@ RCSID("$OpenBSD: cipher.c,v 1.55 2002/04/03 09:26:11 markus Exp $"); #include <openssl/md5.h> #include "rijndael.h" -static EVP_CIPHER *evp_ssh1_3des(void); -static EVP_CIPHER *evp_ssh1_bf(void); -static EVP_CIPHER *evp_rijndael(void); +static const EVP_CIPHER *evp_ssh1_3des(void); +static const EVP_CIPHER *evp_ssh1_bf(void); +static const EVP_CIPHER *evp_rijndael(void); struct Cipher { char *name; int number; /* for ssh1 only */ u_int block_size; u_int key_len; - EVP_CIPHER *(*evptype)(void); + const EVP_CIPHER *(*evptype)(void); } ciphers[] = { { "none", SSH_CIPHER_NONE, 8, 0, EVP_enc_null }, { "des", SSH_CIPHER_DES, 8, 8, EVP_des_cbc }, @@ -340,7 +340,7 @@ ssh1_3des_cleanup(EVP_CIPHER_CTX *ctx) } return (1); } -static EVP_CIPHER * +static const EVP_CIPHER * evp_ssh1_3des(void) { static EVP_CIPHER ssh1_3des; @@ -390,7 +390,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 EVP_CIPHER * +static const EVP_CIPHER * evp_ssh1_bf(void) { static EVP_CIPHER ssh1_bf; @@ -488,7 +488,7 @@ ssh_rijndael_cleanup(EVP_CIPHER_CTX *ctx) } return (1); } -static EVP_CIPHER * +static const EVP_CIPHER * evp_rijndael(void) { static EVP_CIPHER rijndal_cbc; diff --git a/usr.bin/ssh/kex.h b/usr.bin/ssh/kex.h index 2d3523a3633..12edcdc63b3 100644 --- a/usr.bin/ssh/kex.h +++ b/usr.bin/ssh/kex.h @@ -1,4 +1,4 @@ -/* $OpenBSD: kex.h,v 1.30 2002/03/18 17:50:31 provos Exp $ */ +/* $OpenBSD: kex.h,v 1.31 2002/05/16 22:02:50 markus Exp $ */ /* * Copyright (c) 2000, 2001 Markus Friedl. All rights reserved. @@ -79,7 +79,7 @@ struct Enc { struct Mac { char *name; int enabled; - EVP_MD *md; + const EVP_MD *md; int mac_len; u_char *key; int key_len; diff --git a/usr.bin/ssh/mac.c b/usr.bin/ssh/mac.c index b250af2aa34..ab9a03d84e8 100644 --- a/usr.bin/ssh/mac.c +++ b/usr.bin/ssh/mac.c @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: mac.c,v 1.4 2002/01/25 22:07:40 markus Exp $"); +RCSID("$OpenBSD: mac.c,v 1.5 2002/05/16 22:02:50 markus Exp $"); #include <openssl/hmac.h> @@ -36,7 +36,7 @@ RCSID("$OpenBSD: mac.c,v 1.4 2002/01/25 22:07:40 markus Exp $"); struct { char *name; - EVP_MD * (*mdfunc)(void); + const EVP_MD * (*mdfunc)(void); int truncatebits; /* truncate digest if != 0 */ } macs[] = { { "hmac-sha1", EVP_sha1, 0, }, |