~ubuntu-branches/ubuntu/edgy/openssh/edgy

« back to all changes in this revision

Viewing changes to ssh-rsa.c

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2005-10-31 07:46:44 UTC
  • mfrom: (1.1.3 upstream)
  • Revision ID: james.westby@ubuntu.com-20051031074644-poik7e4un4723tr4
Tags: 1:4.2p1-5ubuntu1
Resynchronise with Debian.

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
 * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
15
15
 */
16
16
#include "includes.h"
17
 
RCSID("$OpenBSD: ssh-rsa.c,v 1.31 2003/11/10 16:23:41 jakob Exp $");
 
17
RCSID("$OpenBSD: ssh-rsa.c,v 1.32 2005/06/17 02:44:33 djm Exp $");
18
18
 
19
19
#include <openssl/evp.h>
20
20
#include <openssl/err.h>
238
238
                    ERR_error_string(ERR_get_error(), NULL));
239
239
                goto done;
240
240
        }
241
 
        if (len != hlen + oidlen) {
 
241
        if (len < 0 || (u_int)len != hlen + oidlen) {
242
242
                error("bad decrypted len: %d != %d + %d", len, hlen, oidlen);
243
243
                goto done;
244
244
        }