diff options
author | EarlOfWenc <lorenz.schwittmann@gmail.com> | 2012-08-20 01:59:09 +0400 |
---|---|---|
committer | Stefan Hacker <dd0t@users.sourceforge.net> | 2012-08-20 23:38:30 +0400 |
commit | 09d5c07a3d6b213cc63945b5a3aedb4134e9e0c2 (patch) | |
tree | d83940344ba52ca4d1e2d26f054bc1cfbc9f5e70 | |
parent | fba76cd293c4d54798091662f8e957e6949a3e57 (diff) |
Replaced last traces of MD5 by SHA-1
-rw-r--r-- | src/mumble/ViewCert.cpp | 4 | ||||
-rw-r--r-- | src/mumble/mumble_cs.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_da.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_de.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_en.ts | 2 | ||||
-rw-r--r-- | src/mumble/mumble_es.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_fr.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_he.ts | 2 | ||||
-rw-r--r-- | src/mumble/mumble_hu.ts | 2 | ||||
-rw-r--r-- | src/mumble/mumble_it.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_ja.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_pl.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_pt_BR.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_ru.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_sv.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_tr.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_zh_CN.ts | 4 | ||||
-rw-r--r-- | src/mumble/mumble_zh_TW.ts | 2 | ||||
-rw-r--r-- | src/murmur/Cert.cpp | 2 |
19 files changed, 33 insertions, 33 deletions
diff --git a/src/mumble/ViewCert.cpp b/src/mumble/ViewCert.cpp index 94eaabab3..8afe205a2 100644 --- a/src/mumble/ViewCert.cpp +++ b/src/mumble/ViewCert.cpp @@ -70,7 +70,7 @@ ViewCert::ViewCert(QList<QSslCertificate> cl, QWidget *p) : QDialog(p) { QMetaObject::connectSlotsByName(this); connect(qdbb, SIGNAL(accepted()), this, SLOT(accept())); - resize(500,300); + resize(510,300); } void ViewCert::on_Chain_currentRowChanged(int idx) { @@ -93,7 +93,7 @@ void ViewCert::on_Chain_currentRowChanged(int idx) { l << tr("Valid to: %1").arg(c.expiryDate().toString()); l << tr("Serial: %1").arg(QString::fromLatin1(c.serialNumber().toHex())); l << tr("Public Key: %1 bits %2").arg(c.publicKey().length()).arg((c.publicKey().algorithm() == QSsl::Rsa) ? tr("RSA") : tr("DSA")); - l << tr("Digest (MD5): %1").arg(QString::fromLatin1(c.digest().toHex())); + l << tr("Digest (SHA-1): %1").arg(QString::fromLatin1(c.digest(QCryptographicHash::Sha1).toHex())); for (i=alts.constBegin(); i != alts.constEnd(); ++i) { switch (i.key()) { case QSsl::EmailEntry: { diff --git a/src/mumble/mumble_cs.ts b/src/mumble/mumble_cs.ts index d99894ec4..3611f2571 100644 --- a/src/mumble/mumble_cs.ts +++ b/src/mumble/mumble_cs.ts @@ -7909,8 +7909,8 @@ Znak přístupu je textový řetězec, který může být použit jako heslo pro </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>Digest (MD5): %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>Digest (SHA-1): %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_da.ts b/src/mumble/mumble_da.ts index 2cb87d2f0..4fdb6ae83 100644 --- a/src/mumble/mumble_da.ts +++ b/src/mumble/mumble_da.ts @@ -7908,8 +7908,8 @@ Et adgangsudtryk er en tekststreng, der kan bruges som en adgangskode for meget </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>Digest (MD5): %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>Digest (SHA-1): %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_de.ts b/src/mumble/mumble_de.ts index 00882c2f2..430c769d6 100644 --- a/src/mumble/mumble_de.ts +++ b/src/mumble/mumble_de.ts @@ -7980,8 +7980,8 @@ Ein Zugriffscode ist eine Zeichenfolge, die als Passwort für ein sehr einfaches </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>Digest (MD5): %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>Digest (SHA-1): %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_en.ts b/src/mumble/mumble_en.ts index f5ff8c3e0..b0b79e6f5 100644 --- a/src/mumble/mumble_en.ts +++ b/src/mumble/mumble_en.ts @@ -7815,7 +7815,7 @@ An access token is a text string, which can be used as a password for very simpl </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> + <source>Digest (SHA-1): %1</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/mumble/mumble_es.ts b/src/mumble/mumble_es.ts index 92577f2c0..1687f5021 100644 --- a/src/mumble/mumble_es.ts +++ b/src/mumble/mumble_es.ts @@ -7884,8 +7884,8 @@ Una credencial de acceso es una cadena de texto que puede ser usada como contras </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>Huella digital (MD5): %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>Huella digital (SHA-1): %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_fr.ts b/src/mumble/mumble_fr.ts index f37cb91b6..3f4fa83eb 100644 --- a/src/mumble/mumble_fr.ts +++ b/src/mumble/mumble_fr.ts @@ -7877,8 +7877,8 @@ Un jeton d'accès est une chaîne de caractères qui peut être utilisée c </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>Digest (MD5) : %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>Digest (SHA-1) : %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_he.ts b/src/mumble/mumble_he.ts index 13ebb5f48..457fdac8d 100644 --- a/src/mumble/mumble_he.ts +++ b/src/mumble/mumble_he.ts @@ -7833,7 +7833,7 @@ An access token is a text string, which can be used as a password for very simpl </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> + <source>Digest (SHA-1): %1</source> <translation type="unfinished"></translation> </message> <message> diff --git a/src/mumble/mumble_hu.ts b/src/mumble/mumble_hu.ts index 86f97385a..8ba888636 100644 --- a/src/mumble/mumble_hu.ts +++ b/src/mumble/mumble_hu.ts @@ -6998,7 +6998,7 @@ A hozzáférési token egy szöveges karaktersorozat, amely jelszóként haszná </message> <message> <location filename="ViewCert.cpp" line="89"/> - <source>Digest (MD5): %1</source> + <source>Digest (SHA-1): %1</source> <translation>kivonat (MD%): %1</translation> </message> <message> diff --git a/src/mumble/mumble_it.ts b/src/mumble/mumble_it.ts index 76939c7d1..0ffc3dc25 100644 --- a/src/mumble/mumble_it.ts +++ b/src/mumble/mumble_it.ts @@ -7917,8 +7917,8 @@ An access token is a text string, which can be used as a password for very simpl </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>Firma (MD5): %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>Firma (SHA-1): %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_ja.ts b/src/mumble/mumble_ja.ts index 45f0b9cc9..ba1ad03e0 100644 --- a/src/mumble/mumble_ja.ts +++ b/src/mumble/mumble_ja.ts @@ -7889,8 +7889,8 @@ An access token is a text string, which can be used as a password for very simpl </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>ダイジェスト(MD5): %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>ダイジェスト(SHA-1): %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_pl.ts b/src/mumble/mumble_pl.ts index 659703e33..271527334 100644 --- a/src/mumble/mumble_pl.ts +++ b/src/mumble/mumble_pl.ts @@ -7834,8 +7834,8 @@ An access token is a text string, which can be used as a password for very simpl </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>Odcisk (MD5): %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>Odcisk (SHA-1): %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_pt_BR.ts b/src/mumble/mumble_pt_BR.ts index 859565fe3..17e31eb92 100644 --- a/src/mumble/mumble_pt_BR.ts +++ b/src/mumble/mumble_pt_BR.ts @@ -7845,8 +7845,8 @@ Uma credencial de acesso é uma cadeia de caractéres de texto, que podem ser us </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>Resumo (MD5): %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>Resumo (SHA-1): %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_ru.ts b/src/mumble/mumble_ru.ts index 327b23770..14c7a8903 100644 --- a/src/mumble/mumble_ru.ts +++ b/src/mumble/mumble_ru.ts @@ -7824,8 +7824,8 @@ An access token is a text string, which can be used as a password for very simpl </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>Контрольная сумма (MD5): %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>Контрольная сумма (SHA-1): %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_sv.ts b/src/mumble/mumble_sv.ts index fbca075f2..f27fb44c5 100644 --- a/src/mumble/mumble_sv.ts +++ b/src/mumble/mumble_sv.ts @@ -7890,8 +7890,8 @@ En token är en text sträng som kan användas som ett lösenord för mycket enk </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>Klassificering (MD5): %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>Klassificering (SHA-1): %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_tr.ts b/src/mumble/mumble_tr.ts index d104ac24f..d7bfe130c 100644 --- a/src/mumble/mumble_tr.ts +++ b/src/mumble/mumble_tr.ts @@ -7853,8 +7853,8 @@ Erişim jetonu bir metindir ve kanallara erişimin çok basit bir şekilde yöne </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>MD5 hash değeri: %1</translation> + <source>Digest (SHA-1): %1</source> + <translation>SHA-1 hash değeri: %1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_zh_CN.ts b/src/mumble/mumble_zh_CN.ts index 486b0ce73..71c272703 100644 --- a/src/mumble/mumble_zh_CN.ts +++ b/src/mumble/mumble_zh_CN.ts @@ -7905,8 +7905,8 @@ An access token is a text string, which can be used as a password for very simpl </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> - <translation>摘要(MD5):%1</translation> + <source>Digest (SHA-1): %1</source> + <translation>摘要(SHA-1):%1</translation> </message> <message> <location line="+4"/> diff --git a/src/mumble/mumble_zh_TW.ts b/src/mumble/mumble_zh_TW.ts index 5222f352e..e3a2a5056 100644 --- a/src/mumble/mumble_zh_TW.ts +++ b/src/mumble/mumble_zh_TW.ts @@ -7813,7 +7813,7 @@ An access token is a text string, which can be used as a password for very simpl </message> <message> <location line="+1"/> - <source>Digest (MD5): %1</source> + <source>Digest (SHA-1): %1</source> <translation></translation> </message> <message> diff --git a/src/murmur/Cert.cpp b/src/murmur/Cert.cpp index 6a47d1be5..49f8c8626 100644 --- a/src/murmur/Cert.cpp +++ b/src/murmur/Cert.cpp @@ -183,5 +183,5 @@ void Server::initializeCert() { } const QString Server::getDigest() const { - return QString::fromLatin1(qscCert.digest().toHex()); + return QString::fromLatin1(qscCert.digest(QCryptographicHash::Sha1).toHex()); } |