diff options
author | djm@openbsd.org <djm@openbsd.org> | 2019-01-21 02:05:38 +0000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2019-01-21 13:07:04 +1100 |
commit | 662be40c62339ab645113c930ce689466f028938 (patch) | |
tree | 79efa36e956fa50cf52d1094675bf1acdae2ed82 | |
parent | ce46c3a077dfb4c531ccffcfff03f37775725b75 (diff) |
upstream: always print the caller's error message in ossl_error(),
even when there are no libcrypto errors to report.
OpenBSD-Commit-ID: 09ebaa8f706e0eccedd209775baa1eee2ada806a
-rw-r--r-- | ssh-pkcs11.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ssh-pkcs11.c b/ssh-pkcs11.c index c4fe60948..de65144f3 100644 --- a/ssh-pkcs11.c +++ b/ssh-pkcs11.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: ssh-pkcs11.c,v 1.38 2019/01/21 02:01:03 djm Exp $ */ | 1 | /* $OpenBSD: ssh-pkcs11.c,v 1.39 2019/01/21 02:05:38 djm Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. | 3 | * Copyright (c) 2010 Markus Friedl. All rights reserved. |
4 | * Copyright (c) 2014 Pedro Martelletto. All rights reserved. | 4 | * Copyright (c) 2014 Pedro Martelletto. All rights reserved. |
@@ -84,8 +84,9 @@ ossl_error(const char *msg) | |||
84 | { | 84 | { |
85 | unsigned long e; | 85 | unsigned long e; |
86 | 86 | ||
87 | error("%s: %s", __func__, msg); | ||
87 | while ((e = ERR_get_error()) != 0) | 88 | while ((e = ERR_get_error()) != 0) |
88 | error("%s: %s: %.100s", __func__, msg, | 89 | error("%s: libcrypto error: %.100s", __func__, |
89 | ERR_error_string(e, NULL)); | 90 | ERR_error_string(e, NULL)); |
90 | } | 91 | } |
91 | #endif /* HAVE_EC_KEY_METHOD_NEW */ | 92 | #endif /* HAVE_EC_KEY_METHOD_NEW */ |