summaryrefslogtreecommitdiffstats
path: root/src/PolarSSL++
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-07-20 13:19:18 +0200
committerTiger Wang <ziwei.tiger@outlook.com>2017-07-21 15:41:51 +0200
commita56cfd1f42663856e346a26cbad401aec07bed91 (patch)
tree2bbdef2d6d09e8625ceaddba443b3a97b2febb5e /src/PolarSSL++
parentFastRandom: Remove discrepancy between arg and return value type. (#3846) (diff)
downloadcuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar.gz
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar.bz2
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar.lz
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar.xz
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.tar.zst
cuberite-a56cfd1f42663856e346a26cbad401aec07bed91.zip
Diffstat (limited to 'src/PolarSSL++')
-rw-r--r--src/PolarSSL++/CryptoKey.h2
-rw-r--r--src/PolarSSL++/CtrDrbgContext.cpp2
-rw-r--r--src/PolarSSL++/CtrDrbgContext.h4
-rw-r--r--src/PolarSSL++/RsaPrivateKey.h2
-rw-r--r--src/PolarSSL++/SslContext.cpp2
-rw-r--r--src/PolarSSL++/SslContext.h4
-rw-r--r--src/PolarSSL++/X509Cert.h2
7 files changed, 9 insertions, 9 deletions
diff --git a/src/PolarSSL++/CryptoKey.h b/src/PolarSSL++/CryptoKey.h
index fc8034d16..db15cefb4 100644
--- a/src/PolarSSL++/CryptoKey.h
+++ b/src/PolarSSL++/CryptoKey.h
@@ -69,7 +69,7 @@ protected:
pk_context * GetInternal(void) { return &m_Pk; }
} ;
-typedef SharedPtr<cCryptoKey> cCryptoKeyPtr;
+typedef std::shared_ptr<cCryptoKey> cCryptoKeyPtr;
diff --git a/src/PolarSSL++/CtrDrbgContext.cpp b/src/PolarSSL++/CtrDrbgContext.cpp
index daacc70cc..c2243db38 100644
--- a/src/PolarSSL++/CtrDrbgContext.cpp
+++ b/src/PolarSSL++/CtrDrbgContext.cpp
@@ -21,7 +21,7 @@ cCtrDrbgContext::cCtrDrbgContext(void) :
-cCtrDrbgContext::cCtrDrbgContext(const SharedPtr<cEntropyContext> & a_EntropyContext) :
+cCtrDrbgContext::cCtrDrbgContext(const std::shared_ptr<cEntropyContext> & a_EntropyContext) :
m_EntropyContext(a_EntropyContext),
m_IsValid(false)
{
diff --git a/src/PolarSSL++/CtrDrbgContext.h b/src/PolarSSL++/CtrDrbgContext.h
index 16b4a44b0..20d687015 100644
--- a/src/PolarSSL++/CtrDrbgContext.h
+++ b/src/PolarSSL++/CtrDrbgContext.h
@@ -33,7 +33,7 @@ public:
cCtrDrbgContext(void);
/** Constructs the context with the specified entropy context. */
- cCtrDrbgContext(const SharedPtr<cEntropyContext> & a_EntropyContext);
+ cCtrDrbgContext(const std::shared_ptr<cEntropyContext> & a_EntropyContext);
/** Initializes the context.
a_Custom is optional additional data to use for entropy, nullptr is accepted.
@@ -45,7 +45,7 @@ public:
protected:
/** The entropy source used for generating the random */
- SharedPtr<cEntropyContext> m_EntropyContext;
+ std::shared_ptr<cEntropyContext> m_EntropyContext;
/** The random generator context */
ctr_drbg_context m_CtrDrbg;
diff --git a/src/PolarSSL++/RsaPrivateKey.h b/src/PolarSSL++/RsaPrivateKey.h
index 32422da8d..595ba5663 100644
--- a/src/PolarSSL++/RsaPrivateKey.h
+++ b/src/PolarSSL++/RsaPrivateKey.h
@@ -59,7 +59,7 @@ protected:
rsa_context * GetInternal(void) { return &m_Rsa; }
} ;
-typedef SharedPtr<cRsaPrivateKey> cRsaPrivateKeyPtr;
+typedef std::shared_ptr<cRsaPrivateKey> cRsaPrivateKeyPtr;
diff --git a/src/PolarSSL++/SslContext.cpp b/src/PolarSSL++/SslContext.cpp
index 74b45ea33..557f81db4 100644
--- a/src/PolarSSL++/SslContext.cpp
+++ b/src/PolarSSL++/SslContext.cpp
@@ -36,7 +36,7 @@ cSslContext::~cSslContext()
-int cSslContext::Initialize(bool a_IsClient, const SharedPtr<cCtrDrbgContext> & a_CtrDrbg)
+int cSslContext::Initialize(bool a_IsClient, const std::shared_ptr<cCtrDrbgContext> & a_CtrDrbg)
{
// Check double-initialization:
if (m_IsValid)
diff --git a/src/PolarSSL++/SslContext.h b/src/PolarSSL++/SslContext.h
index 27f9dd674..0588122ba 100644
--- a/src/PolarSSL++/SslContext.h
+++ b/src/PolarSSL++/SslContext.h
@@ -44,7 +44,7 @@ public:
/** Initializes the context for use as a server or client.
Returns 0 on success, PolarSSL error on failure. */
- int Initialize(bool a_IsClient, const SharedPtr<cCtrDrbgContext> & a_CtrDrbg = SharedPtr<cCtrDrbgContext>());
+ int Initialize(bool a_IsClient, const std::shared_ptr<cCtrDrbgContext> & a_CtrDrbg = {});
/** Returns true if the object has been initialized properly. */
bool IsValid(void) const { return m_IsValid; }
@@ -98,7 +98,7 @@ protected:
bool m_IsValid;
/** The random generator to use */
- SharedPtr<cCtrDrbgContext> m_CtrDrbg;
+ std::shared_ptr<cCtrDrbgContext> m_CtrDrbg;
/** The SSL context that PolarSSL uses. */
ssl_context m_Ssl;
diff --git a/src/PolarSSL++/X509Cert.h b/src/PolarSSL++/X509Cert.h
index 8c3468f03..45f714d14 100644
--- a/src/PolarSSL++/X509Cert.h
+++ b/src/PolarSSL++/X509Cert.h
@@ -34,7 +34,7 @@ protected:
x509_crt * GetInternal(void) { return &m_Cert; }
} ;
-typedef SharedPtr<cX509Cert> cX509CertPtr;
+typedef std::shared_ptr<cX509Cert> cX509CertPtr;