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

Diff for /src/usr.bin/ssh/kexgexs.c between version 1.29 and 1.30

version 1.29, 2016/06/08 02:13:01 version 1.30, 2016/09/12 01:22:38
Line 24 
Line 24 
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.   * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */   */
   
 #include <sys/param.h>  /* MIN MAX */  
   
 #include <stdio.h>  #include <stdio.h>
 #include <string.h>  #include <string.h>
Line 48 
Line 47 
 #include "dispatch.h"  #include "dispatch.h"
 #include "ssherr.h"  #include "ssherr.h"
 #include "sshbuf.h"  #include "sshbuf.h"
   #include "misc.h"
   
 static int input_kex_dh_gex_request(int, u_int32_t, void *);  static int input_kex_dh_gex_request(int, u_int32_t, void *);
 static int input_kex_dh_gex_init(int, u_int32_t, void *);  static int input_kex_dh_gex_init(int, u_int32_t, void *);
Line 78 
Line 78 
         kex->nbits = nbits;          kex->nbits = nbits;
         kex->min = min;          kex->min = min;
         kex->max = max;          kex->max = max;
         min = MAX(DH_GRP_MIN, min);          min = MAXIMUM(DH_GRP_MIN, min);
         max = MIN(DH_GRP_MAX, max);          max = MINIMUM(DH_GRP_MAX, max);
         nbits = MAX(DH_GRP_MIN, nbits);          nbits = MAXIMUM(DH_GRP_MIN, nbits);
         nbits = MIN(DH_GRP_MAX, nbits);          nbits = MINIMUM(DH_GRP_MAX, nbits);
   
         if (kex->max < kex->min || kex->nbits < kex->min ||          if (kex->max < kex->min || kex->nbits < kex->min ||
             kex->max < kex->nbits || kex->max < DH_GRP_MIN) {              kex->max < kex->nbits || kex->max < DH_GRP_MIN) {

Legend:
Removed from v.1.29  
changed lines
  Added in v.1.30