diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-16 12:23:26 +0200 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-07-16 12:23:26 +0200 |
| commit | ad247735fdd28f9dec6c8e86507bc7e75e50e448 (patch) | |
| tree | 1cd5c5b630c114f743b1106f537af1bc5685166a /src | |
| parent | Unified functions (diff) | |
| download | cuberite-ad247735fdd28f9dec6c8e86507bc7e75e50e448.tar cuberite-ad247735fdd28f9dec6c8e86507bc7e75e50e448.tar.gz cuberite-ad247735fdd28f9dec6c8e86507bc7e75e50e448.tar.bz2 cuberite-ad247735fdd28f9dec6c8e86507bc7e75e50e448.tar.lz cuberite-ad247735fdd28f9dec6c8e86507bc7e75e50e448.tar.xz cuberite-ad247735fdd28f9dec6c8e86507bc7e75e50e448.tar.zst cuberite-ad247735fdd28f9dec6c8e86507bc7e75e50e448.zip | |
Diffstat (limited to 'src')
| -rw-r--r-- | src/Protocol/Authenticator.cpp | 4 | ||||
| -rw-r--r-- | src/Protocol/Authenticator.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/Protocol/Authenticator.cpp b/src/Protocol/Authenticator.cpp index 28df0f882..001bc29cf 100644 --- a/src/Protocol/Authenticator.cpp +++ b/src/Protocol/Authenticator.cpp @@ -190,7 +190,7 @@ void cAuthenticator::Execute(void) -bool cAuthenticator::ConnectSecurelyToAddress(const AString & a_CACerts, const AString & a_ExpectedPeerName, const AString & a_Data, AString & a_Response) +bool cAuthenticator::SecureGetFromAddress(const AString & a_CACerts, const AString & a_ExpectedPeerName, const AString & a_Data, AString & a_Response) { // Connect the socket: cBlockingSslClientSocket Socket; @@ -263,7 +263,7 @@ bool cAuthenticator::AuthWithYggdrasil(AString & a_UserName, const AString & a_S Request += "\r\n"; AString Response; - if (!ConnectSecurelyToAddress(gStarfieldCACert, m_Server, Request, Response)) + if (!SecureGetFromAddress(gStarfieldCACert, m_Server, Request, Response)) { return false; } diff --git a/src/Protocol/Authenticator.h b/src/Protocol/Authenticator.h index 9c2405315..244d94c0b 100644 --- a/src/Protocol/Authenticator.h +++ b/src/Protocol/Authenticator.h @@ -85,7 +85,7 @@ private: virtual void Execute(void) override; /** Connects to a hostname using SSL, sends given data, and sets the response, returning whether all was successful or not */ - bool ConnectSecurelyToAddress(const AString & a_CACerts, const AString & a_ExpectedPeerName, const AString & a_Request, AString & a_Response); + bool SecureGetFromAddress(const AString & a_CACerts, const AString & a_ExpectedPeerName, const AString & a_Request, AString & a_Response); /** Returns true if the user authenticated okay, false on error Sets the username, UUID, and properties (i.e. skin) fields |