summaryrefslogtreecommitdiff
path: root/ssh-ed25519.c
diff options
context:
space:
mode:
authordjm@openbsd.org <djm@openbsd.org>2022-10-28 00:39:29 +0000
committerDamien Miller <djm@mindrot.org>2022-10-28 12:46:58 +1100
commit262647c2e920492ca57f1b9320d74f4a0f6e482b (patch)
tree1ce89f627b8230d5ce9611ebe698e5b3f4338fa1 /ssh-ed25519.c
parent401c74e7dc15eab60540653d2f94d9306a927bab (diff)
downloadopenssh-git-262647c2e920492ca57f1b9320d74f4a0f6e482b.tar.gz
upstream: factor out key generation
feedback/ok markus@ OpenBSD-Commit-ID: 5b4211bff4de8d9adb84bc72857a8c42c44e7ceb
Diffstat (limited to 'ssh-ed25519.c')
-rw-r--r--ssh-ed25519.c13
1 files changed, 12 insertions, 1 deletions
diff --git a/ssh-ed25519.c b/ssh-ed25519.c
index 72c85000..f2a38c28 100644
--- a/ssh-ed25519.c
+++ b/ssh-ed25519.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-ed25519.c,v 1.13 2022/10/28 00:37:24 djm Exp $ */
+/* $OpenBSD: ssh-ed25519.c,v 1.14 2022/10/28 00:39:29 djm Exp $ */
/*
* Copyright (c) 2013 Markus Friedl <markus@openbsd.org>
*
@@ -66,6 +66,16 @@ ssh_ed25519_serialize_public(const struct sshkey *key, struct sshbuf *b,
return 0;
}
+static int
+ssh_ed25519_generate(struct sshkey *k, int bits)
+{
+ if ((k->ed25519_pk = malloc(ED25519_PK_SZ)) == NULL ||
+ (k->ed25519_sk = malloc(ED25519_SK_SZ)) == NULL)
+ return SSH_ERR_ALLOC_FAIL;
+ crypto_sign_ed25519_keypair(k->ed25519_pk, k->ed25519_sk);
+ return 0;
+}
+
int
ssh_ed25519_sign(const struct sshkey *key, u_char **sigp, size_t *lenp,
const u_char *data, size_t datalen, u_int compat)
@@ -200,6 +210,7 @@ const struct sshkey_impl_funcs sshkey_ed25519_funcs = {
/* .cleanup = */ ssh_ed25519_cleanup,
/* .equal = */ ssh_ed25519_equal,
/* .ssh_serialize_public = */ ssh_ed25519_serialize_public,
+ /* .generate = */ ssh_ed25519_generate,
};
const struct sshkey_impl sshkey_ed25519_impl = {