RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2025-01-12 12:49:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

upstream: rename sshsk_ecdsa_sign() to sshsk_sign(); ok djm

Browse Source 
OpenBSD-Commit-ID: 1524042e09d81e54c4470d7bfcc0194c5b46fe19
This commit is contained in:
markus@openbsd.org 2019-11-12 19:30:50 +00:00 committed by Damien Miller
parent bc7b5d6187
commit e03a29e655
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ssh-sk-helper.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-sk-helper.c,v 1.1 2019/10/31 21:22:01 djm Exp $ */
/* $OpenBSD: ssh-sk-helper.c,v 1.2 2019/11/12 19:30:50 markus Exp $ */
/*
* Copyright (c) 2019 Google LLC
*
@ -128,7 +128,7 @@ main(int argc, char **argv)
"msg len %zu, compat 0x%lx", __progname, sshkey_type(key),
provider, msglen, (u_long)compat);
if ((r = sshsk_ecdsa_sign(provider, key, &sig, &siglen,
if ((r = sshsk_sign(provider, key, &sig, &siglen,
message, msglen, compat)) != 0)
fatal("Signing failed: %s", ssh_err(r));

4
ssh-sk.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-sk.c,v 1.3 2019/11/12 19:30:21 markus Exp $ */
/* $OpenBSD: ssh-sk.c,v 1.4 2019/11/12 19:30:50 markus Exp $ */
/*
* Copyright (c) 2019 Google LLC
*
@ -342,7 +342,7 @@ out:
}
int
sshsk_ecdsa_sign(const char *provider_path, const struct sshkey *key,
sshsk_sign(const char *provider_path, const struct sshkey *key,
u_char **sigp, size_t *lenp, const u_char *data, size_t datalen,
u_int compat)
{

8
ssh-sk.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ssh-sk.h,v 1.2 2019/10/31 21:22:01 djm Exp $ */
/* $OpenBSD: ssh-sk.h,v 1.3 2019/11/12 19:30:50 markus Exp $ */
/*
* Copyright (c) 2019 Google LLC
*
@ -39,12 +39,12 @@ int sshsk_enroll(const char *provider_path, const char *application,
struct sshbuf *attest);
/*
* Calculate an ECDSA_SK signature using the specified key and provider
* middleware.
* Calculate an ECDSA_SK signature using the specified key
* and provider middleware.
*
* Returns 0 on success or a ssherr.h error code on failure.
*/
int sshsk_ecdsa_sign(const char *provider_path, const struct sshkey *key,
int sshsk_sign(const char *provider_path, const struct sshkey *key,
u_char **sigp, size_t *lenp, const u_char *data, size_t datalen,
u_int compat);

6
sshkey.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: sshkey.c,v 1.87 2019/11/12 19:29:24 markus Exp $ */
/* $OpenBSD: sshkey.c,v 1.88 2019/11/12 19:30:50 markus Exp $ */
/*
* Copyright (c) 2000, 2001 Markus Friedl. All rights reserved.
* Copyright (c) 2008 Alexander von Gernler. All rights reserved.
@ -2687,8 +2687,8 @@ sshkey_sign(struct sshkey *key,
# ifdef ENABLE_SK
case KEY_ECDSA_SK_CERT:
case KEY_ECDSA_SK:
r = sshsk_ecdsa_sign(sk_provider, key, sigp, lenp,
data, datalen, compat);
r = sshsk_sign(sk_provider, key, sigp, lenp, data, datalen,
compat);
break;
# endif /* ENABLE_SK */
# endif /* OPENSSL_HAS_ECC */