diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | authfile.c | 4 | ||||
| -rw-r--r-- | kex.c | 4 | ||||
| -rw-r--r-- | kexdh.c | 4 | ||||
| -rw-r--r-- | kexgex.c | 4 | ||||
| -rw-r--r-- | key.c | 4 | ||||
| -rw-r--r-- | ssh-dss.c | 6 |
7 files changed, 17 insertions, 14 deletions
@@ -17,6 +17,9 @@ - stevesk@cvs.openbsd.org 2002/02/27 21:23:13 [canohost.c channels.c packet.c sshd.c] remove unneeded casts in [gs]etsockopt(); ok markus@ + - markus@cvs.openbsd.org 2002/02/28 15:46:33 + [authfile.c kex.c kexdh.c kexgex.c key.c ssh-dss.c] + add some const EVP_MD for openssl-0.9.7 20020226 - (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests @@ -7748,4 +7751,4 @@ - Wrote replacements for strlcpy and mkdtemp - Released 1.0pre1 -$Id: ChangeLog,v 1.1895 2002/03/05 01:31:28 mouring Exp $ +$Id: ChangeLog,v 1.1896 2002/03/05 01:33:36 mouring Exp $ @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: authfile.c,v 1.47 2002/02/24 19:14:59 markus Exp $"); +RCSID("$OpenBSD: authfile.c,v 1.48 2002/02/28 15:46:33 markus Exp $"); #include <openssl/err.h> #include <openssl/evp.h> @@ -169,7 +169,7 @@ key_save_private_pem(Key *key, const char *filename, const char *_passphrase, int success = 0; int len = strlen(_passphrase); u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL; - EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL; + const EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL; if (len > 0 && len <= 4) { error("passphrase too short: have %d bytes, need > 4", len); @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: kex.c,v 1.46 2002/02/23 17:59:02 markus Exp $"); +RCSID("$OpenBSD: kex.c,v 1.47 2002/02/28 15:46:33 markus Exp $"); #include <openssl/crypto.h> @@ -361,7 +361,7 @@ static u_char * derive_key(Kex *kex, int id, int need, u_char *hash, BIGNUM *shared_secret) { Buffer b; - EVP_MD *evp_md = EVP_sha1(); + const EVP_MD *evp_md = EVP_sha1(); EVP_MD_CTX md; char c = id; int have; @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: kexdh.c,v 1.16 2002/02/24 19:14:59 markus Exp $"); +RCSID("$OpenBSD: kexdh.c,v 1.17 2002/02/28 15:46:33 markus Exp $"); #include <openssl/crypto.h> #include <openssl/bn.h> @@ -51,7 +51,7 @@ kex_dh_hash( { Buffer b; static u_char digest[EVP_MAX_MD_SIZE]; - EVP_MD *evp_md = EVP_sha1(); + const EVP_MD *evp_md = EVP_sha1(); EVP_MD_CTX md; buffer_init(&b); @@ -24,7 +24,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: kexgex.c,v 1.19 2002/02/24 19:14:59 markus Exp $"); +RCSID("$OpenBSD: kexgex.c,v 1.20 2002/02/28 15:46:33 markus Exp $"); #include <openssl/bn.h> @@ -53,7 +53,7 @@ kexgex_hash( { Buffer b; static u_char digest[EVP_MAX_MD_SIZE]; - EVP_MD *evp_md = EVP_sha1(); + const EVP_MD *evp_md = EVP_sha1(); EVP_MD_CTX md; buffer_init(&b); @@ -32,7 +32,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "includes.h" -RCSID("$OpenBSD: key.c,v 1.40 2002/02/24 19:14:59 markus Exp $"); +RCSID("$OpenBSD: key.c,v 1.41 2002/02/28 15:46:33 markus Exp $"); #include <openssl/evp.h> @@ -172,7 +172,7 @@ key_equal(Key *a, Key *b) static u_char* key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length) { - EVP_MD *md = NULL; + const EVP_MD *md = NULL; EVP_MD_CTX ctx; u_char *blob = NULL; u_char *retval = NULL; @@ -23,7 +23,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: ssh-dss.c,v 1.13 2002/02/24 19:14:59 markus Exp $"); +RCSID("$OpenBSD: ssh-dss.c,v 1.14 2002/02/28 15:46:33 markus Exp $"); #include <openssl/bn.h> #include <openssl/evp.h> @@ -46,7 +46,7 @@ ssh_dss_sign( u_char *data, u_int datalen) { DSA_SIG *sig; - EVP_MD *evp_md = EVP_sha1(); + const EVP_MD *evp_md = EVP_sha1(); EVP_MD_CTX md; u_char *ret, digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN]; u_int rlen, slen, len, dlen; @@ -110,7 +110,7 @@ ssh_dss_verify( u_char *data, u_int datalen) { DSA_SIG *sig; - EVP_MD *evp_md = EVP_sha1(); + const EVP_MD *evp_md = EVP_sha1(); EVP_MD_CTX md; u_char digest[EVP_MAX_MD_SIZE], *sigblob; u_int len, dlen; |