modify for version 6.6p1 of openssh and add keychain support