Replace typedef with using in libsecurity API

Author: yadij

src/security/Context.h

@@ -26,18 +26,14 @@
 namespace Security {
 
 #if USE_OPENSSL
-typedef std::shared_ptr<SSL_CTX> ContextPointer;
-
+using ContextPointer = std::shared_ptr<SSL_CTX>;
 #elif HAVE_LIBGNUTLS
-typedef std::shared_ptr<struct gnutls_certificate_credentials_st> ContextPointer;
-
+using ContextPointer = std::shared_ptr<struct gnutls_certificate_credentials_st>;
 #else
 // use void* so we can check against nullptr
-typedef std::shared_ptr<void> ContextPointer;
-
+using ContextPointer = std::shared_ptr<void>;
 #endif
 
 } // namespace Security
 
 #endif /* SQUID_SRC_SECURITY_CONTEXT_H */
-

src/security/ErrorDetail.cc

@@ -31,7 +31,7 @@
 namespace Security {
 
 // we use std::map to optimize search; TODO: Use std::unordered_map instead?
-typedef std::map<ErrorCode, const char *> ErrorCodeNames;
+using ErrorCodeNames = std::map<ErrorCode, const char *>;
 static const ErrorCodeNames TheErrorCodeNames = {
     {   SQUID_TLS_ERR_ACCEPT,
         "SQUID_TLS_ERR_ACCEPT"

src/security/ErrorDetail.h

@@ -41,7 +41,7 @@ class ErrorDetail: public ::ErrorDetail
     MEMPROXY_CLASS(Security::ErrorDetail);
 
 public:
-    typedef ErrorDetailPointer Pointer;
+    using Pointer = ErrorDetailPointer;
 
     /// Details an origin or cache_peer certificate verification failure or mismatch.
     /// \param peer is an origin server or cache_peer certificate

src/security/Handshake.cc

@@ -91,7 +91,8 @@ static const uint64_t HelloRandomSize = 32;
 class Extension
 {
 public:
-    typedef uint16_t Type;
+    using Type = uint16_t;
+
     explicit Extension(Parser::BinaryTokenizer &tk);
 
     /// whether this extension is supported by Squid and, hence, may be bumped
@@ -103,7 +104,7 @@ class Extension
 };
 
 /// Extension types optimized for fast lookups.
-typedef std::unordered_set<Extension::Type> Extensions;
+using Extensions = std::unordered_set<Extension::Type>;
 static Extensions SupportedExtensions();
 
 /// parse TLS ProtocolVersion (uint16) and convert it to AnyP::ProtocolVersion

src/security/Handshake.h

@@ -22,7 +22,8 @@ namespace Security
 class TlsDetails: public RefCountable
 {
 public:
-    typedef RefCount<TlsDetails> Pointer;
+    using Ciphers = std::unordered_set<uint16_t>;
+    using Pointer = RefCount<TlsDetails>;
 
     TlsDetails();
     /// Prints to os stream a human readable form of TlsDetails object
@@ -45,8 +46,6 @@ class TlsDetails: public RefCountable
     /// The client random number
     SBuf clientRandom;
     SBuf sessionId;
-
-    typedef std::unordered_set<uint16_t> Ciphers;
     Ciphers ciphers;
 };
 

src/security/Io.cc

@@ -19,7 +19,7 @@ namespace Security {
 template <typename Fun>
 static IoResult Handshake(Comm::Connection &, ErrorCode, Fun);
 
-typedef SessionPointer::element_type *ConnectionPointer;
+using ConnectionPointer = SessionPointer::element_type *;
 
 } // namespace Security
 

src/security/Io.h

@@ -18,7 +18,7 @@ namespace Security {
 /// a summary a TLS I/O operation outcome
 class IoResult: public RefCountable {
 public:
-    typedef RefCount<IoResult> Pointer;
+    using Pointer = RefCount<IoResult>;
 
     /// all possible outcome cases
     typedef enum { ioSuccess, ioWantRead, ioWantWrite, ioError } Category;

src/security/KeyLogger.h

@@ -15,7 +15,7 @@
 #include <iosfwd>
 
 class MasterXaction;
-typedef RefCount<MasterXaction> MasterXactionPointer;
+using MasterXactionPointer = RefCount<MasterXaction>;
 
 namespace Security {
 

src/security/LockingPointer.h

@@ -34,7 +34,7 @@ namespace Security
 {
 
 inline bool nilFunction(const void *) { return false; }
-typedef HardFun<bool, const void *, nilFunction> NilFunctor;
+using NilFunctor = HardFun<bool, const void *, nilFunction>;
 
 /**
  * A shared pointer to a reference-counting Object with library-specific
@@ -51,7 +51,7 @@ class LockingPointer
 {
 public:
     /// a helper label to simplify this objects API definitions below
-    typedef Security::LockingPointer<T, UnLocker, Locker> SelfType;
+    using SelfType = Security::LockingPointer<T, UnLocker, Locker>;
 
     /// constructs a nil smart pointer
     constexpr LockingPointer(): raw(nullptr) {}

src/security/PeerConnector.cc

@@ -53,7 +53,7 @@ Security::PeerConnector::PeerConnector(const Comm::ConnectionPointer &aServerCon
     // watch for external connection closures
     Must(Comm::IsConnOpen(serverConn));
     Must(!fd_table[serverConn->fd].closing());
-    typedef CommCbMemFunT<Security::PeerConnector, CommCloseCbParams> Dialer;
+    using Dialer = CommCbMemFunT<Security::PeerConnector, CommCloseCbParams>;
     closeHandler = JobCallback(9, 5, Dialer, this, Security::PeerConnector::commCloseHandler);
     comm_add_close_handler(serverConn->fd, closeHandler);
 }
@@ -467,9 +467,8 @@ Security::PeerConnector::noteWantRead()
     const int fd = serverConnection()->fd;
 
     // read timeout to avoid getting stuck while reading from a silent server
-    typedef CommCbMemFunT<Security::PeerConnector, CommTimeoutCbParams> TimeoutDialer;
-    AsyncCall::Pointer timeoutCall = JobCallback(83, 5,
-                                     TimeoutDialer, this, Security::PeerConnector::commTimeoutHandler);
+    using TimeoutDialer = CommCbMemFunT<Security::PeerConnector, CommTimeoutCbParams>;
+    AsyncCall::Pointer timeoutCall = JobCallback(83, 5, TimeoutDialer, this, Security::PeerConnector::commTimeoutHandler);
     const auto timeout = Comm::MortalReadTimeout(startTime, negotiationTimeout);
     commSetConnTimeout(serverConnection(), timeout, timeoutCall);