diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-03-05 01:33:36 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-03-05 01:33:36 +0000 |
commit | 80cb27dd7c7caa07615bf375a3bd090085f2d33d (patch) | |
tree | b9ca8e705cd36815131349a021ad0546eb44dda9 | |
parent | 733a2351f52f8c8451a61f0ae636081f55b019f7 (diff) |
- 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
-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 @@ | |||
17 | - stevesk@cvs.openbsd.org 2002/02/27 21:23:13 | 17 | - stevesk@cvs.openbsd.org 2002/02/27 21:23:13 |
18 | [canohost.c channels.c packet.c sshd.c] | 18 | [canohost.c channels.c packet.c sshd.c] |
19 | remove unneeded casts in [gs]etsockopt(); ok markus@ | 19 | remove unneeded casts in [gs]etsockopt(); ok markus@ |
20 | - markus@cvs.openbsd.org 2002/02/28 15:46:33 | ||
21 | [authfile.c kex.c kexdh.c kexgex.c key.c ssh-dss.c] | ||
22 | add some const EVP_MD for openssl-0.9.7 | ||
20 | 23 | ||
21 | 20020226 | 24 | 20020226 |
22 | - (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests | 25 | - (tim) Bug 12 [configure.ac] add sys/bitypes.h to int64_t tests |
@@ -7748,4 +7751,4 @@ | |||
7748 | - Wrote replacements for strlcpy and mkdtemp | 7751 | - Wrote replacements for strlcpy and mkdtemp |
7749 | - Released 1.0pre1 | 7752 | - Released 1.0pre1 |
7750 | 7753 | ||
7751 | $Id: ChangeLog,v 1.1895 2002/03/05 01:31:28 mouring Exp $ | 7754 | $Id: ChangeLog,v 1.1896 2002/03/05 01:33:36 mouring Exp $ |
diff --git a/authfile.c b/authfile.c index 50ae9aa78..de8b1022e 100644 --- a/authfile.c +++ b/authfile.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: authfile.c,v 1.47 2002/02/24 19:14:59 markus Exp $"); | 39 | RCSID("$OpenBSD: authfile.c,v 1.48 2002/02/28 15:46:33 markus Exp $"); |
40 | 40 | ||
41 | #include <openssl/err.h> | 41 | #include <openssl/err.h> |
42 | #include <openssl/evp.h> | 42 | #include <openssl/evp.h> |
@@ -169,7 +169,7 @@ key_save_private_pem(Key *key, const char *filename, const char *_passphrase, | |||
169 | int success = 0; | 169 | int success = 0; |
170 | int len = strlen(_passphrase); | 170 | int len = strlen(_passphrase); |
171 | u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL; | 171 | u_char *passphrase = (len > 0) ? (u_char *)_passphrase : NULL; |
172 | EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL; | 172 | const EVP_CIPHER *cipher = (len > 0) ? EVP_des_ede3_cbc() : NULL; |
173 | 173 | ||
174 | if (len > 0 && len <= 4) { | 174 | if (len > 0 && len <= 4) { |
175 | error("passphrase too short: have %d bytes, need > 4", len); | 175 | error("passphrase too short: have %d bytes, need > 4", len); |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.46 2002/02/23 17:59:02 markus Exp $"); | 26 | RCSID("$OpenBSD: kex.c,v 1.47 2002/02/28 15:46:33 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | 29 | ||
@@ -361,7 +361,7 @@ static u_char * | |||
361 | derive_key(Kex *kex, int id, int need, u_char *hash, BIGNUM *shared_secret) | 361 | derive_key(Kex *kex, int id, int need, u_char *hash, BIGNUM *shared_secret) |
362 | { | 362 | { |
363 | Buffer b; | 363 | Buffer b; |
364 | EVP_MD *evp_md = EVP_sha1(); | 364 | const EVP_MD *evp_md = EVP_sha1(); |
365 | EVP_MD_CTX md; | 365 | EVP_MD_CTX md; |
366 | char c = id; | 366 | char c = id; |
367 | int have; | 367 | int have; |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kexdh.c,v 1.16 2002/02/24 19:14:59 markus Exp $"); | 26 | RCSID("$OpenBSD: kexdh.c,v 1.17 2002/02/28 15:46:33 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | #include <openssl/bn.h> | 29 | #include <openssl/bn.h> |
@@ -51,7 +51,7 @@ kex_dh_hash( | |||
51 | { | 51 | { |
52 | Buffer b; | 52 | Buffer b; |
53 | static u_char digest[EVP_MAX_MD_SIZE]; | 53 | static u_char digest[EVP_MAX_MD_SIZE]; |
54 | EVP_MD *evp_md = EVP_sha1(); | 54 | const EVP_MD *evp_md = EVP_sha1(); |
55 | EVP_MD_CTX md; | 55 | EVP_MD_CTX md; |
56 | 56 | ||
57 | buffer_init(&b); | 57 | buffer_init(&b); |
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: kexgex.c,v 1.19 2002/02/24 19:14:59 markus Exp $"); | 27 | RCSID("$OpenBSD: kexgex.c,v 1.20 2002/02/28 15:46:33 markus Exp $"); |
28 | 28 | ||
29 | #include <openssl/bn.h> | 29 | #include <openssl/bn.h> |
30 | 30 | ||
@@ -53,7 +53,7 @@ kexgex_hash( | |||
53 | { | 53 | { |
54 | Buffer b; | 54 | Buffer b; |
55 | static u_char digest[EVP_MAX_MD_SIZE]; | 55 | static u_char digest[EVP_MAX_MD_SIZE]; |
56 | EVP_MD *evp_md = EVP_sha1(); | 56 | const EVP_MD *evp_md = EVP_sha1(); |
57 | EVP_MD_CTX md; | 57 | EVP_MD_CTX md; |
58 | 58 | ||
59 | buffer_init(&b); | 59 | buffer_init(&b); |
@@ -32,7 +32,7 @@ | |||
32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 32 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
33 | */ | 33 | */ |
34 | #include "includes.h" | 34 | #include "includes.h" |
35 | RCSID("$OpenBSD: key.c,v 1.40 2002/02/24 19:14:59 markus Exp $"); | 35 | RCSID("$OpenBSD: key.c,v 1.41 2002/02/28 15:46:33 markus Exp $"); |
36 | 36 | ||
37 | #include <openssl/evp.h> | 37 | #include <openssl/evp.h> |
38 | 38 | ||
@@ -172,7 +172,7 @@ key_equal(Key *a, Key *b) | |||
172 | static u_char* | 172 | static u_char* |
173 | key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length) | 173 | key_fingerprint_raw(Key *k, enum fp_type dgst_type, u_int *dgst_raw_length) |
174 | { | 174 | { |
175 | EVP_MD *md = NULL; | 175 | const EVP_MD *md = NULL; |
176 | EVP_MD_CTX ctx; | 176 | EVP_MD_CTX ctx; |
177 | u_char *blob = NULL; | 177 | u_char *blob = NULL; |
178 | u_char *retval = NULL; | 178 | u_char *retval = NULL; |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: ssh-dss.c,v 1.13 2002/02/24 19:14:59 markus Exp $"); | 26 | RCSID("$OpenBSD: ssh-dss.c,v 1.14 2002/02/28 15:46:33 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/bn.h> | 28 | #include <openssl/bn.h> |
29 | #include <openssl/evp.h> | 29 | #include <openssl/evp.h> |
@@ -46,7 +46,7 @@ ssh_dss_sign( | |||
46 | u_char *data, u_int datalen) | 46 | u_char *data, u_int datalen) |
47 | { | 47 | { |
48 | DSA_SIG *sig; | 48 | DSA_SIG *sig; |
49 | EVP_MD *evp_md = EVP_sha1(); | 49 | const EVP_MD *evp_md = EVP_sha1(); |
50 | EVP_MD_CTX md; | 50 | EVP_MD_CTX md; |
51 | u_char *ret, digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN]; | 51 | u_char *ret, digest[EVP_MAX_MD_SIZE], sigblob[SIGBLOB_LEN]; |
52 | u_int rlen, slen, len, dlen; | 52 | u_int rlen, slen, len, dlen; |
@@ -110,7 +110,7 @@ ssh_dss_verify( | |||
110 | u_char *data, u_int datalen) | 110 | u_char *data, u_int datalen) |
111 | { | 111 | { |
112 | DSA_SIG *sig; | 112 | DSA_SIG *sig; |
113 | EVP_MD *evp_md = EVP_sha1(); | 113 | const EVP_MD *evp_md = EVP_sha1(); |
114 | EVP_MD_CTX md; | 114 | EVP_MD_CTX md; |
115 | u_char digest[EVP_MAX_MD_SIZE], *sigblob; | 115 | u_char digest[EVP_MAX_MD_SIZE], *sigblob; |
116 | u_int len, dlen; | 116 | u_int len, dlen; |