summaryrefslogtreecommitdiff
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
parente17ac01f8b763e4b83976b9e521e90a280acc097 (diff)
upstream commit
remove xmalloc, switch to sshbuf
-rw-r--r--ssh-ed25519.c8
1 files changed, 3 insertions, 5 deletions
diff --git a/ssh-ed25519.c b/ssh-ed25519.c
index 9922816c7..b159ff5ee 100644
--- a/ssh-ed25519.c
+++ b/ssh-ed25519.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: ssh-ed25519.c,v 1.5 2014/10/14 03:09:59 daniel Exp $ */ 1/* $OpenBSD: ssh-ed25519.c,v 1.6 2015/01/15 21:38:50 markus Exp $ */
2/* 2/*
3 * Copyright (c) 2013 Markus Friedl <markus@openbsd.org> 3 * Copyright (c) 2013 Markus Friedl <markus@openbsd.org>
4 * 4 *
@@ -25,9 +25,8 @@
25#include <string.h> 25#include <string.h>
26#include <stdarg.h> 26#include <stdarg.h>
27 27
28#include "xmalloc.h"
29#include "log.h" 28#include "log.h"
30#include "buffer.h" 29#include "sshbuf.h"
31#define SSHKEY_INTERNAL 30#define SSHKEY_INTERNAL
32#include "sshkey.h" 31#include "sshkey.h"
33#include "ssherr.h" 32#include "ssherr.h"
@@ -134,7 +133,7 @@ ssh_ed25519_verify(const struct sshkey *key,
134 } 133 }
135 smlen = len + datalen; 134 smlen = len + datalen;
136 mlen = smlen; 135 mlen = smlen;
137 if ((sm = malloc(smlen)) == NULL || (m = xmalloc(mlen)) == NULL) { 136 if ((sm = malloc(smlen)) == NULL || (m = malloc(mlen)) == NULL) {
138 r = SSH_ERR_ALLOC_FAIL; 137 r = SSH_ERR_ALLOC_FAIL;
139 goto out; 138 goto out;
140 } 139 }
@@ -165,4 +164,3 @@ ssh_ed25519_verify(const struct sshkey *key,
165 free(ktype); 164 free(ktype);
166 return r; 165 return r;
167} 166}
168