diff options
| author | tb <> | 2026-04-16 07:28:00 +0000 |
|---|---|---|
| committer | tb <> | 2026-04-16 07:28:00 +0000 |
| commit | 4ab01251a636fac40d8a39e8cc3ba506580aa79b (patch) | |
| tree | 1507d9367c9990c48298039dc67d8d5ce9062f11 /src/lib/libtls/tls_keypair.c | |
| parent | d680a6fb78c5f1a30a0d45de7b989cee9631652a (diff) | |
| download | openbsd-4ab01251a636fac40d8a39e8cc3ba506580aa79b.tar.gz openbsd-4ab01251a636fac40d8a39e8cc3ba506580aa79b.tar.bz2 openbsd-4ab01251a636fac40d8a39e8cc3ba506580aa79b.zip | |
libtls: prefer x version of error setting
If a check fails and errno is not necessarily set by the previous API call
use tls_set_errorx() or tls_error_setx() since turning an unrelated errno
into an error string is unhelpful.
From Michael Forney
ok bcook
Diffstat (limited to 'src/lib/libtls/tls_keypair.c')
| -rw-r--r-- | src/lib/libtls/tls_keypair.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/libtls/tls_keypair.c b/src/lib/libtls/tls_keypair.c index 594b9af438..e10d0fdc76 100644 --- a/src/lib/libtls/tls_keypair.c +++ b/src/lib/libtls/tls_keypair.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* $OpenBSD: tls_keypair.c,v 1.10 2026/04/16 05:16:48 tb Exp $ */ | 1 | /* $OpenBSD: tls_keypair.c,v 1.11 2026/04/16 07:28:00 tb Exp $ */ |
| 2 | /* | 2 | /* |
| 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> | 3 | * Copyright (c) 2014 Joel Sing <jsing@openbsd.org> |
| 4 | * | 4 | * |
| @@ -144,7 +144,7 @@ tls_keypair_load_cert(struct tls_keypair *keypair, struct tls_error *error, | |||
| 144 | *cert = NULL; | 144 | *cert = NULL; |
| 145 | 145 | ||
| 146 | if (keypair->cert_mem == NULL) { | 146 | if (keypair->cert_mem == NULL) { |
| 147 | tls_error_set(error, TLS_ERROR_UNKNOWN, | 147 | tls_error_setx(error, TLS_ERROR_UNKNOWN, |
| 148 | "keypair has no certificate"); | 148 | "keypair has no certificate"); |
| 149 | goto err; | 149 | goto err; |
| 150 | } | 150 | } |
| @@ -163,7 +163,7 @@ tls_keypair_load_cert(struct tls_keypair *keypair, struct tls_error *error, | |||
| 163 | NULL)) == NULL) { | 163 | NULL)) == NULL) { |
| 164 | if ((ssl_err = ERR_peek_error()) != 0) | 164 | if ((ssl_err = ERR_peek_error()) != 0) |
| 165 | errstr = ERR_error_string(ssl_err, NULL); | 165 | errstr = ERR_error_string(ssl_err, NULL); |
| 166 | tls_error_set(error, TLS_ERROR_UNKNOWN, | 166 | tls_error_setx(error, TLS_ERROR_UNKNOWN, |
| 167 | "failed to load certificate: %s", errstr); | 167 | "failed to load certificate: %s", errstr); |
| 168 | goto err; | 168 | goto err; |
| 169 | } | 169 | } |
