explain it to GCC

Co-authored-by: René Meusel <rene.meusel@nexenio.com>
randombit · Mar 18, 2022 · 9e7242c · 9e7242c
1 parent 8b68663
commit 9e7242c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/src/lib/tls/msg_certificate_13.cpp b/src/lib/tls/msg_certificate_13.cpp
@@ -6,9 +6,11 @@
 * Botan is released under the Simplified BSD License (see license.txt)
 */
 
+#include <botan/tls_messages.h>
+
 #include <botan/credentials_manager.h>
+#include <botan/ocsp.h>
 #include <botan/tls_callbacks.h>
-#include <botan/tls_messages.h>
 #include <botan/tls_extensions.h>
 #include <botan/tls_exceptn.h>
 #include <botan/tls_alert.h>
@@ -59,7 +61,9 @@ void Certificate_13::verify(Callbacks& callbacks,
  // construction of the OCSP response.
  ocsp_responses.push_back(entry.extensions.get<Certificate_Status_Request>()->get_ocsp_response());
  else
- ocsp_responses.push_back(std::nullopt);
+ // Note: The make_optional instead of simply nullopt is necessary to work around a GCC <= 10.0 bug
+ // see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=80635
+ ocsp_responses.push_back(std::make_optional<OCSP::Response>());
  }
  }
 

diff --git a/src/lib/tls/tls_messages.h b/src/lib/tls/tls_messages.h
@@ -23,7 +23,6 @@
 #include <botan/tls_ciphersuite.h>
 #include <botan/pk_keys.h>
 #include <botan/x509cert.h>
-#include <botan/ocsp.h>
 
 #if defined(BOTAN_HAS_CECPQ1)
  #include <botan/cecpq1.h>
@@ -34,6 +33,10 @@ namespace Botan {
 class Public_Key;
 class Credentials_Manager;
 
+namespace OCSP {
+class Response;
+}
+
 namespace TLS {
 
 class Session;