upstream: ssh-pkcs11: synchronize error messages with errors

A handful of error messages contained incorrect function names or
otherwise inaccurate descriptions. Fix them to match reality.

input/ok djm

OpenBSD-Commit-ID: 165a15db52f75b31e1804b043480c36af09f3411

diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c
index b2e2b32a5078f355fc10524273d23306fbc3b355..6be647ec443c152a0d52f1dd258d8a0ba7d57328 100644 (file)
--- a/ssh-pkcs11.c
+++ b/ssh-pkcs11.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssh-pkcs11.c,v 1.55 2021/11/18 21:11:01 djm Exp $ */
+/* $OpenBSD: ssh-pkcs11.c,v 1.56 2023/03/08 05:33:53 tb Exp $ */
 /*
  * Copyright (c) 2010 Markus Friedl.  All rights reserved.
  * Copyright (c) 2014 Pedro Martelletto. All rights reserved.
@@ -523,7 +523,7 @@ ecdsa_do_sign(const unsigned char *dgst, int dgst_len, const BIGNUM *inv,
        BIGNUM                  *r = NULL, *s = NULL;
 
        if ((k11 = EC_KEY_get_ex_data(ec, ec_key_idx)) == NULL) {
-               ossl_error("EC_KEY_get_key_method_data failed for ec");
+               ossl_error("EC_KEY_get_ex_data failed for ec");
                return (NULL);
        }
 
@@ -545,7 +545,7 @@ ecdsa_do_sign(const unsigned char *dgst, int dgst_len, const BIGNUM *inv,
                goto done;
        }
        if (siglen < 64 || siglen > 132 || siglen % 2) {
-               ossl_error("d2i_ECDSA_SIG failed");
+               error_f("bad signature length: %lu", (u_long)siglen);
                goto done;
        }
        bnlen = siglen/2;
@@ -555,7 +555,7 @@ ecdsa_do_sign(const unsigned char *dgst, int dgst_len, const BIGNUM *inv,
        }
        if ((r = BN_bin2bn(sig, bnlen, NULL)) == NULL ||
            (s = BN_bin2bn(sig+bnlen, bnlen, NULL)) == NULL) {
-               ossl_error("d2i_ECDSA_SIG failed");
+               ossl_error("BN_bin2bn failed");
                ECDSA_SIG_free(ret);
                ret = NULL;
                goto done;