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

upstream commit 

remove xmalloc, switch to sshbuf
This commit is contained in:
markus@openbsd.org 2015-01-15 21:38:50 +00:00 committed by Damien Miller
parent e17ac01f8b
commit 3c4726f4c2
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ssh-ed25519.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-ed25519.c,v 1.5 2014/10/14 03:09:59 daniel Exp $ */ /* $OpenBSD: ssh-ed25519.c,v 1.6 2015/01/15 21:38:50 markus Exp $ */
/* /*
* Copyright (c) 2013 Markus Friedl <markus@openbsd.org> * Copyright (c) 2013 Markus Friedl <markus@openbsd.org>
* *
@ -25,9 +25,8 @@
#include <string.h> #include <string.h>
#include <stdarg.h> #include <stdarg.h>
#include "xmalloc.h"
#include "log.h" #include "log.h"
#include "buffer.h" #include "sshbuf.h"
#define SSHKEY_INTERNAL #define SSHKEY_INTERNAL
#include "sshkey.h" #include "sshkey.h"
#include "ssherr.h" #include "ssherr.h"
@ -134,7 +133,7 @@ ssh_ed25519_verify(const struct sshkey *key,
} }
smlen = len + datalen; smlen = len + datalen;
mlen = smlen; mlen = smlen;
if ((sm = malloc(smlen)) == NULL || (m = xmalloc(mlen)) == NULL) { if ((sm = malloc(smlen)) == NULL || (m = malloc(mlen)) == NULL) {
r = SSH_ERR_ALLOC_FAIL; r = SSH_ERR_ALLOC_FAIL;
goto out; goto out;
} }
@ -165,4 +164,3 @@ ssh_ed25519_verify(const struct sshkey *key,
free(ktype); free(ktype);
return r; return r;
} }