Refreshes keydir patch to account for xmss keys and retiring of ssh1 support. Adds upstream patch to correct openssl version check. Signed-off-by: Ian Leonard <antonlacon@gmail.com>