[Source/cryptalgo/SecureSocketPort / Tests/unit/core] : Move 'IValida…

…te' to 'CertificateStore'
rdkcentral · Jan 8, 2025 · da99b1e · da99b1e
1 parent cd54ba8
commit da99b1e
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 14 deletions.
diff --git a/Source/cryptalgo/SecureSocketPort.cpp b/Source/cryptalgo/SecureSocketPort.cpp
@@ -877,15 +877,15 @@ int VerifyCallbackWrapper(int verifyStatus, X509_STORE_CTX* ctx)
                     X509* x509Cert = nullptr;
                     int exDataIndex = -1;
                     SSL* ssl = nullptr;
-                    SecureSocketPort::IValidate* validator = nullptr;
+                    CertificateStore::IValidate* validator = nullptr;
 
                     // Retrieve and call the registered callback
 
                     if (   ctx != nullptr
                          && (exDataIndex = SSL_get_ex_data_X509_STORE_CTX_idx()) != -1
                          && (ssl = static_cast<SSL*>(X509_STORE_CTX_get_ex_data(ctx, exDataIndex))) != nullptr
                          && (exDataIndex = ApplicationData::Instance().Index(static_cast<SSL*>(ssl))) != -1
-                         && (validator =  static_cast<SecureSocketPort::IValidate*>(SSL_get_ex_data(ssl, exDataIndex))) != nullptr
+                         && (validator =  static_cast<CertificateStore::IValidate*>(SSL_get_ex_data(ssl, exDataIndex))) != nullptr
                          && (x509Cert = X509_STORE_CTX_get_current_cert(ctx)) != nullptr
                        ) {
                         X509_up_ref(x509Cert);

diff --git a/Source/cryptalgo/SecureSocketPort.h b/Source/cryptalgo/SecureSocketPort.h
@@ -89,6 +89,12 @@ namespace Crypto {
 
         bool IsDefaultStore() const;
 
+        struct IValidate {
+            virtual ~IValidate() = default;
+
+            virtual bool Validate(const Certificate& certificate) const = 0;
+        };
+
     protected:
         operator const void* () const;
 
@@ -104,13 +110,6 @@ namespace Crypto {
     };
 
     class EXTERNAL SecureSocketPort : public Core::IResource {
-    public:
-        struct IValidate {
-            virtual ~IValidate() = default;
-
-            virtual bool Validate(const Certificate& certificate) const = 0;
-        };
-
     private:
         class EXTERNAL Handler : public Core::SocketPort {
         private:
@@ -166,7 +165,7 @@ namespace Crypto {
             void StateChange() override {
                 Update();
             }
-            inline uint32_t Callback(IValidate* callback) {
+            inline uint32_t Callback(CertificateStore::IValidate* callback) {
                 uint32_t result = Core::ERROR_ILLEGAL_STATE;
 
                 Core::SocketPort::Lock();
@@ -193,7 +192,7 @@ namespace Crypto {
             SecureSocketPort& _parent;
             void* _context;
             void* _ssl;
-            IValidate* _callback;
+            CertificateStore::IValidate* _callback;
             mutable state _handShaking;
             mutable Crypto::Certificate _certificate; // (PEM formatted ccertificate (chain)
             mutable Crypto::Key _privateKey; // (PEM formatted) private key
@@ -278,7 +277,7 @@ namespace Crypto {
         inline void Trigger() {
             _handler.Trigger();
         }
-        inline uint32_t Callback(IValidate* callback) {
+        inline uint32_t Callback(Crypto::CertificateStore::IValidate* callback) {
             return (_handler.Callback(callback));
         }
         inline uint32_t Certificate(const Crypto::Certificate& certificate, const Crypto::Key& key) {

diff --git a/Tests/unit/core/test_websocket.cpp b/Tests/unit/core/test_websocket.cpp
@@ -403,7 +403,7 @@ namespace Core {
         static constexpr char volatilePath[] = XSTR(VOLATILE_PATH);
 
         // Validate client certificate
-        class Validator : public ::Thunder::Crypto::SecureSocketPort::IValidate {
+        class Validator : public ::Thunder::Crypto::CertificateStore::IValidate {
         public:
 
             Validator() = default;
@@ -539,7 +539,7 @@ namespace Core {
         static constexpr char volatilePath[] = XSTR(VOLATILE_PATH);
 
         // Validat eclient certificate
-        class Validator : public ::Thunder::Crypto::SecureSocketPort::IValidate {
+        class Validator : public ::Thunder::Crypto::CertificateStore::IValidate {
         public:
 
             Validator() = default;