]> git.ipfire.org Git - thirdparty/squid.git/commit
Ask for SSL key password when started with -N but without sslpassword_program.
authorAlex Rousskov <rousskov@measurement-factory.com>
Sun, 2 Jun 2013 16:01:18 +0000 (10:01 -0600)
committerAmos Jeffries <squid3@treenet.co.nz>
Sun, 2 Jun 2013 16:01:18 +0000 (10:01 -0600)
commita0fe14e0cd8c6c61f69a8bbdf2eb61e1b855e2de
tree3c9d280d8607b561314753aefe69ad5dfb9b8d80
parent65db5a9944ee19a4bafda9c7eed9902c353bd420
Ask for SSL key password when started with -N but without sslpassword_program.

Do not give SSL a password-asking callback if sslpassword_program is not
configured. Without a callback, OpenSSL itself asks for the password (which
works if Squid runs in foreground because of -N).

The fix applies to Ssl::readCertChainAndPrivateKeyFromFiles() context only.
This is not the only place where we read private keys. Some other places are
working correctly, but others may need more work. Also,
Ssl::readCertChainAndPrivateKeyFromFiles() may not really work if
sslpassword_program _is_ configured because "user data" pointer will be nil.
src/ssl/support.cc