2 files changed, 14 insertions, 7 deletions

diff --git a/ChangeLog b/ChangeLog
index 14112df26..3457022c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+20050502
+ - (dtucker) OpenBSD CVS Sync
+   - djm@cvs.openbsd.org 2004/04/22 11:56:57
+     [moduli.c]
+     Bugzilla #850: Sophie Germain is the correct name of the French
+     mathematician, "Sophie Germaine" isn't; from Luc.Maisonobe@c-s.fr
+
 20040423
  - (dtucker) [configure.ac openbsd-compat/getrrsetbyname.c] Declare h_errno
    as extern int if not already declared.  Fixes compile errors on old SCO
@@ -1038,4 +1045,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.3332 2004/04/23 08:57:13 dtucker Exp $
+$Id: ChangeLog,v 1.3333 2004/05/02 12:09:00 dtucker Exp $
diff --git a/moduli.c b/moduli.c
index a09073aed..d454c30dc 100644
--- a/moduli.c
+++ b/moduli.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: moduli.c,v 1.5 2003/12/22 09:16:57 djm Exp $ */
+/* $OpenBSD: moduli.c,v 1.6 2004/04/22 11:56:57 djm Exp $ */
 /*
  * Copyright 1994 Phil Karn <karn@qualcomm.com>
  * Copyright 1996-1998, 2003 William Allen Simpson <wsimpson@greendragon.com>
@@ -58,7 +58,7 @@
 #define QTYPE_UNSTRUCTURED      (1)
 #define QTYPE_SAFE              (2)
 #define QTYPE_SCHNOOR           (3)
-#define QTYPE_SOPHIE_GERMAINE   (4)
+#define QTYPE_SOPHIE_GERMAIN    (4)
 #define QTYPE_STRONG            (5)
 
 /* Tests: decimal (bit field).
@@ -219,7 +219,7 @@ sieve_large(u_int32_t s)
 }
 
 /*
- * list candidates for Sophie-Germaine primes (where q = (p-1)/2)
+ * list candidates for Sophie-Germain primes (where q = (p-1)/2)
  * to standard output.
  * The list is checked against small known primes (less than 2**30).
  */
@@ -403,7 +403,7 @@ gen_candidates(FILE *out, int memory, int power, BIGNUM *start)
                 debug2("test q = largebase+%u", 2 * j);
                 BN_set_word(q, 2 * j);
                 BN_add(q, q, largebase);
-                if (qfileout(out, QTYPE_SOPHIE_GERMAINE, QTEST_SIEVE,
+                if (qfileout(out, QTYPE_SOPHIE_GERMAIN, QTEST_SIEVE,
                     largetries, (power - 1) /* MSB */, (0), q) == -1) {
                         ret = -1;
                         break;
@@ -490,8 +490,8 @@ prime_test(FILE *in, FILE *out, u_int32_t trials,
 
                 /* modulus (hex) */
                 switch (in_type) {
-                case QTYPE_SOPHIE_GERMAINE:
-                        debug2("%10u: (%u) Sophie-Germaine", count_in, in_type);
+                case QTYPE_SOPHIE_GERMAIN:
+                        debug2("%10u: (%u) Sophie-Germain", count_in, in_type);
                         a = q;
                         BN_hex2bn(&a, cp);
                         /* p = 2*q + 1 */