generic-library/poco
1
0
Fork 0
mirror of https://github.com/pocoproject/poco.git synced 2025-03-03 12:58:03 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'poco-1.10.0-modernize' of github.com:pocoproject/poco into poco-1.10.0-modernize

Browse Source
This commit is contained in:
Günter Obiltschnig 2020-01-10 11:42:00 +01:00
commit 3a1f246ecc
5 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
NetSSL_OpenSSL/include/Poco/Net/CertificateHandlerFactoryMgr.h
View File

@ -32,8 +32,8 @@ class NetSSL_API CertificateHandlerFactoryMgr
/// A CertificateHandlerFactoryMgr manages all existing CertificateHandlerFactories.
{
public:
typedef std::map<std::string, Poco::SharedPtr<CertificateHandlerFactory> > FactoriesMap;
using FactoriesMap = std::map<std::string, Poco::SharedPtr<CertificateHandlerFactory>>;
CertificateHandlerFactoryMgr();
/// Creates the CertificateHandlerFactoryMgr.
@ -46,12 +46,12 @@ public:
bool hasFactory(const std::string& name) const;
/// Returns true if for the given name a factory is already registered
const CertificateHandlerFactory* getFactory(const std::string& name) const;
/// Returns NULL if for the given name a factory does not exist, otherwise the factory is returned
void removeFactory(const std::string& name);
/// Removes the factory from the manager.
/// Removes the factory from the manager.
private:
FactoriesMap _factories;

6
NetSSL_OpenSSL/include/Poco/Net/Context.h
View File

@ -59,7 +59,7 @@ class NetSSL_API Context: public Poco::RefCountedObject
/// cipher configuration (cipherList).
{
public:
typedef Poco::AutoPtr<Context> Ptr;
using Ptr = Poco::AutoPtr<Context>;
enum Usage
{
@ -412,9 +412,11 @@ inline Context::Usage Context::usage() const
inline bool Context::isForServerUse() const
{
return _usage == SERVER_USE
|| _usage == TLS_SERVER_USE
|| _usage == TLSV1_SERVER_USE
|| _usage == TLSV1_1_SERVER_USE
|| _usage == TLSV1_2_SERVER_USE;
|| _usage == TLSV1_2_SERVER_USE
|| _usage == TLSV1_3_SERVER_USE;
}

8
NetSSL_OpenSSL/include/Poco/Net/PrivateKeyFactoryMgr.h
View File

@ -32,8 +32,8 @@ class NetSSL_API PrivateKeyFactoryMgr
/// A PrivateKeyFactoryMgr manages all existing PrivateKeyFactories.
{
public:
typedef std::map<std::string, Poco::SharedPtr<PrivateKeyFactory> > FactoriesMap;
using FactoriesMap = std::map<std::string, Poco::SharedPtr<PrivateKeyFactory>>;
PrivateKeyFactoryMgr();
/// Creates the PrivateKeyFactoryMgr.
@ -46,12 +46,12 @@ public:
bool hasFactory(const std::string& name) const;
/// Returns true if for the given name a factory is already registered
const PrivateKeyFactory* getFactory(const std::string& name) const;
/// Returns NULL if for the given name a factory does not exist, otherwise the factory is returned
void removeFactory(const std::string& name);
/// Removes the factory from the manager.
/// Removes the factory from the manager.
private:
FactoriesMap _factories;

4
NetSSL_OpenSSL/include/Poco/Net/SSLManager.h
View File

@ -157,8 +157,8 @@ class NetSSL_API SSLManager
/// Please see the Context class documentation regarding TLSv1.3 support.
{
public:
typedef Poco::SharedPtr<PrivateKeyPassphraseHandler> PrivateKeyPassphraseHandlerPtr;
typedef Poco::SharedPtr<InvalidCertificateHandler> InvalidCertificateHandlerPtr;
using PrivateKeyPassphraseHandlerPtr = Poco::SharedPtr<PrivateKeyPassphraseHandler>;
using InvalidCertificateHandlerPtr = Poco::SharedPtr<InvalidCertificateHandler>;
Poco::BasicEvent<VerificationErrorArgs> ServerVerificationError;
/// Fired whenever a certificate verification error is detected by the server during a handshake.

10
NetSSL_OpenSSL/include/Poco/Net/Session.h
View File

@ -37,16 +37,16 @@ class NetSSL_API Session: public Poco::RefCountedObject
/// if it wants to reuse it with a future connection.
{
public:
typedef Poco::AutoPtr<Session> Ptr;
using Ptr = Poco::AutoPtr<Session>;
SSL_SESSION* sslSession() const;
/// Returns the stored OpenSSL SSL_SESSION object.
protected:
protected:
Session(SSL_SESSION* pSession);
/// Creates a new Session object, using the given
/// SSL_SESSION object.
///
/// SSL_SESSION object.
///
/// The SSL_SESSION's reference count is not changed.
~Session();
@ -59,7 +59,7 @@ private:
Session();
SSL_SESSION* _pSession;
friend class SecureSocketImpl;
};