Move signature_verify_cache.h to openssl/pki as public api
Update-note: This moves signature_verify_cache.h from the pki
directory to <openssl/pki/signature_verify_cache.h>. Nothing
should really have been depending on this but if so it can
be pre-conditioned on OPENSSL_API_VERSION of 30 or more.
Bug: 660
Change-Id: Ia0ab6e9d16da2a86994ce0dfc6a086e43b79c9ae
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/64787
Reviewed-by: David Benjamin <davidben@google.com>
diff --git a/include/openssl/base.h b/include/openssl/base.h
index 9a47321..98de503 100644
--- a/include/openssl/base.h
+++ b/include/openssl/base.h
@@ -109,7 +109,7 @@
// A consumer may use this symbol in the preprocessor to temporarily build
// against multiple revisions of BoringSSL at the same time. It is not
// recommended to do so for longer than is necessary.
-#define BORINGSSL_API_VERSION 29
+#define BORINGSSL_API_VERSION 30
#if defined(BORINGSSL_SHARED_LIBRARY)
diff --git a/pki/signature_verify_cache.h b/include/openssl/pki/signature_verify_cache.h
similarity index 100%
rename from pki/signature_verify_cache.h
rename to include/openssl/pki/signature_verify_cache.h
diff --git a/pki/mock_signature_verify_cache.h b/pki/mock_signature_verify_cache.h
index 80c4fa3..f380f61 100644
--- a/pki/mock_signature_verify_cache.h
+++ b/pki/mock_signature_verify_cache.h
@@ -11,8 +11,7 @@
#include <string_view>
#include <unordered_map>
-
-#include "signature_verify_cache.h"
+#include <openssl/pki/signature_verify_cache.h>
namespace bssl {
diff --git a/pki/simple_path_builder_delegate.cc b/pki/simple_path_builder_delegate.cc
index f219477..822019b 100644
--- a/pki/simple_path_builder_delegate.cc
+++ b/pki/simple_path_builder_delegate.cc
@@ -11,11 +11,12 @@
#include <openssl/ec_key.h>
#include <openssl/evp.h>
#include <openssl/nid.h>
+#include <openssl/pki/signature_verify_cache.h>
#include <openssl/rsa.h>
+
#include "cert_error_params.h"
#include "cert_errors.h"
#include "signature_algorithm.h"
-#include "signature_verify_cache.h"
#include "verify_signed_data.h"
namespace bssl {
diff --git a/pki/simple_path_builder_delegate.h b/pki/simple_path_builder_delegate.h
index 376782b..6d95b0d 100644
--- a/pki/simple_path_builder_delegate.h
+++ b/pki/simple_path_builder_delegate.h
@@ -8,10 +8,10 @@
#include <stddef.h>
#include <openssl/base.h>
+#include <openssl/pki/signature_verify_cache.h>
#include "path_builder.h"
#include "signature_algorithm.h"
-#include "signature_verify_cache.h"
namespace bssl {
diff --git a/pki/verify_certificate_chain.h b/pki/verify_certificate_chain.h
index b747fac..6c4cccf 100644
--- a/pki/verify_certificate_chain.h
+++ b/pki/verify_certificate_chain.h
@@ -9,11 +9,11 @@
#include <openssl/base.h>
#include <openssl/evp.h>
+#include <openssl/pki/signature_verify_cache.h>
#include "cert_errors.h"
#include "input.h"
#include "parsed_certificate.h"
-#include "signature_verify_cache.h"
namespace bssl {
diff --git a/pki/verify_signed_data.cc b/pki/verify_signed_data.cc
index a30f9d6..4502e2d 100644
--- a/pki/verify_signed_data.cc
+++ b/pki/verify_signed_data.cc
@@ -8,14 +8,15 @@
#include <openssl/digest.h>
#include <openssl/err.h>
#include <openssl/evp.h>
+#include <openssl/pki/signature_verify_cache.h>
#include <openssl/rsa.h>
#include <openssl/sha.h>
+
#include "cert_errors.h"
#include "input.h"
#include "parse_values.h"
#include "parser.h"
#include "signature_algorithm.h"
-#include "signature_verify_cache.h"
namespace bssl {
diff --git a/pki/verify_signed_data.h b/pki/verify_signed_data.h
index e67c919..5ecfcea 100644
--- a/pki/verify_signed_data.h
+++ b/pki/verify_signed_data.h
@@ -7,9 +7,9 @@
#include <openssl/base.h>
#include <openssl/evp.h>
+#include <openssl/pki/signature_verify_cache.h>
#include "signature_algorithm.h"
-#include "signature_verify_cache.h"
namespace bssl {
