• Balázs Scheidler's avatar
    Merged bazsi's patch: · d6dcb8fb
    Balázs Scheidler authored and Niels Möller's avatar Niels Möller committed
    * src/lshd.c (do_read_key): Moved key reading to spki.c. (Bazsi)
    
    * src/spki.c (parse_dsa_private_key): Moved from lshd.c. (Bazsi)
    (parse_private_key): New function (Bazsi).
    (do_spki_parse_key): New function (Bazsi).
    (make_spki_parse_key): New function (Bazsi).
    (read_spki_key_file): New function (Bazsi).
    
    * src/server_publickey.c (do_authenticate): Changed the handling
    of PEER_SSH_DSS_KLUDGE. (Bazsi)
    
    * src/server_keyexchange.c (do_init_server_dh): Handle
    PEER_SSH_DSS_KLUDGE. (Bazsi)
    
    * src/publickey_crypto.c (make_keypair): Added type argument. (Bazsi)
    
    * src/publickey_crypto.h (keypair): Added type attribute. (Bazsi)
    
    * src/lsh.c (main_options): Added identity argument. (Bazsi)
    
    * src/keyexchange.c (do_handle_kexinit): Don't use
    ATOM_SSH_DSS_KLUDGE. (Bazsi)
    
    * src/exception.h (EXC_IO_OPEN_READ): New exception type. (Bazsi)
    
    * src/connection_commands.c (do_line): Fixed detection of ssh2.
    
    * src/client_keyexchange.c (dh_client): Added hostkey_algorithm
    attribute. (Bazsi)
    (do_handle_dh_reply): Handle the dss kludge here. (Bazsi)
    (do_init_client_dh): Don't use ATOM_SSH_DSS_KLUDGE. (Bazsi)
    
    * src/atoms.in: Removed ssh-dss-kludge. (Bazsi)
    
    * src/lshd.c (main): Deal with pid files after forking and
    daemonization, to get the right pid.
    
    Rev: src/atoms.in:1.7
    Rev: src/client.c:1.80
    Rev: src/client_keyexchange.c:1.35
    Rev: src/client_userauth.c:1.20
    Rev: src/connection_commands.c:1.16
    Rev: src/exception.h:1.12
    Rev: src/keyexchange.c:1.57
    Rev: src/lookup_verifier.h:1.2
    Rev: src/lsh.c:1.79
    Rev: src/lshd.c:1.71
    Rev: src/publickey_crypto.c:1.35
    Rev: src/publickey_crypto.h:1.25
    Rev: src/server_keyexchange.c:1.34
    Rev: src/server_publickey.c:1.4
    Rev: src/spki.c:1.4
    Rev: src/spki.h:1.3
    Rev: src/userauth.h:1.16
    d6dcb8fb
lshd.c 12.2 KB