diff options
| author | Pierre Ossman <ossman@cendio.se> | 2024-12-17 11:00:45 +0100 |
|---|---|---|
| committer | Pierre Ossman <ossman@cendio.se> | 2024-12-17 12:19:55 +0100 |
| commit | 38ff2bdb913edafa26ebd9ba8ec3c94dc654d47c (patch) | |
| tree | 7fa69c7711a560871345220826157a688b2d5891 | |
| parent | 2b803c94ed0cd126af13b752ddc038e320565dbd (diff) | |
| download | tigervnc-38ff2bdb913edafa26ebd9ba8ec3c94dc654d47c.tar.gz tigervnc-38ff2bdb913edafa26ebd9ba8ec3c94dc654d47c.zip | |
Reduce header includes in TLS/RSA-AES headers
We can make do with forward declarations for these classes.
| -rw-r--r-- | common/rfb/CSecurityRSAAES.h | 9 | ||||
| -rw-r--r-- | common/rfb/CSecurityTLS.h | 8 | ||||
| -rw-r--r-- | common/rfb/SSecurityRSAAES.h | 9 | ||||
| -rw-r--r-- | common/rfb/SSecurityTLS.h | 9 |
4 files changed, 26 insertions, 9 deletions
diff --git a/common/rfb/CSecurityRSAAES.h b/common/rfb/CSecurityRSAAES.h index 35b0513b..e5548c1d 100644 --- a/common/rfb/CSecurityRSAAES.h +++ b/common/rfb/CSecurityRSAAES.h @@ -25,12 +25,17 @@ #endif #include <nettle/rsa.h> + #include <rfb/CSecurity.h> #include <rfb/Security.h> -#include <rdr/InStream.h> -#include <rdr/OutStream.h> + #include <rdr/RandomStream.h> +namespace rdr { + class InStream; + class OutStream; +} + namespace rfb { class CSecurityRSAAES : public CSecurity { public: diff --git a/common/rfb/CSecurityTLS.h b/common/rfb/CSecurityTLS.h index 848ef9bb..5091682b 100644 --- a/common/rfb/CSecurityTLS.h +++ b/common/rfb/CSecurityTLS.h @@ -28,10 +28,14 @@ #include <rfb/CSecurity.h> #include <rfb/Security.h> -#include <rdr/InStream.h> -#include <rdr/OutStream.h> + #include <gnutls/gnutls.h> +namespace rdr { + class InStream; + class OutStream; +} + namespace rfb { class CSecurityTLS : public CSecurity { public: diff --git a/common/rfb/SSecurityRSAAES.h b/common/rfb/SSecurityRSAAES.h index edac35c6..a6fbc499 100644 --- a/common/rfb/SSecurityRSAAES.h +++ b/common/rfb/SSecurityRSAAES.h @@ -24,11 +24,16 @@ #endif #include <nettle/rsa.h> + #include <rfb/SSecurity.h> -#include <rdr/InStream.h> -#include <rdr/OutStream.h> + #include <rdr/RandomStream.h> +namespace rdr { + class InStream; + class OutStream; +} + namespace rfb { class SSecurityRSAAES : public SSecurity { diff --git a/common/rfb/SSecurityTLS.h b/common/rfb/SSecurityTLS.h index c29ee474..8f6539d9 100644 --- a/common/rfb/SSecurityTLS.h +++ b/common/rfb/SSecurityTLS.h @@ -27,9 +27,7 @@ #endif #include <rfb/SSecurity.h> -#include <rfb/SSecurityVeNCrypt.h> -#include <rdr/InStream.h> -#include <rdr/OutStream.h> + #include <gnutls/gnutls.h> /* In GnuTLS 3.6.0 DH parameter generation was deprecated. RFC7919 is used instead. @@ -39,6 +37,11 @@ #define SSECURITYTLS__USE_DEPRECATED_DH #endif +namespace rdr { + class InStream; + class OutStream; +} + namespace rfb { class SSecurityTLS : public SSecurity { |