- markus@cvs.openbsd.org 2002/05/16 22:02:50

     [cipher.c kex.h mac.c]
     fix warnings (openssl 0.9.7 requires const)

4 files changed, 16 insertions, 13 deletions

diff --git a/ChangeLog b/ChangeLog
index 363120510..83fd9d6f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
    - markus@cvs.openbsd.org 2002/05/15 21:56:38
      [servconf.c sshd.8 sshd_config]
      re-enable privsep and disable setuid for post-3.2.2
+   - markus@cvs.openbsd.org 2002/05/16 22:02:50
+     [cipher.c kex.h mac.c]
+     fix warnings (openssl 0.9.7 requires const)
 
 20020604
  - (stevesk) [channels.c] bug #164 patch from YOSHIFUJI Hideaki (changed
@@ -687,4 +690,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2144 2002/06/06 19:47:11 mouring Exp $
+$Id: ChangeLog,v 1.2145 2002/06/06 19:48:16 mouring Exp $
diff --git a/cipher.c b/cipher.c
index 86d923409..0078f5aad 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;
diff --git a/kex.h b/kex.h
index 2d3523a36..12edcdc63 100644
--- a/kex.h
+++ b/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/mac.c b/mac.c
index b250af2aa..ab9a03d84 100644
--- a/mac.c
+++ b/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, },