tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (dtucker) OpenBSD CVS Sync 

- markus@cvs.openbsd.org 2003/06/18 11:28:11
     [ssh-rsa.c]
     backout last change, since it violates pkcs#1
     switch to share/misc/license.template
This commit is contained in:
Darren Tucker 2003-06-22 20:45:15 +10:00
parent 6cf1a2cfe8
commit a251f809a0
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,8 +1,11 @@
20030622 20030622
- (dtucker) OpenBSD CVS Sync (regress/) - (dtucker) OpenBSD CVS Sync
- markus@cvs.openbsd.org 2003/06/21 09:14:05 - markus@cvs.openbsd.org 2003/06/21 09:14:05
[reconfigure.sh] [regress/reconfigure.sh]
missing $SUDO; from dtucker@zip.com.au missing $SUDO; from dtucker@zip.com.au
[ssh-rsa.c]
backout last change, since it violates pkcs#1
switch to share/misc/license.template
- (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS. - (dtucker) [regress/authorized_keys_root] Remove temp data file from CVS.
- (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before - (dtucker) [openbsd-compat/setproctitle.c] Ensure SPT_TYPE is defined before
testing its value. testing its value.
@ -569,4 +572,4 @@
- Fix sshd BindAddress and -b options for systems using fake-getaddrinfo. - Fix sshd BindAddress and -b options for systems using fake-getaddrinfo.
Report from murple@murple.net, diagnosis from dtucker@zip.com.au Report from murple@murple.net, diagnosis from dtucker@zip.com.au
$Id: ChangeLog,v 1.2818 2003/06/22 08:32:10 dtucker Exp $ $Id: ChangeLog,v 1.2819 2003/06/22 10:45:15 dtucker Exp $

37
ssh-rsa.c
View File

@ -1,29 +1,20 @@
/* /*
* Copyright (c) 2000 Markus Friedl. All rights reserved. * Copyright (c) 2000, 2003 Markus Friedl <markus@openbsd.org>
* *
* Redistribution and use in source and binary forms, with or without * Permission to use, copy, modify, and distribute this software for any
* modification, are permitted provided that the following conditions * purpose with or without fee is hereby granted, provided that the above
* are met: * copyright notice and this permission notice appear in all copies.
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* *
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "includes.h" #include "includes.h"
RCSID("$OpenBSD: ssh-rsa.c,v 1.29 2003/06/16 08:22:35 markus Exp $"); RCSID("$OpenBSD: ssh-rsa.c,v 1.30 2003/06/18 11:28:11 markus Exp $");
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
@ -247,8 +238,8 @@ openssh_RSA_verify(int type, u_char *hash, u_int hashlen,
ERR_error_string(ERR_get_error(), NULL)); ERR_error_string(ERR_get_error(), NULL));
goto done; goto done;
} }
if (len < hlen + oidlen) { if (len != hlen + oidlen) {
error("bad decrypted len: %d < %d + %d", len, hlen, oidlen); error("bad decrypted len: %d != %d + %d", len, hlen, oidlen);
goto done; goto done;
} }
if (memcmp(decrypted, oid, oidlen) != 0) { if (memcmp(decrypted, oid, oidlen) != 0) {