diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 09:45:31 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-15 09:45:31 (GMT) |
| commit | 02d1a0422c42889813bb2586503aff43a3509e09 (patch) | |
| tree | 114eb4d40fbdfdcf93ca61a02d9b5a0d92b37607 /src/network/ssl/qsslkey.cpp | |
| parent | fa02ebd3a2ca08332fb0e35ebdb7b9a4ac3cacf9 (diff) | |
| parent | 6eb6424a12dfa672afa8c2602a067699e09c0db9 (diff) | |
| download | Qt-02d1a0422c42889813bb2586503aff43a3509e09.zip Qt-02d1a0422c42889813bb2586503aff43a3509e09.tar.gz Qt-02d1a0422c42889813bb2586503aff43a3509e09.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
QSslKey: Do not make OpenSSL prompt for a password on stdin
Diffstat (limited to 'src/network/ssl/qsslkey.cpp')
| -rw-r--r-- | src/network/ssl/qsslkey.cpp | 4 |
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) |