summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:01:49 +0000
committerBen Lindstrom <mouring@eviladmin.org>2001-08-06 21:01:49 +0000
commit940fb86c9a0ff501f812041ebaad09538c09b1b8 (patch)
tree64751673e609cc7c8784191d453887f27f1c1169
parentd18c80c2a65d7dd92d83c4f098132840e5450e86 (diff)
- stevesk@cvs.openbsd.org 2001/07/23 18:14:58
[auth2.c auth-rsa.c] use %lu; ok markus@
-rw-r--r--ChangeLog5
-rw-r--r--auth-rsa.c4
-rw-r--r--auth2.c4
3 files changed, 8 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ee7c9587..bab4413ea 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,9 @@
23 - aaron@cvs.openbsd.org 2001/07/23 14:14:18 23 - aaron@cvs.openbsd.org 2001/07/23 14:14:18
24 [ssh-keygen.1] 24 [ssh-keygen.1]
25 Fix typo. 25 Fix typo.
26 - stevesk@cvs.openbsd.org 2001/07/23 18:14:58
27 [auth2.c auth-rsa.c]
28 use %lu; ok markus@
26 29
2720010803 3020010803
28 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on 31 - (djm) Fix interrupted read in entropy gatherer. Spotted by markus@ on
@@ -6133,4 +6136,4 @@
6133 - Wrote replacements for strlcpy and mkdtemp 6136 - Wrote replacements for strlcpy and mkdtemp
6134 - Released 1.0pre1 6137 - Released 1.0pre1
6135 6138
6136$Id: ChangeLog,v 1.1432 2001/08/06 21:00:27 mouring Exp $ 6139$Id: ChangeLog,v 1.1433 2001/08/06 21:01:49 mouring Exp $
diff --git a/auth-rsa.c b/auth-rsa.c
index ec8f6ce21..701d8bd53 100644
--- a/auth-rsa.c
+++ b/auth-rsa.c
@@ -14,7 +14,7 @@
14 */ 14 */
15 15
16#include "includes.h" 16#include "includes.h"
17RCSID("$OpenBSD: auth-rsa.c,v 1.43 2001/06/25 17:54:47 provos Exp $"); 17RCSID("$OpenBSD: auth-rsa.c,v 1.44 2001/07/23 18:14:58 stevesk Exp $");
18 18
19#include <openssl/rsa.h> 19#include <openssl/rsa.h>
20#include <openssl/md5.h> 20#include <openssl/md5.h>
@@ -223,7 +223,7 @@ auth_rsa(struct passwd *pw, BIGNUM *client_n)
223 223
224 /* check the real bits */ 224 /* check the real bits */
225 if (bits != BN_num_bits(pk->n)) 225 if (bits != BN_num_bits(pk->n))
226 log("Warning: %s, line %ld: keysize mismatch: " 226 log("Warning: %s, line %lu: keysize mismatch: "
227 "actual %d vs. announced %d.", 227 "actual %d vs. announced %d.",
228 file, linenum, BN_num_bits(pk->n), bits); 228 file, linenum, BN_num_bits(pk->n), bits);
229 229
diff --git a/auth2.c b/auth2.c
index 276e05dd5..a52c9e289 100644
--- a/auth2.c
+++ b/auth2.c
@@ -23,7 +23,7 @@
23 */ 23 */
24 24
25#include "includes.h" 25#include "includes.h"
26RCSID("$OpenBSD: auth2.c,v 1.68 2001/06/26 05:50:11 markus Exp $"); 26RCSID("$OpenBSD: auth2.c,v 1.69 2001/07/23 18:14:58 stevesk Exp $");
27 27
28#include <openssl/evp.h> 28#include <openssl/evp.h>
29 29
@@ -721,7 +721,7 @@ user_key_allowed2(struct passwd *pw, Key *key, char *file)
721 if (key_equal(found, key) && 721 if (key_equal(found, key) &&
722 auth_parse_options(pw, options, file, linenum) == 1) { 722 auth_parse_options(pw, options, file, linenum) == 1) {
723 found_key = 1; 723 found_key = 1;
724 debug("matching key found: file %s, line %ld", 724 debug("matching key found: file %s, line %lu",
725 file, linenum); 725 file, linenum);
726 break; 726 break;
727 } 727 }