[#3193] fixed double free when using botan

isc-projects · Feb 23, 2024 · bc69558 · bc69558
1 parent 6bfbdab
commit bc69558
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git a/src/lib/cryptolink/botan_link.cc b/src/lib/cryptolink/botan_link.cc
@@ -70,8 +70,6 @@ CryptoLink::initialize(CryptoLink& c) {
             isc_throw(InitializationError, "Botan error: " << ex.what());
         }
     }
-    // A not yet fixed bug makes RNG to be destroyed after memory pool...
-    atexit([]{ getCryptoLink().getRNG().reset(); });
 }
 
 std::string

diff --git a/src/lib/cryptolink/crypto_rng.cc b/src/lib/cryptolink/crypto_rng.cc
@@ -23,8 +23,7 @@ RNG::~RNG() {
 }
 
 std::vector<uint8_t>
-random(size_t len)
-{
+random(size_t len) {
     RNGPtr rng(CryptoLink::getCryptoLink().getRNG());
     return (rng->random(len));
 }

diff --git a/src/lib/cryptolink/crypto_rng.h b/src/lib/cryptolink/crypto_rng.h
@@ -42,7 +42,7 @@ class RNG : private boost::noncopyable {
     virtual std::vector<uint8_t> random(size_t len) = 0;
 
 private:
-    friend RNGPtr& CryptoLink::getRNG();
+    friend RNGPtr const& CryptoLink::getRNG() const;
 };
 
 /// \brief Generate random value. 

diff --git a/src/lib/cryptolink/cryptolink.cc b/src/lib/cryptolink/cryptolink.cc
@@ -30,8 +30,8 @@ CryptoLink::createHMAC(const void* secret, size_t secret_len,
     return (new HMAC(secret, secret_len, hash_algorithm));
 }
 
-RNGPtr&
-CryptoLink::getRNG() {
+RNGPtr const&
+CryptoLink::getRNG() const {
     return (rng_);
 }
 

diff --git a/src/lib/cryptolink/cryptolink.h b/src/lib/cryptolink/cryptolink.h
@@ -211,7 +211,7 @@ class CryptoLink : private boost::noncopyable {
     ///                           in a derived class
     /// \exception LibraryError if there was any unexpected exception
     ///                         in the underlying library
-    virtual RNGPtr& getRNG();
+    virtual RNGPtr const& getRNG() const;
 
 private:
     /// \brief Initialize the library