diff options
-rw-r--r-- | ChangeLog | 9 | ||||
-rw-r--r-- | ssh-rsa.c | 37 |
2 files changed, 20 insertions, 26 deletions
@@ -1,8 +1,11 @@ | |||
1 | 20030622 | 1 | 20030622 |
2 | - (dtucker) OpenBSD CVS Sync (regress/) | 2 | - (dtucker) OpenBSD CVS Sync |
3 | - markus@cvs.openbsd.org 2003/06/21 09:14:05 | 3 | - markus@cvs.openbsd.org 2003/06/21 09:14:05 |
4 | [reconfigure.sh] | 4 | [regress/reconfigure.sh] |
5 | missing $SUDO; from dtucker@zip.com.au | 5 | missing $SUDO; from dtucker@zip.com.au |
6 | [ssh-rsa.c] | ||
7 | backout last change, since it violates pkcs#1 | ||
8 | switch to share/misc/license.template | ||
6 | - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS. | 9 | - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS. |
7 | - (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before | 10 | - (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before |
8 | testing its value. | 11 | testing its value. |
@@ -569,4 +572,4 @@ | |||
569 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. | 572 | - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. |
570 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au | 573 | Report from murple@murple.net, diagnosis from dtucker@zip.com.au |
571 | 574 | ||
572 | $Id: ChangeLog,v 1.2818 2003/06/22 08:32:10 dtucker Exp $ | 575 | $Id: ChangeLog,v 1.2819 2003/06/22 10:45:15 dtucker Exp $ |
@@ -1,29 +1,20 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2000 Markus Friedl. All rights reserved. | 2 | * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org> |
3 | * | 3 | * |
4 | * Redistribution and use in source and binary forms, with or without | 4 | * Permission to use, copy, modify, and distribute this software for any |
5 | * modification, are permitted provided that the following conditions | 5 | * purpose with or without fee is hereby granted, provided that the above |
6 | * are met: | 6 | * copyright notice and this permission notice appear in all copies. |
7 | * 1. Redistributions of source code must retain the above copyright | ||
8 | * notice, this list of conditions and the following disclaimer. | ||
9 | * 2. Redistributions in binary form must reproduce the above copyright | ||
10 | * notice, this list of conditions and the following disclaimer in the | ||
11 | * documentation and/or other materials provided with the distribution. | ||
12 | * | 7 | * |
13 | * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR | 8 | * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES |
14 | * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | 9 | * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF |
15 | * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. | 10 | * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR |
16 | * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, | 11 | * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES |
17 | * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT | 12 | * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN |
18 | * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 13 | * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF |
19 | * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 14 | * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. |
20 | * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
21 | * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF | ||
22 | * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
23 | */ | 15 | */ |
24 | |||
25 | #include "includes.h" | 16 | #include "includes.h" |
26 | RCSID("$OpenBSD: ssh-rsa.c,v 1.29 2003/06/16 08:22:35 markus Exp $"); | 17 | RCSID("$OpenBSD: ssh-rsa.c,v 1.30 2003/06/18 11:28:11 markus Exp $"); |
27 | 18 | ||
28 | #include <openssl/evp.h> | 19 | #include <openssl/evp.h> |
29 | #include <openssl/err.h> | 20 | #include <openssl/err.h> |
@@ -247,8 +238,8 @@ openssh_RSA_verify(int type, u_char *hash, u_int hashlen, | |||
247 | ERR_error_string(ERR_get_error(), NULL)); | 238 | ERR_error_string(ERR_get_error(), NULL)); |
248 | goto done; | 239 | goto done; |
249 | } | 240 | } |
250 | if (len < hlen + oidlen) { | 241 | if (len != hlen + oidlen) { |
251 | error("bad decrypted len: %d < %d + %d", len, hlen, oidlen); | 242 | error("bad decrypted len: %d != %d + %d", len, hlen, oidlen); |
252 | goto done; | 243 | goto done; |
253 | } | 244 | } |
254 | if (memcmp(decrypted, oid, oidlen) != 0) { | 245 | if (memcmp(decrypted, oid, oidlen) != 0) { |