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

Diff for /src/usr.bin/ssh/moduli.c between version 1.10.2.1 and 1.11

version 1.10.2.1, 2005/09/04 18:40:02 version 1.11, 2005/05/23 22:44:01
Line 112 
Line 112 
 #define TINY_NUMBER     (1UL<<16)  #define TINY_NUMBER     (1UL<<16)
   
 /* Ensure enough bit space for testing 2*q. */  /* Ensure enough bit space for testing 2*q. */
 #define TEST_MAXIMUM    (1UL<<16)  #define TEST_MAXIMUM    (1UL<<16)
 #define TEST_MINIMUM    (QSIZE_MINIMUM + 1)  #define TEST_MINIMUM    (QSIZE_MINIMUM + 1)
 /* real TEST_MINIMUM    (1UL << (SHIFT_WORD - TEST_POWER)) */  /* real TEST_MINIMUM    (1UL << (SHIFT_WORD - TEST_POWER)) */
 #define TEST_POWER      (3)     /* 2**n, n < SHIFT_WORD */  #define TEST_POWER      (3)     /* 2**n, n < SHIFT_WORD */
   
 /* bit operations on 32-bit words */  /* bit operations on 32-bit words */
 #define BIT_CLEAR(a,n)  ((a)[(n)>>SHIFT_WORD] &= ~(1L << ((n) & 31)))  #define BIT_CLEAR(a,n)  ((a)[(n)>>SHIFT_WORD] &= ~(1L << ((n) & 31)))
 #define BIT_SET(a,n)    ((a)[(n)>>SHIFT_WORD] |= (1L << ((n) & 31)))  #define BIT_SET(a,n)    ((a)[(n)>>SHIFT_WORD] |= (1L << ((n) & 31)))
 #define BIT_TEST(a,n)   ((a)[(n)>>SHIFT_WORD] & (1L << ((n) & 31)))  #define BIT_TEST(a,n)   ((a)[(n)>>SHIFT_WORD] & (1L << ((n) & 31)))
   
 /*  /*
  * Prime testing defines   * Prime testing defines
  */   */
   
 /* Minimum number of primality tests to perform */  /* Minimum number of primality tests to perform */
 #define TRIAL_MINIMUM   (4)  #define TRIAL_MINIMUM           (4)
   
 /*  /*
  * Sieving data (XXX - move to struct)   * Sieving data (XXX - move to struct)
Line 254 
Line 254 
         largememory = memory;          largememory = memory;
   
         if (memory != 0 &&          if (memory != 0 &&
             (memory < LARGE_MINIMUM || memory > LARGE_MAXIMUM)) {             (memory < LARGE_MINIMUM || memory > LARGE_MAXIMUM)) {
                 error("Invalid memory amount (min %ld, max %ld)",                  error("Invalid memory amount (min %ld, max %ld)",
                     LARGE_MINIMUM, LARGE_MAXIMUM);                      LARGE_MINIMUM, LARGE_MAXIMUM);
                 return (-1);                  return (-1);
Line 372 
Line 372 
          * fencepost errors, the last pass is skipped.           * fencepost errors, the last pass is skipped.
          */           */
         for (smallbase = TINY_NUMBER + 3;          for (smallbase = TINY_NUMBER + 3;
             smallbase < (SMALL_MAXIMUM - TINY_NUMBER);               smallbase < (SMALL_MAXIMUM - TINY_NUMBER);
             smallbase += TINY_NUMBER) {               smallbase += TINY_NUMBER) {
                 for (i = 0; i < tinybits; i++) {                  for (i = 0; i < tinybits; i++) {
                         if (BIT_TEST(TinySieve, i))                          if (BIT_TEST(TinySieve, i))
                                 continue; /* 2*i+3 is composite */                                  continue; /* 2*i+3 is composite */
Legend:
Removed from v.1.10.2.1  
changed lines
  Added in v.1.11