diff options
| author | markus@openbsd.org <markus@openbsd.org> | 2019-11-12 20:30:50 +0100 |
|---|---|---|
| committer | Damien Miller <djm@mindrot.org> | 2019-11-12 22:49:52 +0100 |
| commit | e03a29e6554cd0c9cdbac0dae53dd79e6eb4ea47 (patch) | |
| tree | fdb999dad6c6084e04f8a1bbc29f6460aaad63e3 | |
| parent | upstream: factor out sshsk_ecdsa_inner_sig(); ok djm@ (diff) | |
| download | openssh-e03a29e6554cd0c9cdbac0dae53dd79e6eb4ea47.tar.xz openssh-e03a29e6554cd0c9cdbac0dae53dd79e6eb4ea47.zip | |
upstream: rename sshsk_ecdsa_sign() to sshsk_sign(); ok djm
OpenBSD-Commit-ID: 1524042e09d81e54c4470d7bfcc0194c5b46fe19
| -rw-r--r-- | ssh-sk-helper.c | 4 | ||||
| -rw-r--r-- | ssh-sk.c | 4 | ||||
| -rw-r--r-- | ssh-sk.h | 8 | ||||
| -rw-r--r-- | sshkey.c | 6 |
4 files changed, 11 insertions, 11 deletions
diff --git a/ssh-sk-helper.c b/ssh-sk-helper.c index ced00d955..a996f5898 100644 --- a/ssh-sk-helper.c +++ b/ssh-sk-helper.c @@ -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)); @@ -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) { @@ -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); @@ -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 */ |