Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2010-11-11 20:18:18 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2010-11-11 20:29:19 (GMT) |
| commit | fb14db80de0d2ddad902679f3009721592543249 (patch) | |
| tree | 56bc68b0ca9a15768358e5dff702347a2cdac573 | |
| parent | 683eaf165bf7901fc1bd4f80ab777a3898ba3db9 (diff) | |
| download | swift-contrib-fb14db80de0d2ddad902679f3009721592543249.zip swift-contrib-fb14db80de0d2ddad902679f3009721592543249.tar.bz2 | |
Avoided compilation warnings.
| -rw-r--r-- | Swift/Controllers/MainController.cpp | 1 | ||||
| -rw-r--r-- | Swiften/Client/ClientError.h | 1 | ||||
| -rw-r--r-- | Swiften/Client/CoreClient.cpp | 2 |
3 files changed, 4 insertions, 0 deletions
diff --git a/Swift/Controllers/MainController.cpp b/Swift/Controllers/MainController.cpp index cc51ec3..165e87d 100644 --- a/Swift/Controllers/MainController.cpp +++ b/Swift/Controllers/MainController.cpp @@ -428,6 +428,7 @@ void MainController::handleDisconnected(const boost::optional<ClientError>& erro case ClientError::CertificatePathLengthExceededError: case ClientError::InvalidCertificateSignatureError: case ClientError::InvalidCAError: + case ClientError::InvalidServerIdentityError: // TODO message = "Certificate error"; break; } diff --git a/Swiften/Client/ClientError.h b/Swiften/Client/ClientError.h index 1c775e4..7ba0322 100644 --- a/Swiften/Client/ClientError.h +++ b/Swiften/Client/ClientError.h @@ -38,6 +38,7 @@ namespace Swift { CertificatePathLengthExceededError, InvalidCertificateSignatureError, InvalidCAError, + InvalidServerIdentityError, }; ClientError(Type type = UnknownError) : type_(type) {} diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp index 2c3ab35..49726ca 100644 --- a/Swiften/Client/CoreClient.cpp +++ b/Swiften/Client/CoreClient.cpp @@ -202,6 +202,8 @@ void CoreClient::handleSessionFinished(boost::shared_ptr<Error> error) { clientError = ClientError(ClientError::InvalidCertificateSignatureError); case CertificateVerificationError::InvalidCA: clientError = ClientError(ClientError::InvalidCAError); + case CertificateVerificationError::InvalidServerIdentity: + clientError = ClientError(ClientError::InvalidServerIdentityError); } } actualError = boost::optional<ClientError>(clientError); |