2 files changed, 5 insertions, 2 deletions
diff --git a/src/pubkey/rsa/rsa.cpp b/src/pubkey/rsa/rsa.cpp
index 83e6e1b17..33999f1cd 100644
--- a/src/pubkey/rsa/rsa.cpp
+++ b/src/pubkey/rsa/rsa.cpp
@@ -20,7 +20,7 @@ RSA_PublicKey::RSA_PublicKey(const BigInt& mod, const BigInt& exp)
    {
    n = mod;
    e = exp;
-   X509_load_hook();
+   core = IF_Core(e, n);
    }
 
 /*
diff --git a/src/pubkey/rsa/rsa.h b/src/pubkey/rsa/rsa.h
index 33a049efe..c1210d22a 100644
--- a/src/pubkey/rsa/rsa.h
+++ b/src/pubkey/rsa/rsa.h
@@ -29,7 +29,10 @@ class BOTAN_DLL RSA_PublicKey : public PK_Encrypting_Key,
 
       RSA_PublicKey(const AlgorithmIdentifier& alg_id,
                     const MemoryRegion<byte>& key_bits) :
-         IF_Scheme_PublicKey(alg_id, key_bits) { X509_load_hook(); }
+         IF_Scheme_PublicKey(alg_id, key_bits)
+         {
+         core = IF_Core(e, n);
+         }
 
       /**
       * Create a RSA_PublicKey