diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-12-30 09:24:03 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-12-30 21:00:42 +1100 |
commit | d433596736a2cd4818f538be11fc94783f5c5236 (patch) | |
tree | 6d7b24bc0828e6c58abc23f57fabb4734d273842 /ssh-sk.c | |
parent | c54cd1892c3e7f268b21e1f07ada9f0d9816ffc0 (diff) |
upstream: improve some error messages; ok markus@
OpenBSD-Commit-ID: 4ccd8ddabb8df4f995107dd3b7ea58220e93cb81
Diffstat (limited to 'ssh-sk.c')
-rw-r--r-- | ssh-sk.c | 22 |
1 files changed, 11 insertions, 11 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-sk.c,v 1.21 2019/12/30 09:23:28 djm Exp $ */ | 1 | /* $OpenBSD: ssh-sk.c,v 1.22 2019/12/30 09:24:03 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2019 Google LLC | 3 | * Copyright (c) 2019 Google LLC |
4 | * | 4 | * |
@@ -115,13 +115,13 @@ sshsk_open(const char *path) | |||
115 | return ret; | 115 | return ret; |
116 | } | 116 | } |
117 | if ((ret->dlhandle = dlopen(path, RTLD_NOW)) == NULL) { | 117 | if ((ret->dlhandle = dlopen(path, RTLD_NOW)) == NULL) { |
118 | error("Security key provider %s dlopen failed: %s", | 118 | error("Security key provider \"%s\" dlopen failed: %s", |
119 | path, dlerror()); | 119 | path, dlerror()); |
120 | goto fail; | 120 | goto fail; |
121 | } | 121 | } |
122 | if ((ret->sk_api_version = dlsym(ret->dlhandle, | 122 | if ((ret->sk_api_version = dlsym(ret->dlhandle, |
123 | "sk_api_version")) == NULL) { | 123 | "sk_api_version")) == NULL) { |
124 | error("Security key provider %s dlsym(sk_api_version) " | 124 | error("Security key provider \"%s\" dlsym(sk_api_version) " |
125 | "failed: %s", path, dlerror()); | 125 | "failed: %s", path, dlerror()); |
126 | goto fail; | 126 | goto fail; |
127 | } | 127 | } |
@@ -129,9 +129,9 @@ sshsk_open(const char *path) | |||
129 | debug("%s: provider %s implements version 0x%08lx", __func__, | 129 | debug("%s: provider %s implements version 0x%08lx", __func__, |
130 | ret->path, (u_long)version); | 130 | ret->path, (u_long)version); |
131 | if ((version & SSH_SK_VERSION_MAJOR_MASK) != SSH_SK_VERSION_MAJOR) { | 131 | if ((version & SSH_SK_VERSION_MAJOR_MASK) != SSH_SK_VERSION_MAJOR) { |
132 | error("Security key provider %s implements unsupported version " | 132 | error("Security key provider \"%s\" implements unsupported " |
133 | "0x%08lx (supported: 0x%08lx)", path, (u_long)version, | 133 | "version 0x%08lx (supported: 0x%08lx)", |
134 | (u_long)SSH_SK_VERSION_MAJOR); | 134 | path, (u_long)version, (u_long)SSH_SK_VERSION_MAJOR); |
135 | goto fail; | 135 | goto fail; |
136 | } | 136 | } |
137 | if ((ret->sk_enroll = dlsym(ret->dlhandle, "sk_enroll")) == NULL) { | 137 | if ((ret->sk_enroll = dlsym(ret->dlhandle, "sk_enroll")) == NULL) { |
@@ -140,14 +140,14 @@ sshsk_open(const char *path) | |||
140 | goto fail; | 140 | goto fail; |
141 | } | 141 | } |
142 | if ((ret->sk_sign = dlsym(ret->dlhandle, "sk_sign")) == NULL) { | 142 | if ((ret->sk_sign = dlsym(ret->dlhandle, "sk_sign")) == NULL) { |
143 | error("Security key provider %s dlsym(sk_sign) failed: %s", | 143 | error("Security key provider \"%s\" dlsym(sk_sign) failed: %s", |
144 | path, dlerror()); | 144 | path, dlerror()); |
145 | goto fail; | 145 | goto fail; |
146 | } | 146 | } |
147 | if ((ret->sk_load_resident_keys = dlsym(ret->dlhandle, | 147 | if ((ret->sk_load_resident_keys = dlsym(ret->dlhandle, |
148 | "sk_load_resident_keys")) == NULL) { | 148 | "sk_load_resident_keys")) == NULL) { |
149 | error("Security key provider %s dlsym(sk_load_resident_keys) " | 149 | error("Security key provider \"%s\" " |
150 | "failed: %s", path, dlerror()); | 150 | "dlsym(sk_load_resident_keys) failed: %s", path, dlerror()); |
151 | goto fail; | 151 | goto fail; |
152 | } | 152 | } |
153 | /* success */ | 153 | /* success */ |
@@ -394,7 +394,7 @@ sshsk_enroll(int type, const char *provider_path, const char *application, | |||
394 | /* enroll key */ | 394 | /* enroll key */ |
395 | if ((r = skp->sk_enroll(alg, challenge, challenge_len, application, | 395 | if ((r = skp->sk_enroll(alg, challenge, challenge_len, application, |
396 | flags, pin, &resp)) != 0) { | 396 | flags, pin, &resp)) != 0) { |
397 | error("Security key provider %s returned failure %d", | 397 | error("Security key provider \"%s\" returned failure %d", |
398 | provider_path, r); | 398 | provider_path, r); |
399 | r = SSH_ERR_INVALID_FORMAT; /* XXX error codes in API? */ | 399 | r = SSH_ERR_INVALID_FORMAT; /* XXX error codes in API? */ |
400 | goto out; | 400 | goto out; |
@@ -653,7 +653,7 @@ sshsk_load_resident(const char *provider_path, const char *pin, | |||
653 | goto out; | 653 | goto out; |
654 | } | 654 | } |
655 | if ((r = skp->sk_load_resident_keys(pin, &rks, &nrks)) != 0) { | 655 | if ((r = skp->sk_load_resident_keys(pin, &rks, &nrks)) != 0) { |
656 | error("Security key provider %s returned failure %d", | 656 | error("Security key provider \"%s\" returned failure %d", |
657 | provider_path, r); | 657 | provider_path, r); |
658 | r = SSH_ERR_INVALID_FORMAT; /* XXX error codes in API? */ | 658 | r = SSH_ERR_INVALID_FORMAT; /* XXX error codes in API? */ |
659 | goto out; | 659 | goto out; |