]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Fix compile error on OPENSSL_VERSION_MAJOR < 3 14419/head
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Thu, 4 Jul 2024 11:56:21 +0000 (13:56 +0200)
committerOtto Moerbeek <otto.moerbeek@open-xchange.com>
Thu, 4 Jul 2024 11:56:21 +0000 (13:56 +0200)
../pdns/libssl.cc:637:28: error: no member named 'content' in 'OpenSSLTLSTicketKey'

pdns/libssl.hh

index 9bcf460802de04022f34b4fc71de8018f6891860..f961c1d25f3b0393dbbe30581dbbc1f6c7a2a527 100644 (file)
@@ -100,12 +100,13 @@ public:
 #if OPENSSL_VERSION_MAJOR >= 3
   int encrypt(unsigned char keyName[TLS_TICKETS_KEY_NAME_SIZE], unsigned char* iv, EVP_CIPHER_CTX* ectx, EVP_MAC_CTX* hctx) const;
   bool decrypt(const unsigned char* iv, EVP_CIPHER_CTX* ectx, EVP_MAC_CTX* hctx) const;
-  [[nodiscard]] std::string content() const;
 #else
   int encrypt(unsigned char keyName[TLS_TICKETS_KEY_NAME_SIZE], unsigned char* iv, EVP_CIPHER_CTX* ectx, HMAC_CTX* hctx) const;
   bool decrypt(const unsigned char* iv, EVP_CIPHER_CTX* ectx, HMAC_CTX* hctx) const;
 #endif
 
+  [[nodiscard]] std::string content() const;
+
 private:
   unsigned char d_name[TLS_TICKETS_KEY_NAME_SIZE];
   unsigned char d_cipherKey[TLS_TICKETS_CIPHER_KEY_SIZE];