View | Details | Raw Unified | Return to bug 2023
Collapse All | Expand All

(-)ssh-6.0/mac.c (-2 lines)
Lines 55-63 struct { Link Here
55 
	{ "hmac-sha1",			SSH_EVP, EVP_sha1, 0, -1, -1 },
 55 
	{ "hmac-sha1",			SSH_EVP, EVP_sha1, 0, -1, -1 },
56 
	{ "hmac-sha1-96",		SSH_EVP, EVP_sha1, 96, -1, -1 },
 56 
	{ "hmac-sha1-96",		SSH_EVP, EVP_sha1, 96, -1, -1 },
57 
	{ "hmac-sha2-256",		SSH_EVP, EVP_sha256, 0, -1, -1 },
 57 
	{ "hmac-sha2-256",		SSH_EVP, EVP_sha256, 0, -1, -1 },
58 
	{ "hmac-sha2-256-96",		SSH_EVP, EVP_sha256, 96, -1, -1 },
59 
	{ "hmac-sha2-512",		SSH_EVP, EVP_sha512, 0, -1, -1 },
 58 
	{ "hmac-sha2-512",		SSH_EVP, EVP_sha512, 0, -1, -1 },
60 
	{ "hmac-sha2-512-96",		SSH_EVP, EVP_sha512, 96, -1, -1 },
61 
	{ "hmac-md5",			SSH_EVP, EVP_md5, 0, -1, -1 },
 59 
	{ "hmac-md5",			SSH_EVP, EVP_md5, 0, -1, -1 },
62 
	{ "hmac-md5-96",		SSH_EVP, EVP_md5, 96, -1, -1 },
 60 
	{ "hmac-md5-96",		SSH_EVP, EVP_md5, 96, -1, -1 },
63 
	{ "hmac-ripemd160",		SSH_EVP, EVP_ripemd160, 0, -1, -1 },
 61 
	{ "hmac-ripemd160",		SSH_EVP, EVP_ripemd160, 0, -1, -1 },
(-)ssh-6.0/myproposal.h (-2 lines)
Lines 57-65 Link Here
57 
	"hmac-sha1," \
 57 
	"hmac-sha1," \
58 
	"umac-64@openssh.com," \
 58 
	"umac-64@openssh.com," \
59 
	"hmac-sha2-256," \
 59 
	"hmac-sha2-256," \
60 
	"hmac-sha2-256-96," \
61 
	"hmac-sha2-512," \
 60 
	"hmac-sha2-512," \
62 
	"hmac-sha2-512-96," \
63 
	"hmac-ripemd160," \
 61 
	"hmac-ripemd160," \
64 
	"hmac-ripemd160@openssh.com," \
 62 
	"hmac-ripemd160@openssh.com," \
65 
	"hmac-sha1-96," \
 63 
	"hmac-sha1-96," \
(-)ssh-6.0/ssh_config.5 (-2 / +1 lines)
Lines 794-801 The default is: Link Here
794 
.Bd -literal -offset indent
 794 
.Bd -literal -offset indent
795 
hmac-md5,hmac-sha1,umac-64@openssh.com,
 795 
hmac-md5,hmac-sha1,umac-64@openssh.com,
796 
hmac-ripemd160,hmac-sha1-96,hmac-md5-96,
 796 
hmac-ripemd160,hmac-sha1-96,hmac-md5-96,
797 
hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,
 797 
hmac-sha2-256,hmac-sha2-512
798 
hmac-sha2-512-96
799 
.Ed
 798 
.Ed
800 
.It Cm NoHostAuthenticationForLocalhost
 799 
.It Cm NoHostAuthenticationForLocalhost
801 
This option can be used if the home directory is shared across machines.
 800 
This option can be used if the home directory is shared across machines.
(-)ssh-6.0/sshd_config.5 (-2 / +1 lines)
Lines 657-664 The default is: Link Here
657 
.Bd -literal -offset indent
 657 
.Bd -literal -offset indent
658 
hmac-md5,hmac-sha1,umac-64@openssh.com,
 658 
hmac-md5,hmac-sha1,umac-64@openssh.com,
659 
hmac-ripemd160,hmac-sha1-96,hmac-md5-96,
 659 
hmac-ripemd160,hmac-sha1-96,hmac-md5-96,
660 
hmac-sha2-256,hmac-sha256-96,hmac-sha2-512,
 660 
hmac-sha2-256,hmac-sha2-512
661 
hmac-sha2-512-96
662 
.Ed
 661 
.Ed
663 
.It Cm Match
 662 
.It Cm Match
664 
Introduces a conditional block.
 663 
Introduces a conditional block.
(-)openssh-6.0p1.orig/mac.c (-2 lines)
Lines 61-69 struct { Link Here
61 
	{ "hmac-sha1-96",		SSH_EVP, EVP_sha1, 96, -1, -1 },
 61 
	{ "hmac-sha1-96",		SSH_EVP, EVP_sha1, 96, -1, -1 },
62 
#ifdef HAVE_EVP_SHA256
 62 
#ifdef HAVE_EVP_SHA256
63 
	{ "hmac-sha2-256",		SSH_EVP, EVP_sha256, 0, -1, -1 },
 63 
	{ "hmac-sha2-256",		SSH_EVP, EVP_sha256, 0, -1, -1 },
64 
	{ "hmac-sha2-256-96",		SSH_EVP, EVP_sha256, 96, -1, -1 },
65 
	{ "hmac-sha2-512",		SSH_EVP, EVP_sha512, 0, -1, -1 },
 64 
	{ "hmac-sha2-512",		SSH_EVP, EVP_sha512, 0, -1, -1 },
66 
	{ "hmac-sha2-512-96",		SSH_EVP, EVP_sha512, 96, -1, -1 },
67 
#endif
 65 
#endif
68 
	{ "hmac-md5",			SSH_EVP, EVP_md5, 0, -1, -1 },
 66 
	{ "hmac-md5",			SSH_EVP, EVP_md5, 0, -1, -1 },
69 
	{ "hmac-md5-96",		SSH_EVP, EVP_md5, 96, -1, -1 },
 67 
	{ "hmac-md5-96",		SSH_EVP, EVP_md5, 96, -1, -1 },
(-)openssh-6.0p1.orig/myproposal.h (-3 / +1 lines)
Lines 78-86 Link Here
78 
#ifdef HAVE_EVP_SHA256
 78 
#ifdef HAVE_EVP_SHA256
79 
#define	SHA2_HMAC_MODES \
 79 
#define	SHA2_HMAC_MODES \
80 
	"hmac-sha2-256," \
 80 
	"hmac-sha2-256," \
81 
	"hmac-sha2-256-96," \
 81 
	"hmac-sha2-512,"
82 
	"hmac-sha2-512," \
83 
	"hmac-sha2-512-96,"
84 
#else
 82 
#else
85 
# define SHA2_HMAC_MODES
 83 
# define SHA2_HMAC_MODES
86 
#endif
 84 
#endif
(-)openssh-6.0p1.orig/regress/cipher-speed.sh (-1 / +1 lines)
Lines 18-24 ciphers="aes128-cbc 3des-cbc blowfish-cb Link Here
18 
	aes128-ctr aes192-ctr aes256-ctr"
 18 
	aes128-ctr aes192-ctr aes256-ctr"
19 
macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96"
 19 
macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96"
20 
config_defined HAVE_EVP_SHA256 &&
 20 
config_defined HAVE_EVP_SHA256 &&
21 
    macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96"
 21 
    macs="$macs hmac-sha2-256 hmac-sha2-512"
22 

          22
          

        

        

          23
          
for c in $ciphers; do for m in $macs; do

          23
          
for c in $ciphers; do for m in $macs; do

        

        

          24
          
	trace "proto 2 cipher $c mac $m"

          24
          
	trace "proto 2 cipher $c mac $m"

        



(-)openssh-6.0p1.orig/regress/try-ciphers.sh
      (-1 / +1 lines)




  

    
      
            Lines 9-15
          ciphers="aes128-cbc 3des-cbc blowfish-cb
      
      
        Link Here
      
    
  

        

          9
          
	aes128-ctr aes192-ctr aes256-ctr"

          9
          
	aes128-ctr aes192-ctr aes256-ctr"

        

        

          10
          
macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96"

          10
          
macs="hmac-sha1 hmac-md5 umac-64@openssh.com hmac-sha1-96 hmac-md5-96"

        

        

          11
          
config_defined HAVE_EVP_SHA256 &&

          11
          
config_defined HAVE_EVP_SHA256 &&

        

          
            

              12
              
    macs="$macs hmac-sha2-256 hmac-sha2-256-96 hmac-sha2-512 hmac-sha2-512-96"


              12
              
    macs="$macs hmac-sha2-256 hmac-sha2-512"

            

        

          13
          

          13
          

        

        

          14
          
for c in $ciphers; do

          14
          
for c in $ciphers; do

        

        

          15
          
	for m in $macs; do

          15
          
	for m in $macs; do

        



(-)openssh-6.0p1.orig/ssh_config.0
      (-2 / +1 lines)




  

    
      
            Lines 464-471
          DESCRIPTION
      
      
        Link Here
      
    
  

        

          464
          

          464
          

        

        

          465
          
                   hmac-md5,hmac-sha1,umac-64@openssh.com,

          465
          
                   hmac-md5,hmac-sha1,umac-64@openssh.com,

        

        

          466
          
                   hmac-ripemd160,hmac-sha1-96,hmac-md5-96,

          466
          
                   hmac-ripemd160,hmac-sha1-96,hmac-md5-96,

        

          
            

              467
              
                   hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,


              467
              
                   hmac-sha2-256,hmac-sha2-512

            

            

              468
              
                   hmac-sha2-512-96


              
              
            

        

          469
          

          468
          

        

        

          470
          
     NoHostAuthenticationForLocalhost

          469
          
     NoHostAuthenticationForLocalhost

        

        

          471
          
             This option can be used if the home directory is shared across

          470
          
             This option can be used if the home directory is shared across

        



(-)openssh-6.0p1.orig/ssh_config.5
      (-2 / +1 lines)




  

    
      
            Lines 794-801
          The default is:
      
      
        Link Here
      
    
  

        

          794
          
.Bd -literal -offset indent

          794
          
.Bd -literal -offset indent

        

        

          795
          
hmac-md5,hmac-sha1,umac-64@openssh.com,

          795
          
hmac-md5,hmac-sha1,umac-64@openssh.com,

        

        

          796
          
hmac-ripemd160,hmac-sha1-96,hmac-md5-96,

          796
          
hmac-ripemd160,hmac-sha1-96,hmac-md5-96,

        

          
            

              797
              
hmac-sha2-256,hmac-sha2-256-96,hmac-sha2-512,


              797
              
hmac-sha2-256,hmac-sha2-512

            

            

              798
              
hmac-sha2-512-96


              
              
            

        

          799
          
.Ed

          798
          
.Ed

        

        

          800
          
.It Cm NoHostAuthenticationForLocalhost

          799
          
.It Cm NoHostAuthenticationForLocalhost

        

        

          801
          
This option can be used if the home directory is shared across machines.

          800
          
This option can be used if the home directory is shared across machines.

        



(-)openssh-6.0p1.orig/sshd_config.0
      (-2 / +1 lines)




  

    
      
            Lines 377-384
          DESCRIPTION
      
      
        Link Here
      
    
  

        

          377
          

          377
          

        

        

          378
          
                   hmac-md5,hmac-sha1,umac-64@openssh.com,

          378
          
                   hmac-md5,hmac-sha1,umac-64@openssh.com,

        

        

          379
          
                   hmac-ripemd160,hmac-sha1-96,hmac-md5-96,

          379
          
                   hmac-ripemd160,hmac-sha1-96,hmac-md5-96,

        

          
            

              380
              
                   hmac-sha2-256,hmac-sha256-96,hmac-sha2-512,


              380
              
                   hmac-sha2-256,hmac-sha2-512

            

            

              381
              
                   hmac-sha2-512-96


              
              
            

        

          382
          

          381
          

        

        

          383
          
     Match   Introduces a conditional block.  If all of the criteria on the

          382
          
     Match   Introduces a conditional block.  If all of the criteria on the

        

        

          384
          
             Match line are satisfied, the keywords on the following lines

          383
          
             Match line are satisfied, the keywords on the following lines

        



(-)openssh-6.0p1.orig/sshd_config.5
      (-2 / +1 lines)




  

    
      
            Lines 656-663
          The default is:
      
      
        Link Here
      
    
  

        

          656
          
.Bd -literal -offset indent

          656
          
.Bd -literal -offset indent

        

        

          657
          
hmac-md5,hmac-sha1,umac-64@openssh.com,

          657
          
hmac-md5,hmac-sha1,umac-64@openssh.com,

        

        

          658
          
hmac-ripemd160,hmac-sha1-96,hmac-md5-96,

          658
          
hmac-ripemd160,hmac-sha1-96,hmac-md5-96,

        

          
            

              659
              
hmac-sha2-256,hmac-sha256-96,hmac-sha2-512,


              659
              
hmac-sha2-256,hmac-sha2-512

            

            

              660
              
hmac-sha2-512-96


              
              
            

        

          661
          
.Ed

          660
          
.Ed

        

        

          662
          
.It Cm Match

          661
          
.It Cm Match

        

        

          663
          
Introduces a conditional block.

          662
          
Introduces a conditional block.

        






  

  Return to bug 2023