openssl: Remove < 3 ifdefs Signed-off-by: Ben Collins <bcollins@ubuntu.com>
diff --git a/libjwt/openssl/jwk-parse.c b/libjwt/openssl/jwk-parse.c index 489afc7..5754606 100644 --- a/libjwt/openssl/jwk-parse.c +++ b/libjwt/openssl/jwk-parse.c
@@ -13,8 +13,6 @@ #include <jwt.h> #include "jwt-private.h" -#if OPENSSL_VERSION_NUMBER >= 0x30000000L - #include <openssl/pem.h> #include <openssl/evp.h> #include <openssl/bio.h> @@ -557,36 +555,3 @@ item->provider_data = NULL; item->provider = JWT_CRYPTO_OPS_NONE; } - -#else /* OpenSSL 3 */ - -static const char not_implemented[] = "OpenSSL Support for JWK requires 3.0 or higher"; - -JWT_NO_EXPORT -int openssl_process_eddsa(json_t *jwk, jwk_item_t *item) -{ - jwt_write_error(item, not_implemented); - return -1; -} - -JWT_NO_EXPORT -int openssl_process_rsa(json_t *jwk, jwk_item_t *item) -{ - jwt_write_error(item, not_implemented); - return -1; -} - -JWT_NO_EXPORT -int openssl_process_ec(json_t *jwk, jwk_item_t *item) -{ - jwt_write_error(item, not_implemented); - return -1; -} - -JWT_NO_EXPORT -void openssl_process_item_free(jwk_item_t *item) -{ - return; -} - -#endif /* OpenSSL 3 */
diff --git a/libjwt/openssl/sign-verify.c b/libjwt/openssl/sign-verify.c index e0f24e3..0ff2bc1 100644 --- a/libjwt/openssl/sign-verify.c +++ b/libjwt/openssl/sign-verify.c
@@ -501,11 +501,7 @@ .sign_sha_pem = openssl_sign_sha_pem, .verify_sha_pem = openssl_verify_sha_pem, -#if OPENSSL_VERSION_NUMBER >= 0x30000000L .jwk_implemented = 1, -#else - .jwk_implemented = 0, -#endif .process_eddsa = openssl_process_eddsa, .process_rsa = openssl_process_rsa, .process_ec = openssl_process_ec,