breeze/openssh-portable
1
0
Fork 0
mirror of https://github.com/openssh/openssh-portable.git synced 2026-01-12 00:04:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

upstream: factor out encoding of a raw ed25519 signature into its

Browse Source 
ssh form into a separate function

OpenBSD-Commit-ID: 3711c6d6b52dde0bd1f17884da5cddb8716f1b64
This commit is contained in:
djm@openbsd.org
2025-07-24 06:12:08 +00:00
committed by Damien Miller
parent a8c0e5c871
commit 1641ab8744
2 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
ssh-ed25519.c
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: ssh-ed25519.c,v 1.19 2022/10/28 00:44:44 djm Exp $ */
/* $OpenBSD: ssh-ed25519.c,v 1.20 2025/07/24 06:12:08 djm Exp $ */
/*
* Copyright (c) 2013 Markus Friedl <markus@openbsd.org>
*
@@ -149,10 +149,9 @@ ssh_ed25519_sign(struct sshkey *key,
const char *alg, const char *sk_provider, const char *sk_pin, u_int compat)
{
u_char *sig = NULL;
size_t slen = 0, len;
size_t slen = 0;
unsigned long long smlen;
int r, ret;
struct sshbuf *b = NULL;
if (lenp != NULL)
*lenp = 0;
@@ -173,13 +172,40 @@ ssh_ed25519_sign(struct sshkey *key,
r = SSH_ERR_INVALID_ARGUMENT; /* XXX better error? */
goto out;
}
if ((r = ssh_ed25519_encode_store_sig(sig, smlen - datalen,
sigp, lenp)) != 0)
goto out;
/* success */
r = 0;
out:
freezero(sig, slen);
return r;
}
int
ssh_ed25519_encode_store_sig(const u_char *sig, size_t slen,
u_char **sigp, size_t *lenp)
{
struct sshbuf *b = NULL;
int r = -1;
size_t len;
if (lenp != NULL)
*lenp = 0;
if (sigp != NULL)
*sigp = NULL;
if (slen != crypto_sign_ed25519_BYTES)
return SSH_ERR_INVALID_ARGUMENT;
/* encode signature */
if ((b = sshbuf_new()) == NULL) {
r = SSH_ERR_ALLOC_FAIL;
goto out;
}
if ((r = sshbuf_put_cstring(b, "ssh-ed25519")) != 0 ||
(r = sshbuf_put_string(b, sig, smlen - datalen)) != 0)
(r = sshbuf_put_string(b, sig, slen)) != 0)
goto out;
len = sshbuf_len(b);
if (sigp != NULL) {
@@ -195,9 +221,6 @@ ssh_ed25519_sign(struct sshkey *key,
r = 0;
out:
sshbuf_free(b);
if (sig != NULL)
freezero(sig, slen);
return r;
}

4
sshkey.h
View File

@@ -1,4 +1,4 @@
/* $OpenBSD: sshkey.h,v 1.68 2025/07/24 05:44:55 djm Exp $ */
/* $OpenBSD: sshkey.h,v 1.69 2025/07/24 06:12:08 djm Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
@@ -319,6 +319,8 @@ int ssh_rsa_encode_store_sig(int, const u_char *, size_t,
u_char **, size_t *);
int ssh_ecdsa_encode_store_sig(const struct sshkey *,
const BIGNUM *, const BIGNUM *, u_char **, size_t *);
int ssh_ed25519_encode_store_sig(const u_char *, size_t,
u_char **, size_t *);
/* XXX should be internal, but used by ssh-keygen */
int ssh_rsa_complete_crt_parameters(const BIGNUM *, const BIGNUM *,
const BIGNUM *, const BIGNUM *, BIGNUM **, BIGNUM **);