diff --git a/0044-FIPS-140-3-keychecks.patch b/0044-FIPS-140-3-keychecks.patch
index 3419495..6c69089 100644
--- a/0044-FIPS-140-3-keychecks.patch
+++ b/0044-FIPS-140-3-keychecks.patch
@@ -89,102 +89,6 @@ diff -up openssl-3.0.1/providers/implementations/exchange/ecdh_exch.c.fips3 open
  
      retlen = ECDH_compute_key(secret, size, ppubkey, privk, NULL);
  
-diff -up openssl-3.0.1/crypto/ec/ec_key.c.fips3 openssl-3.0.1/crypto/ec/ec_key.c
---- openssl-3.0.1/crypto/ec/ec_key.c.fips3	2022-07-25 14:03:34.420222507 +0200
-+++ openssl-3.0.1/crypto/ec/ec_key.c	2022-07-25 14:09:00.728164294 +0200
-@@ -336,6 +336,11 @@ static int ec_generate_key(EC_KEY *eckey
- 
-         OSSL_SELF_TEST_get_callback(eckey->libctx, &cb, &cbarg);
-         ok = ecdsa_keygen_pairwise_test(eckey, cb, cbarg);
-+
-+#ifdef FIPS_MODULE
-+        ok &= ossl_ec_key_public_check(eckey, ctx);
-+        ok &= ossl_ec_key_pairwise_check(eckey, ctx);
-+#endif /* FIPS_MODULE */
-     }
- err:
-     /* Step (9): If there is an error return an invalid keypair. */
-diff -up openssl-3.0.1/crypto/rsa/rsa_gen.c.fips3 openssl-3.0.1/crypto/rsa/rsa_gen.c
---- openssl-3.0.1/crypto/rsa/rsa_gen.c.fips3	2022-07-25 17:02:17.807271297 +0200
-+++ openssl-3.0.1/crypto/rsa/rsa_gen.c	2022-07-25 17:18:24.931959649 +0200
-@@ -23,6 +23,7 @@
- #include <time.h>
- #include "internal/cryptlib.h"
- #include <openssl/bn.h>
-+#include <openssl/obj_mac.h>
- #include <openssl/self_test.h>
- #include "prov/providercommon.h"
- #include "rsa_local.h"
-@@ -476,52 +476,43 @@ static int rsa_keygen(OSSL_LIB_CTX *libc
- static int rsa_keygen_pairwise_test(RSA *rsa, OSSL_CALLBACK *cb, void *cbarg)
- {
-     int ret = 0;
--    unsigned int ciphertxt_len;
--    unsigned char *ciphertxt = NULL;
--    const unsigned char plaintxt[16] = {0};
--    unsigned char *decoded = NULL;
--    unsigned int decoded_len;
--    unsigned int plaintxt_len = (unsigned int)sizeof(plaintxt_len);
--    int padding = RSA_PKCS1_PADDING;
-+    unsigned int signature_len;
-+    unsigned char *signature = NULL;
-     OSSL_SELF_TEST *st = NULL;
-+    static const unsigned char dgst[] = {
-+        0x7f, 0x83, 0xb1, 0x65, 0x7f, 0xf1, 0xfc, 0x53, 0xb9, 0x2d, 0xc1, 0x81,
-+        0x48, 0xa1, 0xd6, 0x5d, 0xfc, 0x2d, 0x4b, 0x1f, 0xa3, 0xd6, 0x77, 0x28,
-+        0x4a, 0xdd, 0xd2, 0x00, 0x12, 0x6d, 0x90, 0x69
-+    };
- 
-     st = OSSL_SELF_TEST_new(cb, cbarg);
-     if (st == NULL)
-         goto err;
-     OSSL_SELF_TEST_onbegin(st, OSSL_SELF_TEST_TYPE_PCT,
-+                           /* No special name for RSA signature PCT*/
-                            OSSL_SELF_TEST_DESC_PCT_RSA_PKCS1);
- 
--    ciphertxt_len = RSA_size(rsa);
-+    signature_len = RSA_size(rsa);
--    /*
--     * RSA_private_encrypt() and RSA_private_decrypt() requires the 'to'
--     * parameter to be a maximum of RSA_size() - allocate space for both.
--     */
--    ciphertxt = OPENSSL_zalloc(ciphertxt_len * 2);
--    if (ciphertxt == NULL)
-+    signature = OPENSSL_zalloc(signature_len);
-+    if (signature == NULL)
-         goto err;
--    decoded = ciphertxt + ciphertxt_len;
- 
--    ciphertxt_len = RSA_public_encrypt(plaintxt_len, plaintxt, ciphertxt, rsa,
--                                       padding);
--    if (ciphertxt_len <= 0)
-+    if (RSA_sign(NID_sha256, dgst, sizeof(dgst), signature, &signature_len, rsa) <= 0)
-         goto err;
--    if (ciphertxt_len == plaintxt_len
--        && memcmp(ciphertxt, plaintxt, plaintxt_len) == 0)
-+
-+    if (signature_len <= 0)
-         goto err;
- 
--    OSSL_SELF_TEST_oncorrupt_byte(st, ciphertxt);
-+    OSSL_SELF_TEST_oncorrupt_byte(st, signature);
- 
--    decoded_len = RSA_private_decrypt(ciphertxt_len, ciphertxt, decoded, rsa,
--                                      padding);
--    if (decoded_len != plaintxt_len
--        || memcmp(decoded, plaintxt,  decoded_len) != 0)
-+    if (RSA_verify(NID_sha256, dgst, sizeof(dgst), signature, signature_len, rsa) <= 0)
-         goto err;
- 
-     ret = 1;
- err:
-     OSSL_SELF_TEST_onend(st, ret);
-     OSSL_SELF_TEST_free(st);
--    OPENSSL_free(ciphertxt);
-+    OPENSSL_free(signature);
- 
-     return ret;
- }
 diff -up openssl-3.0.7/providers/implementations/keymgmt/ec_kmgmt.c.pairwise openssl-3.0.7/providers/implementations/keymgmt/ec_kmgmt.c
 --- openssl-3.0.7/providers/implementations/keymgmt/ec_kmgmt.c.pairwise	2023-02-20 11:44:18.451884117 +0100
 +++ openssl-3.0.7/providers/implementations/keymgmt/ec_kmgmt.c	2023-02-20 12:39:46.037063842 +0100