[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.6 and 1.7

version 1.6, 2004/04/22 11:56:57 version 1.7, 2004/05/09 00:06:47
Line 38 
Line 38 
  */   */
   
 #include "includes.h"  #include "includes.h"
 #include "moduli.h"  
 #include "xmalloc.h"  #include "xmalloc.h"
 #include "log.h"  #include "log.h"
   
Line 91 
Line 90 
 #define SHIFT_MEGAWORD  (SHIFT_MEGABYTE-SHIFT_BYTE)  #define SHIFT_MEGAWORD  (SHIFT_MEGABYTE-SHIFT_BYTE)
   
 /*  /*
    * Using virtual memory can cause thrashing.  This should be the largest
    * number that is supported without a large amount of disk activity --
    * that would increase the run time from hours to days or weeks!
    */
   #define LARGE_MINIMUM   (8UL)   /* megabytes */
   
   /*
    * Do not increase this number beyond the unsigned integer bit size.
    * Due to a multiple of 4, it must be LESS than 128 (yielding 2**30 bits).
    */
   #define LARGE_MAXIMUM   (127UL) /* megabytes */
   
   /*
  * Constant: when used with 32-bit integers, the largest sieve prime   * Constant: when used with 32-bit integers, the largest sieve prime
  * has to be less than 2**32.   * has to be less than 2**32.
  */   */
Line 114 
Line 126 
  * Prime testing defines   * Prime testing defines
  */   */
   
   /* Minimum number of primality tests to perform */
   #define TRIAL_MINIMUM           (4)
   
 /*  /*
  * Sieving data (XXX - move to struct)   * Sieving data (XXX - move to struct)
  */   */
Line 235 
Line 250 
   
         largememory = memory;          largememory = memory;
   
           if (memory != 0 &&
              (memory < LARGE_MINIMUM || memory > LARGE_MAXIMUM)) {
                   error("Invalid memory amount (min %ld, max %ld)",
                       LARGE_MINIMUM, LARGE_MAXIMUM);
                   return (-1);
           }
   
         /*          /*
          * Set power to the length in bits of the prime to be generated.           * Set power to the length in bits of the prime to be generated.
          * This is changed to 1 less than the desired safe prime moduli p.           * This is changed to 1 less than the desired safe prime moduli p.
Line 430 
Line 452 
  * The result is a list of so-call "safe" primes   * The result is a list of so-call "safe" primes
  */   */
 int  int
 prime_test(FILE *in, FILE *out, u_int32_t trials,  prime_test(FILE *in, FILE *out, u_int32_t trials, u_int32_t generator_wanted)
     u_int32_t generator_wanted)  
 {  {
         BIGNUM *q, *p, *a;          BIGNUM *q, *p, *a;
         BN_CTX *ctx;          BN_CTX *ctx;
Line 440 
Line 461 
         u_int32_t generator_known, in_tests, in_tries, in_type, in_size;          u_int32_t generator_known, in_tests, in_tries, in_type, in_size;
         time_t time_start, time_stop;          time_t time_start, time_stop;
         int res;          int res;
   
           if (trials < TRIAL_MINIMUM) {
                   error("Minimum primality trials is %d", TRIAL_MINIMUM);
                   return (-1);
           }
   
         time(&time_start);          time(&time_start);
   

Legend:
Removed from v.1.6  
changed lines
  Added in v.1.7