summaryrefslogtreecommitdiff
path: root/monitor_wrap.c
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2002-06-27 00:23:02 +0000
committerBen Lindstrom <mouring@eviladmin.org>2002-06-27 00:23:02 +0000
commit085124998d4662d40e9d45165831a4c5203b91cc (patch)
treeea1aebdf853308b474db32ce21dcc9d70786733d /monitor_wrap.c
parent3390749e4b3499126ab4298c203610e745a4ec5d (diff)
- deraadt@cvs.openbsd.org 2002/06/26 15:00:32
[monitor_wrap.c] more %u
Diffstat (limited to 'monitor_wrap.c')
-rw-r--r--monitor_wrap.c8
1 files changed, 4 insertions, 4 deletions
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"
28RCSID("$OpenBSD: monitor_wrap.c,v 1.11 2002/06/19 18:01:00 markus Exp $"); 28RCSID("$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}