src/usr.bin/ssh/myproposal.h - diff

Return to myproposal.h CVS log

Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/myproposal.h between version 1.2.2.4 and 1.3

-version 1.2.2.4, 2001/03/21 18:52:53
+version 1.3, 2000/05/25 20:45:20
 Line 1
 Line 1
 Line 1
- /*      $OpenBSD$       */
+ #define KEX_DEFAULT_KEX         "diffie-hellman-group1-sha1"
+ #define KEX_DEFAULT_PK_ALG      "ssh-dss"
- /*
+ #define KEX_DEFAULT_ENCRYPT     "3des-cbc,blowfish-cbc,arcfour,cast128-cbc"
-  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
+ #define KEX_DEFAULT_MAC         "hmac-sha1,hmac-md5,hmac-ripemd160@openssh.com"
-  *
+ #define KEX_DEFAULT_COMP        "zlib,none"
-  * Redistribution and use in source and binary forms, with or without
-  * modification, are permitted provided that the following conditions
-  * are met:
-  * 1. Redistributions of source code must retain the above copyright
-  *    notice, this list of conditions and the following disclaimer.
-  * 2. Redistributions in binary form must reproduce the above copyright
-  *    notice, this list of conditions and the following disclaimer in the
-  *    documentation and/or other materials provided with the distribution.
-  *
-  * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-  * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-  * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-  * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  */
- #define KEX_DEFAULT_KEX         "diffie-hellman-group-exchange-sha1,diffie-hellman-group1-sha1"
- #define KEX_DEFAULT_PK_ALG      "ssh-rsa,ssh-dss"
- #define KEX_DEFAULT_ENCRYPT \
-         "aes128-cbc,3des-cbc,blowfish-cbc,cast128-cbc,arcfour," \
-         "aes192-cbc,aes256-cbc," \
-         "rijndael128-cbc,rijndael192-cbc,rijndael256-cbc," \
-         "rijndael-cbc@lysator.liu.se"
- #define KEX_DEFAULT_MAC \
-         "hmac-md5,hmac-sha1,hmac-ripemd160," \
-         "hmac-ripemd160@openssh.com," \
-         "hmac-sha1-96,hmac-md5-96"
- #define KEX_DEFAULT_COMP        "none,zlib"
  #define KEX_DEFAULT_LANG        ""