| servconf.c (226046) | servconf.c (231584) |
|---|---|
| 1/* $OpenBSD: servconf.c,v 1.222 2011/06/22 21:57:01 djm Exp $ */ | 1/* $OpenBSD: servconf.c,v 1.222 2011/06/22 21:57:01 djm Exp $ */ |
| 2/* $FreeBSD: head/crypto/openssh/servconf.c 226046 2011-10-05 22:08:17Z des $ */ | 2/* $FreeBSD: head/crypto/openssh/servconf.c 231584 2012-02-13 11:59:59Z ed $ */ |
| 3/* 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 5 * All rights reserved 6 * 7 * As far as I am concerned, the code I have written for this software 8 * can be used freely for any purpose. Any derived versions of this 9 * software must be clearly marked as such, and if the derived work is 10 * incompatible with the protocol description in the RFC file, it must be 11 * called by a name other than "ssh" or "Secure Shell". 12 */ 13 14#include "includes.h" | 3/* 4 * Copyright (c) 1995 Tatu Ylonen <ylo@cs.hut.fi>, Espoo, Finland 5 * All rights reserved 6 * 7 * As far as I am concerned, the code I have written for this software 8 * can be used freely for any purpose. Any derived versions of this 9 * software must be clearly marked as such, and if the derived work is 10 * incompatible with the protocol description in the RFC file, it must be 11 * called by a name other than "ssh" or "Secure Shell". 12 */ 13 14#include "includes.h" |
| 15__RCSID("$FreeBSD: head/crypto/openssh/servconf.c 226046 2011-10-05 22:08:17Z des $"); | 15__RCSID("$FreeBSD: head/crypto/openssh/servconf.c 231584 2012-02-13 11:59:59Z ed $"); |
| 16 17#include <sys/types.h> 18#include <sys/socket.h> 19 20#include <netinet/in.h> 21#include <netinet/in_systm.h> 22#include <netinet/ip.h> 23 --- 137 unchanged lines hidden (view full) --- 161 options->protocol = SSH_PROTO_2; 162 if (options->num_host_key_files == 0) { 163 /* fill default hostkeys for protocols */ 164 if (options->protocol & SSH_PROTO_1) 165 options->host_key_files[options->num_host_key_files++] = 166 _PATH_HOST_KEY_FILE; 167 if (options->protocol & SSH_PROTO_2) { 168 options->host_key_files[options->num_host_key_files++] = | 16 17#include <sys/types.h> 18#include <sys/socket.h> 19 20#include <netinet/in.h> 21#include <netinet/in_systm.h> 22#include <netinet/ip.h> 23 --- 137 unchanged lines hidden (view full) --- 161 options->protocol = SSH_PROTO_2; 162 if (options->num_host_key_files == 0) { 163 /* fill default hostkeys for protocols */ 164 if (options->protocol & SSH_PROTO_1) 165 options->host_key_files[options->num_host_key_files++] = 166 _PATH_HOST_KEY_FILE; 167 if (options->protocol & SSH_PROTO_2) { 168 options->host_key_files[options->num_host_key_files++] = |
| 169 _PATH_HOST_RSA_KEY_FILE; | 169 _PATH_HOST_RSA_KEY_FILE; |
| 170 options->host_key_files[options->num_host_key_files++] = 171 _PATH_HOST_DSA_KEY_FILE; 172#ifdef OPENSSL_HAS_ECC 173 options->host_key_files[options->num_host_key_files++] = 174 _PATH_HOST_ECDSA_KEY_FILE; 175#endif 176 } 177 } --- 103 unchanged lines hidden (view full) --- 281 if (options->permit_tun == -1) 282 options->permit_tun = SSH_TUNMODE_NO; 283 if (options->zero_knowledge_password_authentication == -1) 284 options->zero_knowledge_password_authentication = 0; 285 if (options->ip_qos_interactive == -1) 286 options->ip_qos_interactive = IPTOS_LOWDELAY; 287 if (options->ip_qos_bulk == -1) 288 options->ip_qos_bulk = IPTOS_THROUGHPUT; | 170 options->host_key_files[options->num_host_key_files++] = 171 _PATH_HOST_DSA_KEY_FILE; 172#ifdef OPENSSL_HAS_ECC 173 options->host_key_files[options->num_host_key_files++] = 174 _PATH_HOST_ECDSA_KEY_FILE; 175#endif 176 } 177 } --- 103 unchanged lines hidden (view full) --- 281 if (options->permit_tun == -1) 282 options->permit_tun = SSH_TUNMODE_NO; 283 if (options->zero_knowledge_password_authentication == -1) 284 options->zero_knowledge_password_authentication = 0; 285 if (options->ip_qos_interactive == -1) 286 options->ip_qos_interactive = IPTOS_LOWDELAY; 287 if (options->ip_qos_bulk == -1) 288 options->ip_qos_bulk = IPTOS_THROUGHPUT; |
| 289 if (options->hpn_disabled == -1) | 289 if (options->hpn_disabled == -1) |
| 290 options->hpn_disabled = 0; 291 if (options->hpn_buffer_size == -1) { 292 /* 293 * HPN buffer size option not explicitly set. Try to figure 294 * out what value to use or resort to default. 295 */ 296 options->hpn_buffer_size = CHAN_SES_WINDOW_DEFAULT; 297 if (!options->hpn_disabled) { --- 1578 unchanged lines hidden --- | 290 options->hpn_disabled = 0; 291 if (options->hpn_buffer_size == -1) { 292 /* 293 * HPN buffer size option not explicitly set. Try to figure 294 * out what value to use or resort to default. 295 */ 296 options->hpn_buffer_size = CHAN_SES_WINDOW_DEFAULT; 297 if (!options->hpn_disabled) { --- 1578 unchanged lines hidden --- |