This is particularly important for OpenSSL 0.9.7, as `des_read_pw_string' is a macro there. (This fix brought in on the vendor branch, because I already committed it to Heimdal's CVS.)
Userland to follow.