diff options
| author | djm@openbsd.org <djm@openbsd.org> | 2022-10-28 00:36:31 +0000 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2022-10-28 12:46:56 +1100 |
| commit | 1e78844ae2b2dc01ba735d5ae740904c57e13685 (patch) | |
| tree | 9aaea84e13b641b1cc04dd9446d4af46c0a0919b /ssh-ed25519.c | |
| parent | 25de1c01a8b9a2c8ab9b1da22444a03e89c982de (diff) | |
| download | openssh-git-1e78844ae2b2dc01ba735d5ae740904c57e13685.tar.gz | |
upstream: factor out sshkey_equal_public()
feedback/ok markus@
OpenBSD-Commit-ID: 1368ba114cb37732fe6ec3d89c7e6d27ea6fdc94
Diffstat (limited to 'ssh-ed25519.c')
| -rw-r--r-- | ssh-ed25519.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/ssh-ed25519.c b/ssh-ed25519.c index abd983df..712cc402 100644 --- a/ssh-ed25519.c +++ b/ssh-ed25519.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssh-ed25519.c,v 1.11 2022/10/28 00:35:40 djm Exp $ */ +/* $OpenBSD: ssh-ed25519.c,v 1.12 2022/10/28 00:36:31 djm Exp $ */ /* * Copyright (c) 2013 Markus Friedl <markus@openbsd.org> * @@ -41,6 +41,16 @@ ssh_ed25519_cleanup(struct sshkey *k) k->ed25519_sk = NULL; } +static int +ssh_ed25519_equal(const struct sshkey *a, const struct sshkey *b) +{ + if (a->ed25519_pk == NULL || b->ed25519_pk == NULL) + return 0; + if (memcmp(a->ed25519_pk, b->ed25519_pk, ED25519_PK_SZ) != 0) + return 0; + return 1; +} + int ssh_ed25519_sign(const struct sshkey *key, u_char **sigp, size_t *lenp, const u_char *data, size_t datalen, u_int compat) @@ -168,10 +178,12 @@ ssh_ed25519_verify(const struct sshkey *key, return r; } -static const struct sshkey_impl_funcs sshkey_ed25519_funcs = { +/* NB. not static; used by ED25519-SK */ +const struct sshkey_impl_funcs sshkey_ed25519_funcs = { /* .size = */ NULL, /* .alloc = */ NULL, /* .cleanup = */ ssh_ed25519_cleanup, + /* .equal = */ ssh_ed25519_equal, }; const struct sshkey_impl sshkey_ed25519_impl = { |