summaryrefslogtreecommitdiff
path: root/ssh-ed25519.c
diff options
context:
space:
mode:
authormarkus@openbsd.org <markus@openbsd.org>2015-01-15 21:38:50 +0000
committerDamien Miller <djm@mindrot.org>2015-01-16 18:22:24 +1100
commit3c4726f4c24118e8f1bb80bf75f1456c76df072c (patch)
tree838c09440d2260fd82e7a7f050ed83d3460f2d31 /ssh-ed25519.c
parente17ac01f8b763e4b83976b9e521e90a280acc097 (diff)
upstream commit
remove xmalloc, switch to sshbuf
Diffstat (limited to 'ssh-ed25519.c')
-rw-r--r--ssh-ed25519.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/ssh-ed25519.c b/ssh-ed25519.c
index 9922816c..b159ff5e 100644
--- a/ssh-ed25519.c
+++ b/ssh-ed25519.c
@@ -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>
*
@@ -25,9 +25,8 @@
#include <string.h>
#include <stdarg.h>
-#include "xmalloc.h"
#include "log.h"
-#include "buffer.h"
+#include "sshbuf.h"
#define SSHKEY_INTERNAL
#include "sshkey.h"
#include "ssherr.h"
@@ -134,7 +133,7 @@ ssh_ed25519_verify(const struct sshkey *key,
}
smlen = len + datalen;
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;
goto out;
}
@@ -165,4 +164,3 @@ ssh_ed25519_verify(const struct sshkey *key,
free(ktype);
return r;
}
-