diff options
author | Ben Lindstrom <mouring@eviladmin.org> | 2002-08-20 18:39:14 +0000 |
---|---|---|
committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-08-20 18:39:14 +0000 |
commit | 0e50d846b31da4c96959b8a386ccfb938bf4387f (patch) | |
tree | d6b00fd5c98f13404d24bff2e8ab950553949887 | |
parent | dc7adf2670bcbb83bf4e95f4f9d6c544efe182cb (diff) |
- markus@cvs.openbsd.org 2002/08/02 21:23:41
[ssh-rsa.c]
diff is u_int (2x); ok deraadt/provos
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | ssh-rsa.c | 6 |
2 files changed, 7 insertions, 4 deletions
@@ -10,6 +10,9 @@ | |||
10 | note that .ssh/environment is only read when | 10 | note that .ssh/environment is only read when |
11 | allowed (PermitUserEnvironment in sshd_config). | 11 | allowed (PermitUserEnvironment in sshd_config). |
12 | OK markus@ | 12 | OK markus@ |
13 | - markus@cvs.openbsd.org 2002/08/02 21:23:41 | ||
14 | [ssh-rsa.c] | ||
15 | diff is u_int (2x); ok deraadt/provos | ||
13 | 16 | ||
14 | 20020813 | 17 | 20020813 |
15 | - (tim) [configure.ac] Display OpenSSL header/library version. | 18 | - (tim) [configure.ac] Display OpenSSL header/library version. |
@@ -1507,4 +1510,4 @@ | |||
1507 | - (stevesk) entropy.c: typo in debug message | 1510 | - (stevesk) entropy.c: typo in debug message |
1508 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 1511 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
1509 | 1512 | ||
1510 | $Id: ChangeLog,v 1.2416 2002/08/20 18:38:02 mouring Exp $ | 1513 | $Id: ChangeLog,v 1.2417 2002/08/20 18:39:14 mouring Exp $ |
@@ -23,7 +23,7 @@ | |||
23 | */ | 23 | */ |
24 | 24 | ||
25 | #include "includes.h" | 25 | #include "includes.h" |
26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.23 2002/07/04 10:41:47 markus Exp $"); | 26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.24 2002/08/02 21:23:41 markus Exp $"); |
27 | 27 | ||
28 | #include <openssl/evp.h> | 28 | #include <openssl/evp.h> |
29 | #include <openssl/err.h> | 29 | #include <openssl/err.h> |
@@ -76,7 +76,7 @@ ssh_rsa_sign(Key *key, u_char **sigp, u_int *lenp, | |||
76 | return -1; | 76 | return -1; |
77 | } | 77 | } |
78 | if (len < slen) { | 78 | if (len < slen) { |
79 | int diff = slen - len; | 79 | u_int diff = slen - len; |
80 | debug("slen %u > len %u", slen, len); | 80 | debug("slen %u > len %u", slen, len); |
81 | memmove(sig + diff, sig, len); | 81 | memmove(sig + diff, sig, len); |
82 | memset(sig, 0, diff); | 82 | memset(sig, 0, diff); |
@@ -149,7 +149,7 @@ ssh_rsa_verify(Key *key, u_char *signature, u_int signaturelen, | |||
149 | xfree(sigblob); | 149 | xfree(sigblob); |
150 | return -1; | 150 | return -1; |
151 | } else if (len < modlen) { | 151 | } else if (len < modlen) { |
152 | int diff = modlen - len; | 152 | u_int diff = modlen - len; |
153 | debug("ssh_rsa_verify: add padding: modlen %u > len %u", | 153 | debug("ssh_rsa_verify: add padding: modlen %u > len %u", |
154 | modlen, len); | 154 | modlen, len); |
155 | sigblob = xrealloc(sigblob, modlen); | 155 | sigblob = xrealloc(sigblob, modlen); |