summaryrefslogtreecommitdiff
path: root/cipher.c
diff options
context:
space:
mode:
authormouring <mouring>2002-06-06 19:48:16 +0000
committermouring <mouring>2002-06-06 19:48:16 +0000
commitb59e5e6c1d42f3fd2e1f601eadd72174a4c42e5a (patch)
tree61ed052029e2a3f35f572af955a43c8773b27216 /cipher.c
parenta37d8f8ed0fac21b5f2968936a327dce97010578 (diff)
downloadopenssh-b59e5e6c1d42f3fd2e1f601eadd72174a4c42e5a.tar.gz
- markus@cvs.openbsd.org 2002/05/16 22:02:50
[cipher.c kex.h mac.c] fix warnings (openssl 0.9.7 requires const)
Diffstat (limited to 'cipher.c')
-rw-r--r--cipher.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/cipher.c b/cipher.c
index 86d92340..0078f5aa 100644
--- a/cipher.c
+++ b/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"
@@ -49,16 +49,16 @@ RCSID("$OpenBSD: cipher.c,v 1.55 2002/04/03 09:26:11 markus Exp $");
#define EVP_CIPHER_CTX_get_app_data(e) ((e)->app_data)
#endif
-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 },
@@ -379,7 +379,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;
@@ -431,7 +431,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;
@@ -529,7 +529,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;