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

OpenBSD-Commit-ID: 1524042e09d81e54c4470d7bfcc0194c5b46fe19

diff --git a/ssh-sk-helper.c b/ssh-sk-helper.c
index ced00d955693684bd75aa5504ca53bd3aa9f0755..a996f5898193dedd8ff23e2603030fde4b9c3444 100644 (file)
--- 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));
 

diff --git a/ssh-sk.c b/ssh-sk.c
index 0f2e311d0b479010a37f9ca9949cec139719ab31..e11fd1912f66c622a6013889a38b66ec746ee3df 100644 (file)
--- a/ssh-sk.c
+++ b/ssh-sk.c
@@ -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)
 {

diff --git a/ssh-sk.h b/ssh-sk.h
index 5033e6f6858739ede7a192a1f77c91993d50ce23..7800609c4af6fe368576821bc5c5aa7437ec784b 100644 (file)
--- a/ssh-sk.h
+++ b/ssh-sk.h
@@ -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);
 

diff --git a/sshkey.c b/sshkey.c
index b72f38a2f8db752934f4b1fe442cfd5042d1998e..ed8f4ef0099b2389af0a275cb01b81616897ec3c 100644 (file)
--- a/sshkey.c
+++ b/sshkey.c
@@ -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 */