sign-file,extract-cert: switch to PROVIDER API for OpenSSL >= 3.0
Subsystems (2)
cover sign-file,extract-cert: switch to PROVIDER API for OpenSSL >= 3.0
The ENGINE interface has its limitations and it has been superseded by the PROVIDER API, it is deprecated in OpenSSL version 3.0. Some distros have started removing it from header files.
Update sign-file and extract-cert to use PROVIDER API for OpenSSL Major >= 3.
Tested on F39 with openssl-3.1.1, pkcs11-provider-0.5-2, openssl-pkcs11-0.4.12-4 and softhsm-2.6.1-5 by using same key/cert as PEM and PKCS11 and comparing that the result is identical.
Jan Stancek (3):
sign-file,extract-cert: move common SSL helper functions to a header sign-file,extract-cert: avoid using deprecated ERR_get_error_line() sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3
MAINTAINERS | 1 + certs/Makefile | 2 +- certs/extract-cert.c | 138 +++++++++++++++++++++++-------------------- scripts/sign-file.c | 134 +++++++++++++++++++++-------------------- scripts/ssl-common.h | 32 ++++++++++ 5 files changed, 178 insertions(+), 129 deletions(-) create mode 100644 scripts/ssl-common.h
Signature · 1 line
2.39.3
PATCH 1/3 sign-file,extract-cert: move common SSL helper functions to a header
Couple error handling helpers are repeated in both tools, so move them to a common header.
--- MAINTAINERS | 1 + certs/Makefile | 2 +- certs/extract-cert.c | 37 ++----------------------------------- scripts/sign-file.c | 37 ++----------------------------------- scripts/ssl-common.h | 39 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 45 insertions(+), 71 deletions(-) create mode 100644 scripts/ssl-common.h
MAINTAINERS +1 -0
@@ -5042,6 +5042,7 @@ S: Maintained F: Documentation/admin-guide/module-signing.rst F: certs/ F: scripts/sign-file.c +F: scripts/ssl-common.h F: tools/certs/ CFAG12864B LCD DRIVER
certs/Makefile +1 -1
@@ -84,5 +84,5 @@ targets += x509_revocation_list hostprogs := extract-cert -HOSTCFLAGS_extract-cert.o = $(shell $(HOSTPKG_CONFIG) --cflags libcrypto 2> /dev/null) +HOSTCFLAGS_extract-cert.o = $(shell $(HOSTPKG_CONFIG) --cflags libcrypto 2> /dev/null) -I$(srctree)/scripts HOSTLDLIBS_extract-cert = $(shell $(HOSTPKG_CONFIG) --libs libcrypto 2> /dev/null || echo -lcrypto)
certs/extract-cert.c +2 -35
@@ -23,6 +23,8 @@#include <openssl/err.h> #include <openssl/engine.h> +#include "ssl-common.h" +/* * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API. *
@@ -40,41 +42,6 @@ void format(void)exit (2 ); } -static void display_openssl_errors (int l) -{ -const char *file; -char buf[120 ]; -int e, line; - -if (ERR_peek_error () ==0 ) -return ; -fprintf (stderr,"At main.c:%d:\n" , l); - -while ((e =ERR_get_error_line (&file, &line))) { -ERR_error_string (e, buf); -fprintf (stderr,"- SSL %s: %s:%d\n" , buf, file, line); - } -} - -static void drain_openssl_errors (void ) -{ -const char *file; -int line; - -if (ERR_peek_error () ==0 ) -return ; -while (ERR_get_error_line (&file, &line)) {} -} - -#define ERR (cond, fmt, ...) \ - do { \ - bool __cond = (cond); \ - display_openssl_errors(__LINE__); \ - if (__cond) { \ - err(1, fmt, ## __VA_ARGS__); \ - } \ - } while(0) -static const char *key_pass;static BIO *wb;static char *cert_dst;
scripts/sign-file.c +2 -35
@@ -29,6 +29,8 @@#include <openssl/err.h> #include <openssl/engine.h> +#include "ssl-common.h" +/* * OpenSSL 3.0 deprecates the OpenSSL's ENGINE API. *
@@ -83,41 +85,6 @@ void format(void)exit (2 ); } -static void display_openssl_errors (int l) -{ -const char *file; -char buf[120 ]; -int e, line; - -if (ERR_peek_error () ==0 ) -return ; -fprintf (stderr,"At main.c:%d:\n" , l); - -while ((e =ERR_get_error_line (&file, &line))) { -ERR_error_string (e, buf); -fprintf (stderr,"- SSL %s: %s:%d\n" , buf, file, line); - } -} - -static void drain_openssl_errors (void ) -{ -const char *file; -int line; - -if (ERR_peek_error () ==0 ) -return ; -while (ERR_get_error_line (&file, &line)) {} -} - -#define ERR (cond, fmt, ...) \ - do { \ - bool __cond = (cond); \ - display_openssl_errors(__LINE__); \ - if (__cond) { \ - errx(1, fmt, ## __VA_ARGS__); \ - } \ - } while(0) -static const char *key_pass;static int pem_pw_cb (char *buf,int len,int w,void *v)
scripts/ssl-common.h new file +39 -0
@@ -0,0 +1,39 @@ +/* SPDX-License-Identifier: LGPL-2.1+ */ +/* +* SSL helper functions shared by sign-file and extract-cert. +*/ + +static void display_openssl_errors (int l) +{ +const char *file; +char buf[120 ]; +int e, line; + +if (ERR_peek_error () ==0 ) +return ; +fprintf (stderr,"At main.c:%d:\n" , l); + +while ((e =ERR_get_error_line (&file, &line))) { +ERR_error_string (e, buf); +fprintf (stderr,"- SSL %s: %s:%d\n" , buf, file, line); + } +} + +static void drain_openssl_errors (void ) +{ +const char *file; +int line; + +if (ERR_peek_error () ==0 ) +return ; +while (ERR_get_error_line (&file, &line)) {} +} + +#define ERR (cond, fmt, ...) \ + do { \ + bool __cond = (cond); \ + display_openssl_errors(__LINE__); \ + if (__cond) { \ + errx(1, fmt, ## __VA_ARGS__); \ + } \ + } while (0)
Signature · 1 line
2.39.3
PATCH 2/3 sign-file,extract-cert: avoid using deprecated ERR_get_error_line()
In reply to Jan StancekERR_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.
--- certs/extract-cert.c | 4 ++-- scripts/sign-file.c | 6 +++--- scripts/ssl-common.h | 23 ++++++++--------------- 3 files changed, 13 insertions(+), 20 deletions(-)
certs/extract-cert.c +2 -2
@@ -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)
scripts/sign-file.c +3 -3
@@ -114,11 +114,11 @@ static EVP_PKEY *read_private_key(const char *private_key_name)ENGINE *e;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)
@@ -273,7 +273,7 @@ int main(int argc, char **argv)/* Digest the module data. */ OpenSSL_add_all_digests (); -display_openssl_errors (__LINE__); +drain_openssl_errors (__LINE__,0 ); digest_algo =EVP_get_digestbyname (hash_algo);ERR (!digest_algo,"EVP_get_digestbyname" );
scripts/ssl-common.h +8 -15
@@ -3,7 +3,7 @@* SSL helper functions shared by sign-file and extract-cert. */ -static void display_openssl_errors (int l) +static void drain_openssl_errors (int l,int silent) {const char *file;char buf[120 ];
@@ -11,28 +11,21 @@ static void display_openssl_errors(int l)if (ERR_peek_error () ==0 )return ; -fprintf (stderr,"At main.c:%d:\n" , l); +if (!silent) +fprintf (stderr,"At main.c:%d:\n" , l); -while ((e =ERR_get_error_line (&file, &line))) { +while ((e =ERR_peek_error_line (&file, &line))) {ERR_error_string (e, buf); -fprintf (stderr,"- SSL %s: %s:%d\n" , buf, file, line); +if (!silent) +fprintf (stderr,"- SSL %s: %s:%d\n" , buf, file, line); +ERR_get_error (); } } -static void drain_openssl_errors (void ) -{ -const char *file; -int line; - -if (ERR_peek_error () ==0 ) -return ; -while (ERR_get_error_line (&file, &line)) {} -} -#define ERR (cond, fmt, ...) \ do { \ bool __cond = (cond); \ - display_openssl_errors(__LINE__); \ + drain_openssl_errors(__LINE__, 0); \ if (__cond) { \ errx(1, fmt, ## __VA_ARGS__); \ } \
Signature · 1 line
2.39.3
PATCH 3/3 sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3
In reply to Jan StancekENGINE API has been deprecated since OpenSSL version 3.0 [1]. Distros have started dropping support from headers and in future it will likely disappear also from library.
It has been superseded by the PROVIDER API, so use it instead for OPENSSL MAJOR >= 3.
[1] https://github.com/openssl/openssl/blob/master/README-ENGINES.md
--- certs/extract-cert.c | 103 ++++++++++++++++++++++++++++++------------- scripts/sign-file.c | 95 +++++++++++++++++++++++++++------------ 2 files changed, 140 insertions(+), 58 deletions(-)
certs/extract-cert.c +73 -30
@@ -21,17 +21,18 @@#include <openssl/bio.h> #include <openssl/pem.h> #include <openssl/err.h> -#include <openssl/engine.h> - +#if OPENSSL_VERSION_MAJOR >=3 +# define USE_PKCS11_PROVIDER +# include <openssl/provider.h> +# include <openssl/store.h> +#else +# if !defined(OPENSSL_NO_ENGINE ) && !defined(OPENSSL_NO_DEPRECATED_3_0 ) +# define USE_PKCS11_ENGINE +# include <openssl/engine.h> +# endif +#endif #include "ssl-common.h" -/* -* OpenSSL 3.0 deprecates the OpenSSL's ENGINE API. -* -* Remove this if/when that API is no longer used -*/ -#pragma GCC diagnostic ignored "-Wdeprecated-declarations" -#define PKEY_ID_PKCS7 2 static __attribute__((noreturn))
@@ -61,6 +62,66 @@ static void write_cert(X509 *x509)fprintf (stderr,"Extracted cert: %s\n" , buf); } +static X509 *load_cert_pkcs11 (const char *cert_src) +{ +X509 *cert =NULL ; +#ifdef USE_PKCS11_PROVIDER +OSSL_STORE_CTX *store; + +if (!OSSL_PROVIDER_try_load (NULL ,"pkcs11" , true)) +ERR (1 ,"OSSL_PROVIDER_try_load(pkcs11)" ); +if (!OSSL_PROVIDER_try_load (NULL ,"default" , true)) +ERR (1 ,"OSSL_PROVIDER_try_load(default)" ); + + store =OSSL_STORE_open (cert_src,NULL ,NULL ,NULL ,NULL ); +ERR (!store,"OSSL_STORE_open" ); + +while (!OSSL_STORE_eof (store)) { +OSSL_STORE_INFO *info =OSSL_STORE_load (store); + +if (!info) { +drain_openssl_errors (__LINE__,0 ); +continue ; + } +if (OSSL_STORE_INFO_get_type (info) ==OSSL_STORE_INFO_CERT ) { + cert =OSSL_STORE_INFO_get1_CERT (info); +ERR (!cert,"OSSL_STORE_INFO_get1_CERT" ); + } +OSSL_STORE_INFO_free (info); +if (cert) +break ; + } +OSSL_STORE_close (store); +#elif defined(USE_PKCS11_ENGINE ) +ENGINE *e; +struct { +const char *cert_id; +X509 *cert; + } parms; + + parms.cert_id = cert_src; + parms.cert =NULL ; + +ENGINE_load_builtin_engines (); +drain_openssl_errors (__LINE__,1 ); + e =ENGINE_by_id ("pkcs11" ); +ERR (!e,"Load PKCS#11 ENGINE" ); +if (ENGINE_init (e)) +drain_openssl_errors (__LINE__,1 ); +else +ERR (1 ,"ENGINE_init" ); +if (key_pass) +ERR (!ENGINE_ctrl_cmd_string (e,"PIN" , key_pass,0 ),"Set PKCS#11 PIN" ); +ENGINE_ctrl_cmd (e,"LOAD_CERT_CTRL" ,0 , &parms,NULL ,1 ); +ERR (!parms.cert,"Get X.509 from PKCS#11" ); + cert = parms.cert; +#else +fprintf (stderr,"no pkcs11 engine/provider available\n" ); +exit (1 ); +#endif +return cert; +} +int main (int argc,char **argv) {char *cert_src;
@@ -89,28 +150,10 @@ int main(int argc, char **argv)fclose (f);exit (0 ); }else if (!strncmp (cert_src,"pkcs11:" ,7 )) { -ENGINE *e; -struct { -const char *cert_id; -X509 *cert; - } parms; +X509 *cert =load_cert_pkcs11 (cert_src); - parms.cert_id = cert_src; - parms.cert =NULL ; - -ENGINE_load_builtin_engines (); -drain_openssl_errors (__LINE__,1 ); - e =ENGINE_by_id ("pkcs11" ); -ERR (!e,"Load PKCS#11 ENGINE" ); -if (ENGINE_init (e)) -drain_openssl_errors (__LINE__,1 ); -else -ERR (1 ,"ENGINE_init" ); -if (key_pass) -ERR (!ENGINE_ctrl_cmd_string (e,"PIN" , key_pass,0 ),"Set PKCS#11 PIN" ); -ENGINE_ctrl_cmd (e,"LOAD_CERT_CTRL" ,0 , &parms,NULL ,1 ); -ERR (!parms.cert,"Get X.509 from PKCS#11" ); -write_cert (parms.cert); +ERR (!cert,"load_cert_pkcs11 failed" ); +write_cert (cert); }else {BIO *b;X509 *x509;
scripts/sign-file.c +67 -28
121 lines not on this page · raw message
Signature · 1 line
2.39.3
Quoted 15 lines · Jan Stancek
The ENGINE interface has its limitations and it has been superseded by the PROVIDER API, it is deprecated in OpenSSL version 3.0. Some distros have started removing it from header files.
Update sign-file and extract-cert to use PROVIDER API for OpenSSL Major >= 3.
Tested on F39 with openssl-3.1.1, pkcs11-provider-0.5-2, openssl-pkcs11-0.4.12-4 and softhsm-2.6.1-5 by using same key/cert as PEM and PKCS11 and comparing that the result is identical.
Jan Stancek (3):
sign-file,extract-cert: move common SSL helper functions to a header sign-file,extract-cert: avoid using deprecatedERR_get_error_line()sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3
Quoted 7 lines
MAINTAINERS | 1 + certs/Makefile | 2 +- certs/extract-cert.c | 138 +++++++++++++++++++++++-------------------- scripts/sign-file.c | 134 +++++++++++++++++++++-------------------- scripts/ssl-common.h | 32 ++++++++++ 5 files changed, 178 insertions(+), 129 deletions(-) create mode 100644 scripts/ssl-common.h
Adding Cc to Jarkko Sakkinen <[email protected]>.
Signature · 3 lines
Email: Herbert Xu <[email protected]> Home Page: http://gondor.apana.org.au/~herbert/ PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
Quoted 24 lines · Herbert Xu
Quoted 15 lines · Jan Stancek
The ENGINE interface has its limitations and it has been superseded by the PROVIDER API, it is deprecated in OpenSSL version 3.0. Some distros have started removing it from header files.
Update sign-file and extract-cert to use PROVIDER API for OpenSSL Major >= 3.
Tested on F39 with openssl-3.1.1, pkcs11-provider-0.5-2, openssl-pkcs11-0.4.12-4 and softhsm-2.6.1-5 by using same key/cert as PEM and PKCS11 and comparing that the result is identical.
Jan Stancek (3):
sign-file,extract-cert: move common SSL helper functions to a header sign-file,extract-cert: avoid using deprecatedERR_get_error_line()sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3Quoted 7 lines
MAINTAINERS | 1 + certs/Makefile | 2 +- certs/extract-cert.c | 138 +++++++++++++++++++++++-------------------- scripts/sign-file.c | 134 +++++++++++++++++++++-------------------- scripts/ssl-common.h | 32 ++++++++++ 5 files changed, 178 insertions(+), 129 deletions(-) create mode 100644 scripts/ssl-common.h
Quoted 1 line
Adding Cc to Jarkko Sakkinen <[email protected]>.
I can download this but is it likely that there will be v2? If so, I'll hoold on for that. If not, I'll download it.
BR, Jarkko
Quoted 26 lines · Jarkko Sakkinen
Quoted 24 lines · Herbert Xu
Quoted 22 lines · Jan Stancek
The ENGINE interface has its limitations and it has been superseded by the PROVIDER API, it is deprecated in OpenSSL version 3.0. Some distros have started removing it from header files.
Update sign-file and extract-cert to use PROVIDER API for OpenSSL Major >= 3.
Tested on F39 with openssl-3.1.1, pkcs11-provider-0.5-2, openssl-pkcs11-0.4.12-4 and softhsm-2.6.1-5 by using same key/cert as PEM and PKCS11 and comparing that the result is identical.
Jan Stancek (3):
sign-file,extract-cert: move common SSL helper functions to a header sign-file,extract-cert: avoid using deprecatedERR_get_error_line()sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3MAINTAINERS | 1 + certs/Makefile | 2 +- certs/extract-cert.c | 138 +++++++++++++++++++++++-------------------- scripts/sign-file.c | 134 +++++++++++++++++++++-------------------- scripts/ssl-common.h | 32 ++++++++++ 5 files changed, 178 insertions(+), 129 deletions(-) create mode 100644 scripts/ssl-common.h
Quoted 4 lines
Quoted 1 line
Adding Cc to Jarkko Sakkinen <[email protected]>.
I can download this but is it likely that there will be v2? If so, I'll hoold on for that. If not, I'll download it.
Noone requested any changes to v1 so far, so if you can have a look, it would be much appreciated.
Thanks,
Jan
Quoted 3 lines
BR, Jarkko
Quoted 27 lines · Jan Stancek
Quoted 26 lines · Jarkko Sakkinen
Quoted 24 lines · Herbert Xu
Quoted 22 lines · Jan Stancek
The ENGINE interface has its limitations and it has been superseded by the PROVIDER API, it is deprecated in OpenSSL version 3.0. Some distros have started removing it from header files.
Update sign-file and extract-cert to use PROVIDER API for OpenSSL Major >= 3.
Tested on F39 with openssl-3.1.1, pkcs11-provider-0.5-2, openssl-pkcs11-0.4.12-4 and softhsm-2.6.1-5 by using same key/cert as PEM and PKCS11 and comparing that the result is identical.
Jan Stancek (3):
sign-file,extract-cert: move common SSL helper functions to a header sign-file,extract-cert: avoid using deprecatedERR_get_error_line()sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3MAINTAINERS | 1 + certs/Makefile | 2 +- certs/extract-cert.c | 138 +++++++++++++++++++++++-------------------- scripts/sign-file.c | 134 +++++++++++++++++++++-------------------- scripts/ssl-common.h | 32 ++++++++++ 5 files changed, 178 insertions(+), 129 deletions(-) create mode 100644 scripts/ssl-common.h
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Adding Cc to Jarkko Sakkinen <[email protected]>.
I can download this but is it likely that there will be v2? If so, I'll hoold on for that. If not, I'll download it.
Noone requested any changes to v1 so far, so if you can have a look, it would be much appreciated.
OK that is totally fine! I'm just prioritizing and postponing stuff that I can (WHEN it makes sense pragmatically) to get back in the phase ;-)
I take a look at this next week.
Quoted 2 lines
Thanks,
Jan
BR, Jarkko
Quoted 16 lines · EDT Jan Stancek
The ENGINE interface has its limitations and it has been superseded by the PROVIDER API, it is deprecated in OpenSSL version 3.0. Some distros have started removing it from header files.
Update sign-file and extract-cert to use PROVIDER API for OpenSSL Major >= 3.
Tested on F39 with openssl-3.1.1, pkcs11-provider-0.5-2, openssl-pkcs11-0.4.12-4 and softhsm-2.6.1-5 by using same key/cert as PEM and PKCS11 and comparing that the result is identical.
Jan Stancek (3):
sign-file,extract-cert: move common SSL helper functions to a header sign-file,extract-cert: avoid using deprecatedERR_get_error_line()sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3
Quoted 7 lines
MAINTAINERS | 1 + certs/Makefile | 2 +- certs/extract-cert.c | 138 +++++++++++++++++++++++-------------------- scripts/sign-file.c | 134 +++++++++++++++++++++-------------------- scripts/ssl-common.h | 32 ++++++++++ 5 files changed, 178 insertions(+), 129 deletions(-) create mode 100644 scripts/ssl-common.h
The code looks fairly reasonable to me and behaves as expected.
I have been actively using this patch set for several weeks now across linux-6.9.y and now linux-6.10.y with good success.
It is in use in production for Fedora Asahi Linux kernels with good success. Thanks for the fixes. :)
Signature · 1 line
真実はいつも一つ!/ Always, there's only one truth!
Re: [PATCH 1/3] sign-file,extract-cert: move common SSL helper functions to a header
In reply to Jan StancekQuoted 4 lines · Jan Stancek
Couple error handling helpers are repeated in both tools, so move them to a common header.
Signed-off-by Jan Stancek <[email protected]>
BR, Jarkko
Re: [PATCH 2/3] sign-file,extract-cert: avoid using deprecated ERR_get_error_line()
In reply to Jan StancekQuoted 97 lines · Jan Stancek
ERR_get_error_line()is deprecated since OpenSSL 3.0.Use
ERR_peek_error_line()instead, and combinedisplay_openssl_errors()anddrain_openssl_errors()to a single function where parameter decides if it should consume errors silently.Signed-off-by Jan Stancek <[email protected]>--- certs/extract-cert.c | 4 ++-- scripts/sign-file.c | 6 +++--- scripts/ssl-common.h | 23 ++++++++--------------- 3 files changed, 13 insertions(+), 20 deletions(-)certs/extract-cert.c +2
-2@@ -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)scripts/sign-file.c +3
-3@@ -114,11 +114,11 @@ static EVP_PKEY *read_private_key(const char *private_key_name)ENGINE *e;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)@@ -273,7 +273,7 @@ int main(int argc, char **argv)/* Digest the module data. */ OpenSSL_add_all_digests (); -display_openssl_errors (__LINE__); +drain_openssl_errors (__LINE__,0 ); digest_algo =EVP_get_digestbyname (hash_algo);ERR (!digest_algo,"EVP_get_digestbyname" );scripts/ssl-common.h +7
-12@@ -3,7 +3,7 @@* SSL helper functions shared by sign-file and extract-cert. */ -static void display_openssl_errors (int l) +static void drain_openssl_errors (int l,int silent) {const char *file;char buf[120 ];@@ -11,28 +11,21 @@ static void display_openssl_errors(int l)if (ERR_peek_error () ==0 )return ; -fprintf (stderr,"At main.c:%d:\n" , l); +if (!silent) +fprintf (stderr,"At main.c:%d:\n" , l); -while ((e =ERR_get_error_line (&file, &line))) { +while ((e =ERR_peek_error_line (&file, &line))) {ERR_error_string (e, buf); -fprintf (stderr,"- SSL %s: %s:%d\n" , buf, file, line); +if (!silent) +fprintf (stderr,"- SSL %s: %s:%d\n" , buf, file, line); +ERR_get_error (); } } -static void drain_openssl_errors (void ) -{ -const char *file; -int line; - -if (ERR_peek_error () ==0 ) -return ; -while (ERR_get_error_line (&file, &line)) {}
scripts/ssl-common.h static void display_openssl_errors(int l) · line 31
Quoted 10 lines
scripts/ssl-common.h +1
-3-} -#define ERR (cond, fmt, ...) \ do { \ bool __cond = (cond); \ - display_openssl_errors(__LINE__); \ + drain_openssl_errors(__LINE__, 0); \ if (__cond) { \ errx(1, fmt, ## __VA_ARGS__); \ } \
BR, Jarkko
Re: [PATCH 3/3] sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3
In reply to Jan StancekQuoted 10 lines · Jan Stancek
ENGINE API has been deprecated since OpenSSL version 3.0 [1]. Distros have started dropping support from headers and in future it will likely disappear also from library.
It has been superseded by the PROVIDER API, so use it instead for OPENSSL MAJOR >= 3.
[1] https://github.com/openssl/openssl/blob/master/README-ENGINES.md
Signed-off-by Jan Stancek <[email protected]>
I think all these somewhat "dead obvious" patches. Not much to comment on these.
BR, Jarkko
Quoted 18 lines
Date: Fri, 12 Jul 2024 09:11:13 +0200 [thread overview]
Message-ID: <[email protected]> (raw)The ENGINE interface has its limitations and it has been superseded by the PROVIDER API, it is deprecated in OpenSSL version 3.0. Some distros have started removing it from header files.
Update sign-file and extract-cert to use PROVIDER API for OpenSSL Major >= 3.
Tested on F39 with openssl-3.1.1, pkcs11-provider-0.5-2, openssl-pkcs11-0.4.12-4 and softhsm-2.6.1-5 by using same key/cert as PEM and PKCS11 and comparing that the result is identical.
Jan Stancek (3):
sign-file,extract-cert: move common SSL helper functions to a header sign-file,extract-cert: avoid using deprecatedERR_get_error_line()sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3
Quoted 7 lines
MAINTAINERS | 1 + certs/Makefile | 2 +- certs/extract-cert.c | 138 +++++++++++++++++++++++-------------------- scripts/sign-file.c | 134 +++++++++++++++++++++-------------------- scripts/ssl-common.h | 32 ++++++++++ 5 files changed, 178 insertions(+), 129 deletions(-)create mode 100644
scripts/ssl-common.h
Tested on a system where openssl-engine package was not available. With out the patch, couldn't compile upstream kernel (tried 6.11-rc5) With patch, could compile upstream kernel (tried 6.11-rc5)
Quoted 3 lines
Signature · 2 lines
-- 2.39.3
Quoted 28 lines · Neal Gompa
Quoted 16 lines · EDT Jan Stancek
The ENGINE interface has its limitations and it has been superseded by the PROVIDER API, it is deprecated in OpenSSL version 3.0. Some distros have started removing it from header files.
Update sign-file and extract-cert to use PROVIDER API for OpenSSL Major >= 3.
Tested on F39 with openssl-3.1.1, pkcs11-provider-0.5-2, openssl-pkcs11-0.4.12-4 and softhsm-2.6.1-5 by using same key/cert as PEM and PKCS11 and comparing that the result is identical.
Jan Stancek (3):
sign-file,extract-cert: move common SSL helper functions to a header sign-file,extract-cert: avoid using deprecatedERR_get_error_line()sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3Quoted 7 lines
MAINTAINERS | 1 + certs/Makefile | 2 +- certs/extract-cert.c | 138 +++++++++++++++++++++++-------------------- scripts/sign-file.c | 134 +++++++++++++++++++++-------------------- scripts/ssl-common.h | 32 ++++++++++ 5 files changed, 178 insertions(+), 129 deletions(-) create mode 100644 scripts/ssl-common.hThe code looks fairly reasonable to me and behaves as expected.
Quoted 8 lines
I have been actively using this patch set for several weeks now across linux-6.9.y and now linux-6.10.y with good success.
It is in use in production for Fedora Asahi Linux kernels with good success. Thanks for the fixes. :)
Reviewed-by Neal Gompa <[email protected]>
Jarkko, could you please consider submitting this for inclusion into 6.12? I've been carrying this for three Linux kernel rebases now (6.9.y, 6.10.y, and now 6.11.y) and it seems to be just fine, and without it, I cannot build kernels anymore with the OpenSSL engine API disabled in Fedora and CentOS/RHEL. I also expect that the engine API will disappear on other platforms in the near future given its deprecated status and recently accelerated conversion of engine backends to the newer provider API.
Thanks in advance! :)
Signature · 1 line
真実はいつも一つ!/ Always, there's only one truth!
Quoted 47 lines · Neal Gompa
Quoted 28 lines · Neal Gompa
Quoted 16 lines · EDT Jan Stancek
The ENGINE interface has its limitations and it has been superseded by the PROVIDER API, it is deprecated in OpenSSL version 3.0. Some distros have started removing it from header files.
Update sign-file and extract-cert to use PROVIDER API for OpenSSL Major >= 3.
Tested on F39 with openssl-3.1.1, pkcs11-provider-0.5-2, openssl-pkcs11-0.4.12-4 and softhsm-2.6.1-5 by using same key/cert as PEM and PKCS11 and comparing that the result is identical.
Jan Stancek (3):
sign-file,extract-cert: move common SSL helper functions to a header sign-file,extract-cert: avoid using deprecatedERR_get_error_line()sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3Quoted 7 lines
MAINTAINERS | 1 + certs/Makefile | 2 +- certs/extract-cert.c | 138 +++++++++++++++++++++++-------------------- scripts/sign-file.c | 134 +++++++++++++++++++++-------------------- scripts/ssl-common.h | 32 ++++++++++ 5 files changed, 178 insertions(+), 129 deletions(-) create mode 100644 scripts/ssl-common.hThe code looks fairly reasonable to me and behaves as expected.
Quoted 8 lines
I have been actively using this patch set for several weeks now across linux-6.9.y and now linux-6.10.y with good success.
It is in use in production for Fedora Asahi Linux kernels with good success. Thanks for the fixes. :)
Reviewed-by Neal Gompa <[email protected]>Jarkko, could you please consider submitting this for inclusion into 6.12? I've been carrying this for three Linux kernel rebases now (6.9.y, 6.10.y, and now 6.11.y) and it seems to be just fine, and without it, I cannot build kernels anymore with the OpenSSL engine API disabled in Fedora and CentOS/RHEL. I also expect that the engine API will disappear on other platforms in the near future given its deprecated status and recently accelerated conversion of engine backends to the newer provider API.
Quoted 1 line
Thanks in advance! :)
Yes, I think I can. And I've yet to do 6.12 PR because I've been busy sorting out perf regression in the TPM driver.
ERROR: need consistent spacing around '*' (ctx:WxV) #66: FILE: certs/extract-cert.c:69:
+ OSSL_STORE_CTX *store;
^
ERROR: need consistent spacing around '*' (ctx:WxV) #93: FILE: certs/extract-cert.c:96:
+ ENGINE *e;
^
ERROR: need consistent spacing around '*' (ctx:WxV) #199: FILE: scripts/sign-file.c:114:
+ OSSL_STORE_CTX *store;
^
ERROR: need consistent spacing around '*' (ctx:WxV) #229: FILE: scripts/sign-file.c:141:
+ ENGINE *e;
^
Any ideas of these? My guess is that they are unfixable and related to non-kernel-standard code.
BR, Jarkko
Quoted 69 lines · Jarkko Sakkinen
Quoted 47 lines · Neal Gompa
Quoted 28 lines · Neal Gompa
Quoted 16 lines · EDT Jan Stancek
The ENGINE interface has its limitations and it has been superseded by the PROVIDER API, it is deprecated in OpenSSL version 3.0. Some distros have started removing it from header files.
Update sign-file and extract-cert to use PROVIDER API for OpenSSL Major >= 3.
Tested on F39 with openssl-3.1.1, pkcs11-provider-0.5-2, openssl-pkcs11-0.4.12-4 and softhsm-2.6.1-5 by using same key/cert as PEM and PKCS11 and comparing that the result is identical.
Jan Stancek (3):
sign-file,extract-cert: move common SSL helper functions to a header sign-file,extract-cert: avoid using deprecatedERR_get_error_line()sign-file,extract-cert: use pkcs11 provider for OPENSSL MAJOR >= 3Quoted 7 lines
MAINTAINERS | 1 + certs/Makefile | 2 +- certs/extract-cert.c | 138 +++++++++++++++++++++++-------------------- scripts/sign-file.c | 134 +++++++++++++++++++++-------------------- scripts/ssl-common.h | 32 ++++++++++ 5 files changed, 178 insertions(+), 129 deletions(-) create mode 100644 scripts/ssl-common.hThe code looks fairly reasonable to me and behaves as expected.
Quoted 8 lines
I have been actively using this patch set for several weeks now across linux-6.9.y and now linux-6.10.y with good success.
It is in use in production for Fedora Asahi Linux kernels with good success. Thanks for the fixes. :)
Reviewed-by Neal Gompa <[email protected]>Jarkko, could you please consider submitting this for inclusion into 6.12? I've been carrying this for three Linux kernel rebases now (6.9.y, 6.10.y, and now 6.11.y) and it seems to be just fine, and without it, I cannot build kernels anymore with the OpenSSL engine API disabled in Fedora and CentOS/RHEL. I also expect that the engine API will disappear on other platforms in the near future given its deprecated status and recently accelerated conversion of engine backends to the newer provider API.
Quoted 1 line
Thanks in advance! :)
Yes, I think I can. And I've yet to do 6.12 PR because I've been busy sorting out perf regression in the TPM driver.
ERROR: need consistent spacing around '*' (ctx:WxV) #66: FILE:
certs/extract-cert.c:69:+ OSSL_STORE_CTX *store; ^ERROR: need consistent spacing around '*' (ctx:WxV) #93: FILE:
certs/extract-cert.c:96:+ ENGINE *e; ^ERROR: need consistent spacing around '*' (ctx:WxV) #199: FILE:
scripts/sign-file.c:114:+ OSSL_STORE_CTX *store; ^
Quoted 6 lines
ERROR: need consistent spacing around '*' (ctx:WxV) #229: FILE:
scripts/sign-file.c:141:+ ENGINE *e; ^Any ideas of these? My guess is that they are unfixable and related to non-kernel-standard code.
This looks like false-positive. Following will produce same error:
+#if TEST
+ ENGINE *e;
+#endif
+
$ git diff > 1.patch; ./scripts/checkpatch.pl 1.patch
ERROR: need consistent spacing around '*' (ctx:WxV)
#10: FILE: scripts/sign-file.c:217:
+ ENGINE *e;
^total: 1 errors, 0 warnings, 10 lines checked
but if first type in #if block is something checkpatch recognizes, then it reports no issues:
+#if TEST
+ int i;
+ ENGINE *e;
+#endif
+
$ git diff > 1.patch; ./scripts/checkpatch.pl 1.patch total: 0 errors, 0 warnings, 11 lines checked
Regards,
Jan
Jarkko Sakkinen
maintainerQuoted 21 lines · Jan Stancek
This looks like false-positive. Following will produce same error:
(quoted diff) +4
-0+#if TEST + ENGINE *e; +#endif +$ git diff > 1.patch; ./scripts/checkpatch.pl 1.patch ERROR: need consistent spacing around '*' (ctx:WxV) #10: FILE: scripts/sign-file.c:217: + ENGINE *e; ^total: 1 errors, 0 warnings, 10 lines checked
but if first type in #if block is something checkpatch recognizes, then it reports no issues:
(quoted diff) +5
-0+#if TEST + int i; + ENGINE *e; +#endif +
Quoted 2 lines
$ git diff > 1.patch; ./scripts/checkpatch.pl 1.patch total: 0 errors, 0 warnings, 11 lines checked
I fixed a couple of alignment issues reported by "checkpatch.pl --strict" and sent a pull request:
https://lore.kernel.org/keyrings/[email protected]/T/#u
Quoted 2 lines
Regards,
Jan
BR, Jarkko