Move back memxor module.

diff --git a/ChangeLog b/ChangeLog
index 0cd0333e9ea2e66421c5089b59f963cc0efa9bf8..60c2d1523773f1cee5b12c2c65a6206907f785f1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-04-03  Simon Josefsson  <simon@josefsson.org>
 
+       * modules/memxor: Move back from crypto/, suggested by Bruno.
+       * modules/crypto/hmac-sha1: Fix memxor dependency.
+
        * modules/crypto/gc: Moved from ../.
 
 2007-04-02  Eric Blake  <ebb9@byu.net>

diff --git a/NEWS b/NEWS
index dbc6422042b5c1a1ffc8018cb47a68f597aaa0d9..ec36c0ae3314a9749be24d7116a4875d53c96e41 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -27,7 +27,6 @@ Date        Modules         Changes
             md2             Renamed to crypto/md2.
             md4             Renamed to crypto/md4.
             md5             Renamed to crypto/md5.
-            memxor          Renamed to crypto/memxor.
             rijndael        Renamed to crypto/rijndael.
             sha1            Renamed to crypto/sha1.
 

diff --git a/modules/crypto/hmac-sha1 b/modules/crypto/hmac-sha1
index f7a4c8340269c9d1af81ece1ac917c6c0b33ae8a..6bdc486400bd60cecf5ec16494297927dc4bb31c 100644 (file)
--- a/modules/crypto/hmac-sha1
+++ b/modules/crypto/hmac-sha1
@@ -7,7 +7,7 @@ lib/hmac-sha1.c
 m4/hmac-sha1.m4
 
 Depends-on:
-crypto/memxor
+memxor
 crypto/sha1
 
 configure.ac:

diff --git a/modules/crypto/memxor b/modules/crypto/memxor
deleted file mode 100644 (file)
index 2fdcb3e..0000000
--- a/modules/crypto/memxor
+++ /dev/null
@@ -1,23 +0,0 @@
-Description:
-memxor() function: binary exclusive or operation on two memory blocks
-
-Files:
-lib/memxor.h
-lib/memxor.c
-m4/memxor.m4
-
-Depends-on:
-
-configure.ac:
-gl_MEMXOR
-
-Makefile.am:
-
-Include:
-"memxor.h"
-
-License:
-LGPL
-
-Maintainer:
-Simon Josefsson

diff --git a/modules/memxor b/modules/memxor
new file mode 100644 (file)
index 0000000..2fdcb3e
--- /dev/null
+++ b/modules/memxor
@@ -0,0 +1,23 @@
+Description:
+memxor() function: binary exclusive or operation on two memory blocks
+
+Files:
+lib/memxor.h
+lib/memxor.c
+m4/memxor.m4
+
+Depends-on:
+
+configure.ac:
+gl_MEMXOR
+
+Makefile.am:
+
+Include:
+"memxor.h"
+
+License:
+LGPL
+
+Maintainer:
+Simon Josefsson