diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | kex.c | 4 | ||||
-rw-r--r-- | kexdh.c | 4 | ||||
-rw-r--r-- | kexgex.c | 4 | ||||
-rw-r--r-- | key.c | 13 | ||||
-rw-r--r-- | mac.c | 4 |
6 files changed, 18 insertions, 16 deletions
@@ -14,6 +14,9 @@ | |||
14 | [ssh-dss.c ssh-rsa.c] | 14 | [ssh-dss.c ssh-rsa.c] |
15 | use static EVP_MAX_MD_SIZE buffers for EVP_DigestFinal; ok stevesk@ | 15 | use static EVP_MAX_MD_SIZE buffers for EVP_DigestFinal; ok stevesk@ |
16 | don't use evp_md->md_size, it's not public. | 16 | don't use evp_md->md_size, it's not public. |
17 | - markus@cvs.openbsd.org 2002/01/25 22:07:40 | ||
18 | [kex.c kexdh.c kexgex.c key.c mac.c] | ||
19 | use EVP_MD_size(evp_md) and not evp_md->md_size; ok steveks@ | ||
17 | 20 | ||
18 | 20020130 | 21 | 20020130 |
19 | - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ | 22 | - (djm) Delay PRNG seeding until we need it in ssh-keygen, from markus@ |
@@ -7416,4 +7419,4 @@ | |||
7416 | - Wrote replacements for strlcpy and mkdtemp | 7419 | - Wrote replacements for strlcpy and mkdtemp |
7417 | - Released 1.0pre1 | 7420 | - Released 1.0pre1 |
7418 | 7421 | ||
7419 | $Id: ChangeLog,v 1.1802 2002/02/05 00:53:43 djm Exp $ | 7422 | $Id: ChangeLog,v 1.1803 2002/02/05 00:54:07 djm Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kex.c,v 1.42 2002/01/11 13:39:36 markus Exp $"); | 26 | RCSID("$OpenBSD: kex.c,v 1.43 2002/01/25 22:07:40 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | 29 | ||
@@ -363,7 +363,7 @@ derive_key(Kex *kex, int id, int need, u_char *hash, BIGNUM *shared_secret) | |||
363 | EVP_MD_CTX md; | 363 | EVP_MD_CTX md; |
364 | char c = id; | 364 | char c = id; |
365 | int have; | 365 | int have; |
366 | int mdsz = evp_md->md_size; | 366 | int mdsz = EVP_MD_size(evp_md); |
367 | u_char *digest = xmalloc(roundup(need, mdsz)); | 367 | u_char *digest = xmalloc(roundup(need, mdsz)); |
368 | 368 | ||
369 | buffer_init(&b); | 369 | buffer_init(&b); |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: kexdh.c,v 1.12 2001/12/28 14:50:54 markus Exp $"); | 26 | RCSID("$OpenBSD: kexdh.c,v 1.13 2002/01/25 22:07:40 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/crypto.h> | 28 | #include <openssl/crypto.h> |
29 | #include <openssl/bn.h> | 29 | #include <openssl/bn.h> |
@@ -81,7 +81,7 @@ kex_dh_hash( | |||
81 | buffer_free(&b); | 81 | buffer_free(&b); |
82 | 82 | ||
83 | #ifdef DEBUG_KEX | 83 | #ifdef DEBUG_KEX |
84 | dump_digest("hash", digest, evp_md->md_size); | 84 | dump_digest("hash", digest, EVP_MD_size(evp_md)); |
85 | #endif | 85 | #endif |
86 | return digest; | 86 | return digest; |
87 | } | 87 | } |
@@ -24,7 +24,7 @@ | |||
24 | */ | 24 | */ |
25 | 25 | ||
26 | #include "includes.h" | 26 | #include "includes.h" |
27 | RCSID("$OpenBSD: kexgex.c,v 1.15 2001/12/28 14:50:54 markus Exp $"); | 27 | RCSID("$OpenBSD: kexgex.c,v 1.16 2002/01/25 22:07:40 markus Exp $"); |
28 | 28 | ||
29 | #include <openssl/bn.h> | 29 | #include <openssl/bn.h> |
30 | 30 | ||
@@ -92,7 +92,7 @@ kexgex_hash( | |||
92 | buffer_free(&b); | 92 | buffer_free(&b); |
93 | 93 | ||
94 | #ifdef DEBUG_KEXDH | 94 | #ifdef DEBUG_KEXDH |
95 | dump_digest("hash", digest, evp_md->md_size); | 95 | dump_digest("hash", digest, EVP_MD_size(evp_md)); |
96 | #endif | 96 | #endif |
97 | return digest; | 97 | return digest; |
98 | } | 98 | } |
@@ -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.38 2001/12/27 18:22:16 markus Exp $"); | 35 | RCSID("$OpenBSD: key.c,v 1.39 2002/01/25 22:07:40 markus Exp $"); |
36 | 36 | ||
37 | #include <openssl/evp.h> | 37 | #include <openssl/evp.h> |
38 | 38 | ||
@@ -170,7 +170,7 @@ key_equal(Key *a, Key *b) | |||
170 | } | 170 | } |
171 | 171 | ||
172 | static u_char* | 172 | static u_char* |
173 | key_fingerprint_raw(Key *k, enum fp_type dgst_type, size_t *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 | EVP_MD *md = NULL; |
176 | EVP_MD_CTX ctx; | 176 | EVP_MD_CTX ctx; |
@@ -216,8 +216,7 @@ key_fingerprint_raw(Key *k, enum fp_type dgst_type, size_t *dgst_raw_length) | |||
216 | retval = xmalloc(EVP_MAX_MD_SIZE); | 216 | retval = xmalloc(EVP_MAX_MD_SIZE); |
217 | EVP_DigestInit(&ctx, md); | 217 | EVP_DigestInit(&ctx, md); |
218 | EVP_DigestUpdate(&ctx, blob, len); | 218 | EVP_DigestUpdate(&ctx, blob, len); |
219 | EVP_DigestFinal(&ctx, retval, NULL); | 219 | EVP_DigestFinal(&ctx, retval, dgst_raw_length); |
220 | *dgst_raw_length = md->md_size; | ||
221 | memset(blob, 0, len); | 220 | memset(blob, 0, len); |
222 | xfree(blob); | 221 | xfree(blob); |
223 | } else { | 222 | } else { |
@@ -227,7 +226,7 @@ key_fingerprint_raw(Key *k, enum fp_type dgst_type, size_t *dgst_raw_length) | |||
227 | } | 226 | } |
228 | 227 | ||
229 | static char* | 228 | static char* |
230 | key_fingerprint_hex(u_char* dgst_raw, size_t dgst_raw_len) | 229 | key_fingerprint_hex(u_char* dgst_raw, u_int dgst_raw_len) |
231 | { | 230 | { |
232 | char *retval; | 231 | char *retval; |
233 | int i; | 232 | int i; |
@@ -244,7 +243,7 @@ key_fingerprint_hex(u_char* dgst_raw, size_t dgst_raw_len) | |||
244 | } | 243 | } |
245 | 244 | ||
246 | static char* | 245 | static char* |
247 | key_fingerprint_bubblebabble(u_char* dgst_raw, size_t dgst_raw_len) | 246 | key_fingerprint_bubblebabble(u_char* dgst_raw, u_int dgst_raw_len) |
248 | { | 247 | { |
249 | char vowels[] = { 'a', 'e', 'i', 'o', 'u', 'y' }; | 248 | char vowels[] = { 'a', 'e', 'i', 'o', 'u', 'y' }; |
250 | char consonants[] = { 'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm', | 249 | char consonants[] = { 'b', 'c', 'd', 'f', 'g', 'h', 'k', 'l', 'm', |
@@ -295,7 +294,7 @@ key_fingerprint(Key *k, enum fp_type dgst_type, enum fp_rep dgst_rep) | |||
295 | { | 294 | { |
296 | char *retval = NULL; | 295 | char *retval = NULL; |
297 | u_char *dgst_raw; | 296 | u_char *dgst_raw; |
298 | size_t dgst_raw_len; | 297 | u_int dgst_raw_len; |
299 | 298 | ||
300 | dgst_raw = key_fingerprint_raw(k, dgst_type, &dgst_raw_len); | 299 | dgst_raw = key_fingerprint_raw(k, dgst_type, &dgst_raw_len); |
301 | if (!dgst_raw) | 300 | if (!dgst_raw) |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: mac.c,v 1.3 2001/12/19 07:18:56 deraadt Exp $"); | 26 | RCSID("$OpenBSD: mac.c,v 1.4 2002/01/25 22:07:40 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/hmac.h> | 28 | #include <openssl/hmac.h> |
29 | 29 | ||
@@ -56,7 +56,7 @@ mac_init(Mac *mac, char *name) | |||
56 | if (strcmp(name, macs[i].name) == 0) { | 56 | if (strcmp(name, macs[i].name) == 0) { |
57 | if (mac != NULL) { | 57 | if (mac != NULL) { |
58 | mac->md = (*macs[i].mdfunc)(); | 58 | mac->md = (*macs[i].mdfunc)(); |
59 | mac->key_len = mac->mac_len = mac->md->md_size; | 59 | mac->key_len = mac->mac_len = EVP_MD_size(mac->md); |
60 | if (macs[i].truncatebits != 0) | 60 | if (macs[i].truncatebits != 0) |
61 | mac->mac_len = macs[i].truncatebits/8; | 61 | mac->mac_len = macs[i].truncatebits/8; |
62 | } | 62 | } |