2 files changed, 8 insertions, 0 deletions
diff --git a/Swiften/Client/ClientError.h b/Swiften/Client/ClientError.h
index baf1b0a..2f2d2af 100644
--- a/Swiften/Client/ClientError.h
+++ b/Swiften/Client/ClientError.h
@@ -8,45 +8,47 @@
 
 namespace Swift {
 	class ClientError {
 		public:
 			enum Type {
 				UnknownError,
 				DomainNameResolveError,
 				ConnectionError,
 				ConnectionReadError,
 				ConnectionWriteError,
 				XMLError,
 				AuthenticationFailedError,
 				CompressionFailedError,
 				ServerVerificationFailedError,
 				NoSupportedAuthMechanismsError,
 				UnexpectedElementError,
 				ResourceBindError,
 				SessionStartError,
 				StreamError,
 				TLSError,
 				ClientCertificateLoadError,
 				ClientCertificateError,
 
 				// Certificate verification errors
 				UnknownCertificateError,
 				CertificateExpiredError,
 				CertificateNotYetValidError,
 				CertificateSelfSignedError,
 				CertificateRejectedError,
 				CertificateUntrustedError,
 				InvalidCertificatePurposeError,
 				CertificatePathLengthExceededError,
 				InvalidCertificateSignatureError,
 				InvalidCAError,
 				InvalidServerIdentityError,
+				RevokedError,
+				RevocationCheckFailedError
 			};
 
 			ClientError(Type type = UnknownError) : type_(type) {}
 
 			Type getType() const { return type_; }
 
 		private:
 			Type type_;
 	};
 }
diff --git a/Swiften/Client/CoreClient.cpp b/Swiften/Client/CoreClient.cpp
index f7e3b21..14481c6 100644
--- a/Swiften/Client/CoreClient.cpp
+++ b/Swiften/Client/CoreClient.cpp
@@ -239,70 +239,76 @@ void CoreClient::handleSessionFinished(boost::shared_ptr<Error> error) {
 		else if (boost::shared_ptr<CertificateVerificationError> verificationError = boost::dynamic_pointer_cast<CertificateVerificationError>(error)) {
 			switch(verificationError->getType()) {
 				case CertificateVerificationError::UnknownError: 
 					clientError = ClientError(ClientError::UnknownCertificateError);
 					break;
 				case CertificateVerificationError::Expired: 
 					clientError = ClientError(ClientError::CertificateExpiredError);
 					break;
 				case CertificateVerificationError::NotYetValid: 
 					clientError = ClientError(ClientError::CertificateNotYetValidError);
 					break;
 				case CertificateVerificationError::SelfSigned: 
 					clientError = ClientError(ClientError::CertificateSelfSignedError);
 					break;
 				case CertificateVerificationError::Rejected: 
 					clientError = ClientError(ClientError::CertificateRejectedError);
 					break;
 				case CertificateVerificationError::Untrusted: 
 					clientError = ClientError(ClientError::CertificateUntrustedError);
 					break;
 				case CertificateVerificationError::InvalidPurpose: 
 					clientError = ClientError(ClientError::InvalidCertificatePurposeError);
 					break;
 				case CertificateVerificationError::PathLengthExceeded: 
 					clientError = ClientError(ClientError::CertificatePathLengthExceededError);
 					break;
 				case CertificateVerificationError::InvalidSignature: 
 					clientError = ClientError(ClientError::InvalidCertificateSignatureError);
 					break;
 				case CertificateVerificationError::InvalidCA: 
 					clientError = ClientError(ClientError::InvalidCAError);
 					break;
 				case CertificateVerificationError::InvalidServerIdentity:
 					clientError = ClientError(ClientError::InvalidServerIdentityError);
 					break;
+				case CertificateVerificationError::Revoked:
+					clientError = ClientError(ClientError::RevokedError);
+					break;
+				case CertificateVerificationError::RevocationCheckFailed:
+					clientError = ClientError(ClientError::RevocationCheckFailedError);
+					break;
 			}
 		}
 		actualError = boost::optional<ClientError>(clientError);
 	}
 	onDisconnected(actualError);
 }
 
 void CoreClient::handleNeedCredentials() {
 	assert(session_);
 	session_->sendCredentials(password_);
 	if (options.forgetPassword) {
 		purgePassword();
 	}
 }
 
 void CoreClient::handleDataRead(const SafeByteArray& data) {
 	onDataRead(data);
 }
 
 void CoreClient::handleDataWritten(const SafeByteArray& data) {
 	onDataWritten(data);
 }
 
 void CoreClient::handleStanzaChannelAvailableChanged(bool available) {
 	if (available) {
 		iqRouter_->setJID(session_->getLocalJID());
 		handleConnected();
 		onConnected();
 	}
 }
 
 void CoreClient::sendMessage(boost::shared_ptr<Message> message) {
 	stanzaChannel_->sendMessage(message);
 }