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

(-)a/dns.c (+5 lines)
Lines 96-101 dns_read_key(u_int8_t *algorithm, u_int8_t *digest_type, Link Here
96 
		if (!*digest_type)
 96 
		if (!*digest_type)
97 
			*digest_type = SSHFP_HASH_SHA256;
 97 
			*digest_type = SSHFP_HASH_SHA256;
98 
		break;
 98 
		break;
99 
	case KEY_ED25519:
100 
		*algorithm = SSHFP_KEY_ED25519;
101 
		if (!*digest_type)
102 
			*digest_type = SSHFP_HASH_SHA256;
103 
		break;
99 
	default:
 104 
	default:
100 
		*algorithm = SSHFP_KEY_RESERVED; /* 0 */
 105 
		*algorithm = SSHFP_KEY_RESERVED; /* 0 */
101 
		*digest_type = SSHFP_HASH_RESERVED; /* 0 */
 106 
		*digest_type = SSHFP_HASH_RESERVED; /* 0 */
(-)a/dns.h (-1 / +2 lines)
Lines 32-38 enum sshfp_types { Link Here
32 
	SSHFP_KEY_RESERVED = 0,
 32 
	SSHFP_KEY_RESERVED = 0,
33 
	SSHFP_KEY_RSA = 1,
 33 
	SSHFP_KEY_RSA = 1,
34 
	SSHFP_KEY_DSA = 2,
 34 
	SSHFP_KEY_DSA = 2,
35 
	SSHFP_KEY_ECDSA = 3
 35 
	SSHFP_KEY_ECDSA = 3,
36 
	SSHFP_KEY_ED25519 = 4
36 
};
 37 
};
37 

          38
          

        

        

          38
          
enum sshfp_hashes {

          39
          
enum sshfp_hashes {

        



(-)a/ssh-keygen.c
      (+2 lines)




  

    
      
            Lines 2519-2524
          main(int argc, char **argv)
      
      
        Link Here
      
    
  

        

          2519
          
			    _PATH_HOST_DSA_KEY_FILE, rr_hostname);

          2519
          
			    _PATH_HOST_DSA_KEY_FILE, rr_hostname);

        

        

          2520
          
			n += do_print_resource_record(pw,

          2520
          
			n += do_print_resource_record(pw,

        

        

          2521
          
			    _PATH_HOST_ECDSA_KEY_FILE, rr_hostname);

          2521
          
			    _PATH_HOST_ECDSA_KEY_FILE, rr_hostname);

        

            

              
              
              2522
              
			n += do_print_resource_record(pw,

            

            

              2523
              
			    _PATH_HOST_ED25519_KEY_FILE, rr_hostname);

            

        

          2522
          

          2524
          

        

        

          2523
          
			if (n == 0)

          2525
          
			if (n == 0)

        

        

          2524
          
				fatal("no keys found.");

          2526
          
				fatal("no keys found.");

        






  

  Return to bug 2197