[openssh-commits] CVS: fuyu.mindrot.org: openssh

[Damien Miller]

CVSROOT:        /var/cvs
Module name:    openssh
Changes by:     djm at fuyu.mindrot.org 14/04/20 13:17:20

Modified files:
    .               : ChangeLog myproposal.h ssh-keyscan.c sshconnect2.c sshd.c

Log message:
Three commits in one (since they touch the same heavily-diverged file
repeatedly):

   - markus at cvs.openbsd.org 2014/03/25 09:40:03
     [myproposal.h]
     trimm default proposals.
     
     This commit removes the weaker pre-SHA2 hashes, the broken ciphers
     (arcfour), and the broken modes (CBC) from the default configuration
     (the patch only changes the default, all the modes are still available
     for the config files).
     
     ok djm@, reminded by tedu@ & naddy@ and discussed with many
   - deraadt at cvs.openbsd.org 2014/03/26 17:16:26
     [myproposal.h]
     The current sharing of myproposal[] between both client and server code
     makes the previous diff highly unpallatable.  We want to go in that
     direction for the server, but not for the client.  Sigh.
     Brought up by naddy.
   - markus at cvs.openbsd.org 2014/03/27 23:01:27
     [myproposal.h ssh-keyscan.c sshconnect2.c sshd.c]
     disable weak proposals in sshd, but keep them in ssh; ok djm@

Diff commands:
cvs -nQq rdiff -u -r1.6777 -r1.6778 openssh/ChangeLog
cvs -nQq rdiff -u -r1.45 -r1.46 openssh/myproposal.h
cvs -nQq rdiff -u -r1.111 -r1.112 openssh/ssh-keyscan.c
cvs -nQq rdiff -u -r1.197 -r1.198 openssh/sshconnect2.c
cvs -nQq rdiff -u -r1.448 -r1.449 openssh/sshd.c

ViewVC:
http://anoncvs.mindrot.org/index.cgi/openssh/ChangeLog?r1=1.6777;r2=1.6778&view=patch
http://anoncvs.mindrot.org/index.cgi/openssh/myproposal.h?r1=1.45;r2=1.46&view=patch
http://anoncvs.mindrot.org/index.cgi/openssh/ssh-keyscan.c?r1=1.111;r2=1.112&view=patch
http://anoncvs.mindrot.org/index.cgi/openssh/sshconnect2.c?r1=1.197;r2=1.198&view=patch
http://anoncvs.mindrot.org/index.cgi/openssh/sshd.c?r1=1.448;r2=1.449&view=patch

Please note that there may be a delay before commits are available
on the public ViewVC site.