From fbc30002ab3438356c0476e70c4577a0310d52c0 Mon Sep 17 00:00:00 2001
From: Unit 193 <unit193@unit193.net>
Date: Tue, 21 Jul 2020 06:15:04 -0400
Subject: New upstream version 2.3.3+dfsg.

---
 src/lib/net/SecureSocket.h | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'src/lib/net/SecureSocket.h')

diff --git a/src/lib/net/SecureSocket.h b/src/lib/net/SecureSocket.h
index 773b508..c602e2d 100644
--- a/src/lib/net/SecureSocket.h
+++ b/src/lib/net/SecureSocket.h
@@ -39,23 +39,23 @@ public:
     ~SecureSocket();
 
     // ISocket overrides
-    void                close();
+    void                close() override;
 
     // IDataSocket overrides
-    virtual void        connect(const NetworkAddress&);
+    virtual void        connect(const NetworkAddress&) override;
     
     std::unique_ptr<ISocketMultiplexerJob> newJob() override;
-    bool                isFatal() const { return m_fatal; }
+    bool                isFatal() const override { return m_fatal; }
     void                isFatal(bool b) { m_fatal = b; }
     bool                isSecureReady();
     void                secureConnect();
     void                secureAccept();
     int                    secureRead(void* buffer, int size, int& read);
     int                    secureWrite(const void* buffer, int size, int& wrote);
-    EJobResult            doRead();
-    EJobResult            doWrite();
+    EJobResult            doRead() override;
+    EJobResult            doWrite() override;
     void                initSsl(bool server);
-    bool                loadCertificates(String& CertFile);
+    bool loadCertificates(std::string& CertFile);
 
 private:
     // SSL
@@ -66,11 +66,9 @@ private:
     bool                showCertificate();
     void                checkResult(int n, int& retry);
     void                showError(const char* reason = NULL);
-    String                getError();
+    std::string getError();
     void                disconnect();
-    void                formatFingerprint(String& fingerprint,
-                                            bool hex = true,
-                                            bool separator = true);
+    void formatFingerprint(std::string& fingerprint, bool hex = true, bool separator = true);
     bool                verifyCertFingerprint();
 
     MultiplexerJobStatus serviceConnect(ISocketMultiplexerJob*, bool, bool, bool);
-- 
cgit v1.2.3