summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarkus Goetz <Markus.Goetz@nokia.com>2010-03-10 12:37:04 (GMT)
committerMarkus Goetz <Markus.Goetz@nokia.com>2010-03-15 09:32:45 (GMT)
commit6eb6424a12dfa672afa8c2602a067699e09c0db9 (patch)
tree114eb4d40fbdfdcf93ca61a02d9b5a0d92b37607 /src
parentfa02ebd3a2ca08332fb0e35ebdb7b9a4ac3cacf9 (diff)
downloadQt-6eb6424a12dfa672afa8c2602a067699e09c0db9.zip
Qt-6eb6424a12dfa672afa8c2602a067699e09c0db9.tar.gz
Qt-6eb6424a12dfa672afa8c2602a067699e09c0db9.tar.bz2
QSslKey: Do not make OpenSSL prompt for a password on stdin
Task-number: QTBUG-2515 Reviewed-by: Andreas Aardal Hanssen
Diffstat (limited to 'src')
-rw-r--r--src/network/ssl/qsslkey.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/network/ssl/qsslkey.cpp b/src/network/ssl/qsslkey.cpp
index 41b2384..da39662 100644
--- a/src/network/ssl/qsslkey.cpp
+++ b/src/network/ssl/qsslkey.cpp
@@ -119,9 +119,7 @@ void QSslKeyPrivate::decodePem(const QByteArray &pem, const QByteArray &passPhra
if (!bio)
return;
- void *phrase = passPhrase.isEmpty()
- ? (void *)0
- : (void *)passPhrase.constData();
+ void *phrase = (void *)passPhrase.constData();
if (algorithm == QSsl::Rsa) {
RSA *result = (type == QSsl::PublicKey)