summaryrefslogtreecommitdiffstats
path: root/src/network/ssl
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@nokia.com>2009-10-29 09:34:37 (GMT)
committerThiago Macieira <thiago.macieira@nokia.com>2009-10-29 09:34:37 (GMT)
commit2f5a5804fb42a4c956f366d002a94076d6623a45 (patch)
treecf78d26f0c804d3d26c723784629440453c26246 /src/network/ssl
parentffe49ed60c9ee778b9999ee4145b44851b053f9f (diff)
parentf425c08d4f2e7f061a0ee8e4a1eee2b17fa64962 (diff)
downloadQt-2f5a5804fb42a4c956f366d002a94076d6623a45.zip
Qt-2f5a5804fb42a4c956f366d002a94076d6623a45.tar.gz
Qt-2f5a5804fb42a4c956f366d002a94076d6623a45.tar.bz2
Merge branch '4.6' into core-4.6
Diffstat (limited to 'src/network/ssl')
-rw-r--r--src/network/ssl/qsslerror.cpp57
1 files changed, 28 insertions, 29 deletions
diff --git a/src/network/ssl/qsslerror.cpp b/src/network/ssl/qsslerror.cpp
index 62fcd4c..4bb58b1 100644
--- a/src/network/ssl/qsslerror.cpp
+++ b/src/network/ssl/qsslerror.cpp
@@ -91,6 +91,7 @@
*/
#include "qsslerror.h"
+#include "qsslsocket.h"
#ifndef QT_NO_DEBUG_STREAM
#include <QtCore/qdebug.h>
@@ -209,81 +210,79 @@ QString QSslError::errorString() const
QString errStr;
switch (d->error) {
case NoError:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "No error"));
+ errStr = QSslSocket::tr("No error");
break;
case UnableToGetIssuerCertificate:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The issuer certificate could not be found"));
+ errStr = QSslSocket::tr("The issuer certificate could not be found");
break;
case UnableToDecryptCertificateSignature:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The certificate signature could not be decrypted"));
+ errStr = QSslSocket::tr("The certificate signature could not be decrypted");
break;
case UnableToDecodeIssuerPublicKey:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The public key in the certificate could not be read"));
+ errStr = QSslSocket::tr("The public key in the certificate could not be read");
break;
case CertificateSignatureFailed:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The signature of the certificate is invalid"));
+ errStr = QSslSocket::tr("The signature of the certificate is invalid");
break;
case CertificateNotYetValid:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The certificate is not yet valid"));
+ errStr = QSslSocket::tr("The certificate is not yet valid");
break;
case CertificateExpired:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The certificate has expired"));
+ errStr = QSslSocket::tr("The certificate has expired");
break;
case InvalidNotBeforeField:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The certificate's notBefore field contains an invalid time"));
+ errStr = QSslSocket::tr("The certificate's notBefore field contains an invalid time");
break;
case InvalidNotAfterField:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The certificate's notAfter field contains an invalid time"));
+ errStr = QSslSocket::tr("The certificate's notAfter field contains an invalid time");
break;
case SelfSignedCertificate:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The certificate is self-signed, and untrusted"));
+ errStr = QSslSocket::tr("The certificate is self-signed, and untrusted");
break;
case SelfSignedCertificateInChain:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The root certificate of the certificate chain is self-signed, and untrusted"));
+ errStr = QSslSocket::tr("The root certificate of the certificate chain is self-signed, and untrusted");
break;
case UnableToGetLocalIssuerCertificate:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The issuer certificate of a locally looked up certificate could not be found"));
+ errStr = QSslSocket::tr("The issuer certificate of a locally looked up certificate could not be found");
break;
case UnableToVerifyFirstCertificate:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "No certificates could be verified"));
+ errStr = QSslSocket::tr("No certificates could be verified");
break;
case InvalidCaCertificate:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "One of the CA certificates is invalid"));
+ errStr = QSslSocket::tr("One of the CA certificates is invalid");
break;
case PathLengthExceeded:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The basicConstraints pathlength parameter has been exceeded"));
+ errStr = QSslSocket::tr("The basicConstraints pathlength parameter has been exceeded");
break;
case InvalidPurpose:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The supplied certificate is unsuited for this purpose"));
+ errStr = QSslSocket::tr("The supplied certificate is unsuited for this purpose");
break;
case CertificateUntrusted:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The root CA certificate is not trusted for this purpose"));
+ errStr = QSslSocket::tr("The root CA certificate is not trusted for this purpose");
break;
case CertificateRejected:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The root CA certificate is marked to reject the specified purpose"));
+ errStr = QSslSocket::tr("The root CA certificate is marked to reject the specified purpose");
break;
case SubjectIssuerMismatch: // hostname mismatch
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError,
- "The current candidate issuer certificate was rejected because its"
- " subject name did not match the issuer name of the current certificate"));
+ errStr = QSslSocket::tr("The current candidate issuer certificate was rejected because its"
+ " subject name did not match the issuer name of the current certificate");
break;
case AuthorityIssuerSerialNumberMismatch:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The current candidate issuer certificate was rejected because"
- " its issuer name and serial number was present and did not match the"
- " authority key identifier of the current certificate"));
+ errStr = QSslSocket::tr("The current candidate issuer certificate was rejected because"
+ " its issuer name and serial number was present and did not match the"
+ " authority key identifier of the current certificate");
break;
case NoPeerCertificate:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "The peer did not present any certificate"));
+ errStr = QSslSocket::tr("The peer did not present any certificate");
break;
case HostNameMismatch:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError,
- "The host name did not match any of the valid hosts"
- " for this certificate"));
+ errStr = QSslSocket::tr("The host name did not match any of the valid hosts"
+ " for this certificate");
break;
case NoSslSupport:
break;
default:
- errStr = QObject::tr(QT_TRANSLATE_NOOP(QSslError, "Unknown error"));
+ errStr = QSslSocket::tr("Unknown error");
break;
}