diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | monitor_wrap.c | 8 |
2 files changed, 8 insertions, 5 deletions
@@ -9,6 +9,9 @@ | |||
9 | - markus@cvs.openbsd.org 2002/06/26 14:51:33 | 9 | - markus@cvs.openbsd.org 2002/06/26 14:51:33 |
10 | [ssh-add.c] | 10 | [ssh-add.c] |
11 | fix exit code for -X/-x | 11 | fix exit code for -X/-x |
12 | - deraadt@cvs.openbsd.org 2002/06/26 15:00:32 | ||
13 | [monitor_wrap.c] | ||
14 | more %u | ||
12 | 15 | ||
13 | 20020626 | 16 | 20020626 |
14 | - (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM | 17 | - (stevesk) [monitor.c] remove duplicate proto15 dispatch entry for PAM |
@@ -1181,4 +1184,4 @@ | |||
1181 | - (stevesk) entropy.c: typo in debug message | 1184 | - (stevesk) entropy.c: typo in debug message |
1182 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1185 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1183 | 1186 | ||
1184 | $Id: ChangeLog,v 1.2305 2002/06/27 00:21:59 mouring Exp $ | 1187 | $Id: ChangeLog,v 1.2306 2002/06/27 00:23:02 mouring Exp $ |
diff --git a/monitor_wrap.c b/monitor_wrap.c index f7e332d8e..938a67d90 100644 --- a/monitor_wrap.c +++ b/monitor_wrap.c | |||
@@ -25,7 +25,7 @@ | |||
25 | */ | 25 | */ |
26 | 26 | ||
27 | #include "includes.h" | 27 | #include "includes.h" |
28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.11 2002/06/19 18:01:00 markus Exp $"); | 28 | RCSID("$OpenBSD: monitor_wrap.c,v 1.12 2002/06/26 15:00:32 deraadt Exp $"); |
29 | 29 | ||
30 | #include <openssl/bn.h> | 30 | #include <openssl/bn.h> |
31 | #include <openssl/dh.h> | 31 | #include <openssl/dh.h> |
@@ -411,7 +411,7 @@ mm_newkeys_from_blob(u_char *blob, int blen) | |||
411 | enc->key = buffer_get_string(&b, &enc->key_len); | 411 | enc->key = buffer_get_string(&b, &enc->key_len); |
412 | enc->iv = buffer_get_string(&b, &len); | 412 | enc->iv = buffer_get_string(&b, &len); |
413 | if (len != enc->block_size) | 413 | if (len != enc->block_size) |
414 | fatal("%s: bad ivlen: expected %d != %d", __func__, | 414 | fatal("%s: bad ivlen: expected %u != %u", __func__, |
415 | enc->block_size, len); | 415 | enc->block_size, len); |
416 | 416 | ||
417 | if (enc->name == NULL || cipher_by_name(enc->name) != enc->cipher) | 417 | if (enc->name == NULL || cipher_by_name(enc->name) != enc->cipher) |
@@ -425,7 +425,7 @@ mm_newkeys_from_blob(u_char *blob, int blen) | |||
425 | mac->enabled = buffer_get_int(&b); | 425 | mac->enabled = buffer_get_int(&b); |
426 | mac->key = buffer_get_string(&b, &len); | 426 | mac->key = buffer_get_string(&b, &len); |
427 | if (len > mac->key_len) | 427 | if (len > mac->key_len) |
428 | fatal("%s: bad mac key length: %d > %d", __func__, len, | 428 | fatal("%s: bad mac key length: %u > %d", __func__, len, |
429 | mac->key_len); | 429 | mac->key_len); |
430 | mac->key_len = len; | 430 | mac->key_len = len; |
431 | 431 | ||
@@ -436,7 +436,7 @@ mm_newkeys_from_blob(u_char *blob, int blen) | |||
436 | 436 | ||
437 | len = buffer_len(&b); | 437 | len = buffer_len(&b); |
438 | if (len != 0) | 438 | if (len != 0) |
439 | error("newkeys_from_blob: remaining bytes in blob %d", len); | 439 | error("newkeys_from_blob: remaining bytes in blob %u", len); |
440 | buffer_free(&b); | 440 | buffer_free(&b); |
441 | return (newkey); | 441 | return (newkey); |
442 | } | 442 | } |