aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/asn1/alg_id.h1
-rw-r--r--src/lib/base/secmem.h2
-rw-r--r--src/lib/ffi/ffi_pkey.cpp3
-rw-r--r--src/lib/filters/codec_filt/b64_filt.cpp1
-rw-r--r--src/lib/filters/codec_filt/hex_filt.cpp1
-rw-r--r--src/lib/pubkey/pkcs8.cpp1
-rw-r--r--src/lib/pubkey/pkcs8.h8
-rw-r--r--src/lib/pubkey/x509_key.h6
-rw-r--r--src/lib/tls/credentials_manager.h1
-rw-r--r--src/lib/tls/tls_messages.h2
-rw-r--r--src/lib/x509/certstor_sql/certstor_sql.cpp1
-rw-r--r--src/lib/x509/certstor_sql/certstor_sql.h1
-rw-r--r--src/lib/x509/key_constraint.cpp2
-rw-r--r--src/lib/x509/x509_ca.h1
-rw-r--r--src/lib/x509/x509cert.cpp3
-rw-r--r--src/lib/x509/x509path.cpp1
-rw-r--r--src/lib/x509/x509self.h3
17 files changed, 29 insertions, 9 deletions
diff --git a/src/lib/asn1/alg_id.h b/src/lib/asn1/alg_id.h
index f07280994..be862c5dd 100644
--- a/src/lib/asn1/alg_id.h
+++ b/src/lib/asn1/alg_id.h
@@ -11,6 +11,7 @@
#include <botan/asn1_obj.h>
#include <botan/asn1_oid.h>
#include <string>
+#include <vector>
namespace Botan {
diff --git a/src/lib/base/secmem.h b/src/lib/base/secmem.h
index 9ae4431f5..2355ecd64 100644
--- a/src/lib/base/secmem.h
+++ b/src/lib/base/secmem.h
@@ -10,8 +10,8 @@
#include <botan/types.h> // IWYU pragma: export
#include <botan/mem_ops.h> // IWYU pragma: export
+#include <vector> // IWYU pragma: export
#include <algorithm>
-#include <vector>
#include <deque>
#include <type_traits>
diff --git a/src/lib/ffi/ffi_pkey.cpp b/src/lib/ffi/ffi_pkey.cpp
index bea012e5f..16b3a4208 100644
--- a/src/lib/ffi/ffi_pkey.cpp
+++ b/src/lib/ffi/ffi_pkey.cpp
@@ -11,6 +11,7 @@
#include <botan/data_src.h>
#include <botan/hash.h>
#include <botan/pkcs8.h>
+#include <botan/pk_keys.h>
#include <botan/x509_key.h>
#include <botan/pk_algs.h>
@@ -62,7 +63,7 @@ int botan_privkey_load(botan_privkey_t* key, botan_rng_t rng_obj,
Botan::RandomNumberGenerator& rng = safe_get(rng_obj);
- std::unique_ptr<Botan::PKCS8_PrivateKey> pkcs8;
+ std::unique_ptr<Botan::Private_Key> pkcs8;
if(password == nullptr)
{
diff --git a/src/lib/filters/codec_filt/b64_filt.cpp b/src/lib/filters/codec_filt/b64_filt.cpp
index 4be9c5b1d..bc9fc0f47 100644
--- a/src/lib/filters/codec_filt/b64_filt.cpp
+++ b/src/lib/filters/codec_filt/b64_filt.cpp
@@ -7,7 +7,6 @@
#include <botan/b64_filt.h>
#include <botan/base64.h>
-#include <botan/charset.h>
#include <botan/exceptn.h>
#include <algorithm>
diff --git a/src/lib/filters/codec_filt/hex_filt.cpp b/src/lib/filters/codec_filt/hex_filt.cpp
index ffaa7d567..a95a243dd 100644
--- a/src/lib/filters/codec_filt/hex_filt.cpp
+++ b/src/lib/filters/codec_filt/hex_filt.cpp
@@ -7,7 +7,6 @@
#include <botan/hex_filt.h>
#include <botan/hex.h>
-#include <botan/charset.h>
#include <botan/exceptn.h>
#include <algorithm>
diff --git a/src/lib/pubkey/pkcs8.cpp b/src/lib/pubkey/pkcs8.cpp
index d719ca8f8..6eb3505ca 100644
--- a/src/lib/pubkey/pkcs8.cpp
+++ b/src/lib/pubkey/pkcs8.cpp
@@ -399,6 +399,7 @@ Private_Key* load_key(const std::string& fsname,
RandomNumberGenerator& rng,
const std::string& pass)
{
+ BOTAN_UNUSED(rng);
DataSource_Stream in(fsname);
return PKCS8::load_key(in, [pass]() { return pass; }).release();
}
diff --git a/src/lib/pubkey/pkcs8.h b/src/lib/pubkey/pkcs8.h
index 65ca97a47..1902394d7 100644
--- a/src/lib/pubkey/pkcs8.h
+++ b/src/lib/pubkey/pkcs8.h
@@ -8,12 +8,18 @@
#ifndef BOTAN_PKCS8_H_
#define BOTAN_PKCS8_H_
-#include <botan/x509_key.h>
+#include <botan/exceptn.h>
+#include <botan/secmem.h>
#include <functional>
#include <chrono>
+#include <memory>
namespace Botan {
+class DataSource;
+class RandomNumberGenerator;
+class Private_Key;
+
/**
* PKCS #8 General Exception
*/
diff --git a/src/lib/pubkey/x509_key.h b/src/lib/pubkey/x509_key.h
index b562208aa..e2ebed51c 100644
--- a/src/lib/pubkey/x509_key.h
+++ b/src/lib/pubkey/x509_key.h
@@ -8,12 +8,14 @@
#ifndef BOTAN_X509_PUBLIC_KEY_H_
#define BOTAN_X509_PUBLIC_KEY_H_
-#include <botan/pk_keys.h>
-#include <botan/alg_id.h>
+#include <botan/types.h>
#include <string>
+#include <vector>
namespace Botan {
+class Public_Key;
+class RandomNumberGenerator;
class DataSource;
/**
diff --git a/src/lib/tls/credentials_manager.h b/src/lib/tls/credentials_manager.h
index 5c12460aa..e544fd51d 100644
--- a/src/lib/tls/credentials_manager.h
+++ b/src/lib/tls/credentials_manager.h
@@ -8,6 +8,7 @@
#ifndef BOTAN_CREDENTIALS_MANAGER_H_
#define BOTAN_CREDENTIALS_MANAGER_H_
+#include <botan/pk_keys.h>
#include <botan/x509cert.h>
#include <botan/certstor.h>
#include <botan/symkey.h>
diff --git a/src/lib/tls/tls_messages.h b/src/lib/tls/tls_messages.h
index e8e3a2080..2fc62386b 100644
--- a/src/lib/tls/tls_messages.h
+++ b/src/lib/tls/tls_messages.h
@@ -30,6 +30,8 @@
namespace Botan {
+class Public_Key;
+class Private_Key;
class Credentials_Manager;
namespace TLS {
diff --git a/src/lib/x509/certstor_sql/certstor_sql.cpp b/src/lib/x509/certstor_sql/certstor_sql.cpp
index cd0aebdb1..36acd6ce3 100644
--- a/src/lib/x509/certstor_sql/certstor_sql.cpp
+++ b/src/lib/x509/certstor_sql/certstor_sql.cpp
@@ -6,6 +6,7 @@
*/
#include <botan/certstor_sql.h>
+#include <botan/pk_keys.h>
#include <botan/ber_dec.h>
#include <botan/der_enc.h>
#include <botan/pkcs8.h>
diff --git a/src/lib/x509/certstor_sql/certstor_sql.h b/src/lib/x509/certstor_sql/certstor_sql.h
index 60c8baa67..962b107a5 100644
--- a/src/lib/x509/certstor_sql/certstor_sql.h
+++ b/src/lib/x509/certstor_sql/certstor_sql.h
@@ -16,6 +16,7 @@
namespace Botan {
+class Private_Key;
class RandomNumberGenerator;
/**
diff --git a/src/lib/x509/key_constraint.cpp b/src/lib/x509/key_constraint.cpp
index d8a2bf844..e27d2aff2 100644
--- a/src/lib/x509/key_constraint.cpp
+++ b/src/lib/x509/key_constraint.cpp
@@ -7,7 +7,7 @@
*/
#include <botan/key_constraint.h>
-#include <botan/x509_key.h>
+#include <botan/pk_keys.h>
#include <vector>
namespace Botan {
diff --git a/src/lib/x509/x509_ca.h b/src/lib/x509/x509_ca.h
index ca1e472d8..01c27d409 100644
--- a/src/lib/x509/x509_ca.h
+++ b/src/lib/x509/x509_ca.h
@@ -17,6 +17,7 @@
namespace Botan {
+class Private_Key;
class PKCS10_Request;
class PK_Signer;
diff --git a/src/lib/x509/x509cert.cpp b/src/lib/x509/x509cert.cpp
index 8050a5d68..f2872d805 100644
--- a/src/lib/x509/x509cert.cpp
+++ b/src/lib/x509/x509cert.cpp
@@ -7,6 +7,7 @@
*/
#include <botan/x509cert.h>
+#include <botan/pk_keys.h>
#include <botan/x509_ext.h>
#include <botan/ber_dec.h>
#include <botan/parsing.h>
@@ -657,7 +658,7 @@ std::string X509_Certificate::to_string() const
if(this->subject_key_id().size())
out << "Subject keyid: " << hex_encode(this->subject_key_id()) << "\n";
- std::unique_ptr<X509_PublicKey> pubkey(this->subject_public_key());
+ std::unique_ptr<Public_Key> pubkey(this->subject_public_key());
out << "Public Key:\n" << X509::PEM_encode(*pubkey);
return out.str();
diff --git a/src/lib/x509/x509path.cpp b/src/lib/x509/x509path.cpp
index bc44a5cae..f34fc0a11 100644
--- a/src/lib/x509/x509path.cpp
+++ b/src/lib/x509/x509path.cpp
@@ -6,6 +6,7 @@
*/
#include <botan/x509path.h>
+#include <botan/pk_keys.h>
#include <botan/ocsp.h>
#include <algorithm>
#include <chrono>
diff --git a/src/lib/x509/x509self.h b/src/lib/x509/x509self.h
index ebbfe66f2..069403814 100644
--- a/src/lib/x509/x509self.h
+++ b/src/lib/x509/x509self.h
@@ -15,6 +15,9 @@
namespace Botan {
+class RandomNumberGenerator;
+class Private_Key;
+
/**
* Options for X.509 certificates.
*/
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-23 08:36:05 +0000