Remove more load hooks

2 files changed, 5 insertions, 2 deletions

diff --git a/src/pubkey/rw/rw.cpp b/src/pubkey/rw/rw.cpp
index def0ae689..f6d67bbde 100644
--- a/src/pubkey/rw/rw.cpp
+++ b/src/pubkey/rw/rw.cpp
@@ -21,7 +21,7 @@ RW_PublicKey::RW_PublicKey(const BigInt& mod, const BigInt& exp)
    {
    n = mod;
    e = exp;
-   X509_load_hook();
+   core = IF_Core(e, n);
    }
 
 /*
diff --git a/src/pubkey/rw/rw.h b/src/pubkey/rw/rw.h
index dff9a17dc..bc8f053b6 100644
--- a/src/pubkey/rw/rw.h
+++ b/src/pubkey/rw/rw.h
@@ -25,7 +25,10 @@ class BOTAN_DLL RW_PublicKey : public PK_Verifying_with_MR_Key,
 
       RW_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);
+         }
 
       RW_PublicKey(const BigInt& mod, const BigInt& exponent);
    protected: