[BACK]Return to myproposal.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/myproposal.h between version 1.25 and 1.26

version 1.25, 2010/04/16 01:47:26 version 1.26, 2010/08/31 11:54:45
Line 23 
Line 23 
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF   * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   
 #define KEX_DEFAULT_KEX         \  #define KEX_DEFAULT_KEX         \
           "ecdh-sha2-nistp521," \
           "ecdh-sha2-nistp256," \
           "ecdh-sha2-nistp384," \
         "diffie-hellman-group-exchange-sha256," \          "diffie-hellman-group-exchange-sha256," \
         "diffie-hellman-group-exchange-sha1," \          "diffie-hellman-group-exchange-sha1," \
         "diffie-hellman-group14-sha1," \          "diffie-hellman-group14-sha1," \
         "diffie-hellman-group1-sha1"          "diffie-hellman-group1-sha1"
   
 #define KEX_DEFAULT_PK_ALG      \  #define KEX_DEFAULT_PK_ALG      \
                                 "ssh-rsa-cert-v01@openssh.com," \          "ecdsa-sha2-nistp256-cert-v01@openssh.com," \
                                 "ssh-dss-cert-v01@openssh.com," \          "ecdsa-sha2-nistp384-cert-v01@openssh.com," \
                                 "ssh-rsa-cert-v00@openssh.com," \          "ecdsa-sha2-nistp521-cert-v01@openssh.com," \
                                 "ssh-dss-cert-v00@openssh.com," \          "ssh-rsa-cert-v01@openssh.com," \
                                 "ssh-rsa,ssh-dss"          "ssh-dss-cert-v01@openssh.com," \
           "ssh-rsa-cert-v00@openssh.com," \
           "ssh-dss-cert-v00@openssh.com," \
           "ecdsa-sha2-nistp256," \
           "ecdsa-sha2-nistp384," \
           "ecdsa-sha2-nistp521," \
           "ssh-rsa," \
           "ssh-dss"
   
 #define KEX_DEFAULT_ENCRYPT \  #define KEX_DEFAULT_ENCRYPT \
         "aes128-ctr,aes192-ctr,aes256-ctr," \          "aes128-ctr,aes192-ctr,aes256-ctr," \

Legend:
Removed from v.1.25  
changed lines
  Added in v.1.26