unbreak kex_derive_keys_bn
cvs update to 2014-01-14, keep conflicts
resolve conflicts; pull ssh-ed25519.c from current

pulls some key related changes from af3467958044d2aeccb23
unbreak ssh_rsa_verify
keep conflicts after % cvs -R up -D 2014-02-05 .
resolve conflicts
add blocks.c
cipher_cleanup: allow bzero:ed sshcipher_ctx
we need bcrypt from libutil
kex->sign needs to be set