AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SSL backend: Fix pem header/footer utility methods

Browse Source 
These methods assumed incoming data would have LF line endings, and
therefore broke when parsing files with CRLF line endings. This
simply removes the line feed from the header/footer strings, and switches
to QByteArrayLiteral while doing so.

Change-Id: I0c14634243c4bd7d19a6b5ef718b6ed1cc6bcdb2
Reviewed-by: Richard J. Moore <rich@kde.org>
This commit is contained in:
Andrew Knight 2014-08-09 23:49:43 +03:00
parent 259cf68e06
commit 57d9eb2b77
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/network/ssl/qsslkey_p.cpp
View File

@ -106,12 +106,11 @@ QSslKey::QSslKey()
*/
QByteArray QSslKeyPrivate::pemHeader() const
{
// ### use QByteArray::fromRawData() instead
if (type == QSsl::PublicKey)
return QByteArray("-----BEGIN PUBLIC KEY-----\n");
return QByteArrayLiteral("-----BEGIN PUBLIC KEY-----");
else if (algorithm == QSsl::Rsa)
return QByteArray("-----BEGIN RSA PRIVATE KEY-----\n");
return QByteArray("-----BEGIN DSA PRIVATE KEY-----\n");
return QByteArrayLiteral("-----BEGIN RSA PRIVATE KEY-----");
return QByteArrayLiteral("-----BEGIN DSA PRIVATE KEY-----");
}
/*!
@ -119,12 +118,11 @@ QByteArray QSslKeyPrivate::pemHeader() const
*/
QByteArray QSslKeyPrivate::pemFooter() const
{
// ### use QByteArray::fromRawData() instead
if (type == QSsl::PublicKey)
return QByteArray("-----END PUBLIC KEY-----\n");
return QByteArrayLiteral("-----END PUBLIC KEY-----");
else if (algorithm == QSsl::Rsa)
return QByteArray("-----END RSA PRIVATE KEY-----\n");
return QByteArray("-----END DSA PRIVATE KEY-----\n");
return QByteArrayLiteral("-----END RSA PRIVATE KEY-----");
return QByteArrayLiteral("-----END DSA PRIVATE KEY-----");
}
/*!
@ -146,8 +144,8 @@ QByteArray QSslKeyPrivate::pemFromDer(const QByteArray &der) const
if (rem)
pem.append('\n'); // ###
pem.prepend(pemHeader());
pem.append(pemFooter());
pem.prepend(pemHeader() + '\n');
pem.append(pemFooter() + '\n');
return pem;
}