diff options
| author | Jan Stancek <jstancek@redhat.com> | 2024-07-12 09:11:15 +0200 |
|---|---|---|
| committer | Jarkko Sakkinen <jarkko@kernel.org> | 2024-09-20 19:49:52 +0300 |
| commit | 467d60eddf55588add232feda325da7215ddaf30 (patch) | |
| tree | b10dffcbd6a4d96315fe01ddfbec018479236a64 /certs | |
| parent | 300e6d4116f956b035281ec94297dc4dc8d4e1d3 (diff) | |
| download | linux-stable-467d60eddf55588add232feda325da7215ddaf30.tar.gz linux-stable-467d60eddf55588add232feda325da7215ddaf30.tar.bz2 linux-stable-467d60eddf55588add232feda325da7215ddaf30.zip | |
sign-file,extract-cert: avoid using deprecated ERR_get_error_line()
ERR_get_error_line() is deprecated since OpenSSL 3.0.
Use ERR_peek_error_line() instead, and combine display_openssl_errors()
and drain_openssl_errors() to a single function where parameter decides
if it should consume errors silently.
Signed-off-by: Jan Stancek <jstancek@redhat.com>
Reviewed-by: Jarkko Sakkinen <jarkko@kernel.org>
Tested-by: R Nageswara Sastry <rnsastry@linux.ibm.com>
Reviewed-by: Neal Gompa <neal@gompa.dev>
Signed-off-by: Jarkko Sakkinen <jarkko@kernel.org>
Diffstat (limited to 'certs')
| -rw-r--r-- | certs/extract-cert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/certs/extract-cert.c b/certs/extract-cert.c index 8e7ba9974a1f..61bbe0085671 100644 --- a/certs/extract-cert.c +++ b/certs/extract-cert.c @@ -99,11 +99,11 @@ int main(int argc, char **argv) parms.cert = NULL; ENGINE_load_builtin_engines(); - drain_openssl_errors(); + drain_openssl_errors(__LINE__, 1); e = ENGINE_by_id("pkcs11"); ERR(!e, "Load PKCS#11 ENGINE"); if (ENGINE_init(e)) - drain_openssl_errors(); + drain_openssl_errors(__LINE__, 1); else ERR(1, "ENGINE_init"); if (key_pass) |