Move some entries from ChangeLog.0_9_7-stable_not-in-head

to ChangeLog.0_9_7-stable_not-in-head_FIPS.

diff --git a/ChangeLog.0_9_7-stable_not-in-head b/ChangeLog.0_9_7-stable_not-in-head
index 3b6b29ed0c56b4e8aff152b768259d4072d4dba3..515eb1b9818d9e028c6781a41e8d7b458979697c 100644 (file)
--- a/ChangeLog.0_9_7-stable_not-in-head
+++ b/ChangeLog.0_9_7-stable_not-in-head
@@ -133,14 +133,6 @@ be added to the end of this file.
 
        Whoops, forgot FIPS DES, also add EVPs for DES CFB1 and 8.
 
-2003-07-31 23:30  levitte
-
-       Changed:
-               Makefile.org (1.154.2.71), "Exp", lines: +2 -0
-
-       If FDIRS is to be treated like SDIRS, let's not forget to
-       initialize it in Makefile.org.
-
 2003-08-01 12:25  ben
 
        Changed:
@@ -170,36 +162,6 @@ be added to the end of this file.
 
        Blow up in people's faces if they don't reseed.
 
-2004-06-21 20:05  levitte
-
-       Changed:
-               Makefile.org (1.154.2.82), "Exp", lines: +3 -1
-
-       Standard sh doesn't tolerate ! as part of the conditional command.
-
-               PR: 900
-
-2004-08-02 16:15  levitte [FIPS]
-
-       Changed:
-               crypto/cryptlib.c (1.32.2.13), "Exp", lines: +4 -4
-
-       Let's lock a write lock when changing values, shall we?
-
-               Thanks to Dr Stephen Henson <shenson@drh-consultancy.co.uk>
-       for making me aware of this error.
-
-2005-03-15 10:46  appro [FIPS]
-
-       Changed:
-               Makefile.org (1.154.2.96), "Exp", lines: +1 -1
-               crypto/Makefile (1.1.4.6), "Exp", lines: +2 -3
-               fips/Makefile (1.1.4.8), "Exp", lines: +4 -1
-
-       Real Bourne shell doesn't accept ! as in "if ! grep ..." Fix this
-       in crypto/Makefile and make Makefile.org and fips/Makefile more
-       discreet.
-
 2005-04-19 16:21  appro
 
        Changed:

diff --git a/ChangeLog.0_9_7-stable_not-in-head_FIPS b/ChangeLog.0_9_7-stable_not-in-head_FIPS
index fa3b3f630cbd691bc25a5df309d57f60eda6c7de..d7e4ed943914ea7a4c5352c462772fcd99bc5298 100644 (file)
--- a/ChangeLog.0_9_7-stable_not-in-head_FIPS
+++ b/ChangeLog.0_9_7-stable_not-in-head_FIPS
@@ -141,6 +141,14 @@ This is the "FIPS"-related part.
 
        Missing files.
 
+2003-07-31 23:30  levitte
+
+       Changed:
+               Makefile.org (1.154.2.71), "Exp", lines: +2 -0
+
+       If FDIRS is to be treated like SDIRS, let's not forget to
+       initialize it in Makefile.org.
+
 2003-07-31 23:41  levitte
 
        Changed:
@@ -746,6 +754,15 @@ This is the "FIPS"-related part.
 
                PR: 900
 
+2004-06-21 20:05  levitte
+
+       Changed:
+               Makefile.org (1.154.2.82), "Exp", lines: +3 -1
+
+       Standard sh doesn't tolerate ! as part of the conditional command.
+
+               PR: 900
+
 2004-06-28 22:33  levitte
 
        Changed:
@@ -911,6 +928,16 @@ This is the "FIPS"-related part.
        rebuilt to use FIPS functionality will need to be recompiled in any
        case, thus not being a problem either.
 
+2004-08-02 16:15  levitte
+
+       Changed:
+               crypto/cryptlib.c (1.32.2.13), "Exp", lines: +4 -4
+
+       Let's lock a write lock when changing values, shall we?
+
+               Thanks to Dr Stephen Henson <shenson@drh-consultancy.co.uk>
+       for making me aware of this error.
+
 2004-08-05 20:11  steve
 
        Changed:
@@ -1240,6 +1267,17 @@ This is the "FIPS"-related part.
 
        In FIPS mode use SHA1 as default digest in x509 and req utilities.
 
+2005-03-15 10:46  appro
+
+       Changed:
+               Makefile.org (1.154.2.96), "Exp", lines: +1 -1
+               crypto/Makefile (1.1.4.6), "Exp", lines: +2 -3
+               fips/Makefile (1.1.4.8), "Exp", lines: +4 -1
+
+       Real Bourne shell doesn't accept ! as in "if ! grep ..." Fix this
+       in crypto/Makefile and make Makefile.org and fips/Makefile more
+       discreet.
+
 2005-03-22 18:29  steve
 
        Changed: