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

Diff for /src/usr.bin/ssh/dh.c between version 1.29 and 1.29.2.1

version 1.29, 2004/02/27 22:49:27 version 1.29.2.1, 2004/08/19 04:13:26
Line 115 
Line 115 
   
         if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL &&          if ((f = fopen(_PATH_DH_MODULI, "r")) == NULL &&
             (f = fopen(_PATH_DH_PRIMES, "r")) == NULL) {              (f = fopen(_PATH_DH_PRIMES, "r")) == NULL) {
                 logit("WARNING: %s does not exist, using old modulus", _PATH_DH_MODULI);                  logit("WARNING: %s does not exist, using fixed modulus",
                 return (dh_new_group1());                      _PATH_DH_MODULI);
                   return (dh_new_group14());
         }          }
   
         linenum = 0;          linenum = 0;
Line 144 
Line 145 
         if (bestcount == 0) {          if (bestcount == 0) {
                 fclose(f);                  fclose(f);
                 logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES);                  logit("WARNING: no suitable primes in %s", _PATH_DH_PRIMES);
                 return (NULL);                  return (dh_new_group14());
         }          }
   
         linenum = 0;          linenum = 0;
Line 169 
Line 170 
         return (dh_new_group(dhg.g, dhg.p));          return (dh_new_group(dhg.g, dhg.p));
 }  }
   
 /* diffie-hellman-group1-sha1 */  /* diffie-hellman-groupN-sha1 */
   
 int  int
 dh_pub_is_valid(DH *dh, BIGNUM *dh_pub)  dh_pub_is_valid(DH *dh, BIGNUM *dh_pub)
Line 270 
Line 271 
             "FFFFFFFF" "FFFFFFFF";              "FFFFFFFF" "FFFFFFFF";
   
         return (dh_new_group_asc(gen, group1));          return (dh_new_group_asc(gen, group1));
   }
   
   DH *
   dh_new_group14(void)
   {
           static char *gen = "2", *group14 =
               "FFFFFFFF" "FFFFFFFF" "C90FDAA2" "2168C234" "C4C6628B" "80DC1CD1"
               "29024E08" "8A67CC74" "020BBEA6" "3B139B22" "514A0879" "8E3404DD"
               "EF9519B3" "CD3A431B" "302B0A6D" "F25F1437" "4FE1356D" "6D51C245"
               "E485B576" "625E7EC6" "F44C42E9" "A637ED6B" "0BFF5CB6" "F406B7ED"
               "EE386BFB" "5A899FA5" "AE9F2411" "7C4B1FE6" "49286651" "ECE45B3D"
               "C2007CB8" "A163BF05" "98DA4836" "1C55D39A" "69163FA8" "FD24CF5F"
               "83655D23" "DCA3AD96" "1C62F356" "208552BB" "9ED52907" "7096966D"
               "670C354E" "4ABC9804" "F1746C08" "CA18217C" "32905E46" "2E36CE3B"
               "E39E772C" "180E8603" "9B2783A2" "EC07A28F" "B5C55DF0" "6F4C52C9"
               "DE2BCBF6" "95581718" "3995497C" "EA956AE5" "15D22618" "98FA0510"
               "15728E5A" "8AACAA68" "FFFFFFFF" "FFFFFFFF";
   
           return (dh_new_group_asc(gen, group14));
 }  }
   
 /*  /*
Legend:
Removed from v.1.29  
changed lines
  Added in v.1.29.2.1