From 0527d3651d8b32bc93e0250d9181b9d74ab5f5b2 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Sun, 1 Apr 2007 08:38:41 +0000
Subject: [PATCH] Move crypto modules to crypto/.

---
 ChangeLog                                 | 47 +++++++++++++++++++++++
 modules/{ => crypto}/arcfour              |  0
 modules/{ => crypto}/arcfour-tests        |  0
 modules/{ => crypto}/arctwo               |  0
 modules/{ => crypto}/arctwo-tests         |  0
 modules/{ => crypto}/des                  |  0
 modules/{ => crypto}/des-tests            |  0
 modules/{ => crypto}/gc-arcfour           |  2 +-
 modules/{ => crypto}/gc-arcfour-tests     |  0
 modules/{ => crypto}/gc-arctwo            |  2 +-
 modules/{ => crypto}/gc-arctwo-tests      |  0
 modules/{ => crypto}/gc-des               |  2 +-
 modules/{ => crypto}/gc-des-tests         |  0
 modules/{ => crypto}/gc-hmac-md5          |  2 +-
 modules/{ => crypto}/gc-hmac-md5-tests    |  0
 modules/{ => crypto}/gc-hmac-sha1         |  2 +-
 modules/{ => crypto}/gc-hmac-sha1-tests   |  0
 modules/{ => crypto}/gc-md2               |  4 +-
 modules/{ => crypto}/gc-md2-tests         |  0
 modules/{ => crypto}/gc-md4               |  2 +-
 modules/{ => crypto}/gc-md4-tests         |  0
 modules/{ => crypto}/gc-md5               |  2 +-
 modules/{ => crypto}/gc-md5-tests         |  0
 modules/{ => crypto}/gc-pbkdf2-sha1       |  4 +-
 modules/{ => crypto}/gc-pbkdf2-sha1-tests |  0
 modules/{ => crypto}/gc-random            |  2 +-
 modules/{ => crypto}/gc-rijndael          |  2 +-
 modules/{ => crypto}/gc-rijndael-tests    |  0
 modules/{ => crypto}/gc-sha1              |  2 +-
 modules/{ => crypto}/gc-sha1-tests        |  0
 modules/{ => crypto}/gc-tests             |  0
 modules/{ => crypto}/hmac-md5             |  2 +-
 modules/{ => crypto}/hmac-md5-tests       |  0
 modules/{ => crypto}/hmac-sha1            |  4 +-
 modules/{ => crypto}/hmac-sha1-tests      |  0
 modules/{ => crypto}/md2                  |  0
 modules/{ => crypto}/md2-tests            |  0
 modules/{ => crypto}/md4                  |  0
 modules/{ => crypto}/md4-tests            |  0
 modules/{ => crypto}/md5                  |  0
 modules/{ => crypto}/md5-tests            |  0
 modules/{ => crypto}/memxor               |  0
 modules/{ => crypto}/rijndael             |  0
 modules/{ => crypto}/rijndael-tests       |  0
 modules/{ => crypto}/sha1                 |  0
 45 files changed, 64 insertions(+), 17 deletions(-)
 rename modules/{ => crypto}/arcfour (100%)
 rename modules/{ => crypto}/arcfour-tests (100%)
 rename modules/{ => crypto}/arctwo (100%)
 rename modules/{ => crypto}/arctwo-tests (100%)
 rename modules/{ => crypto}/des (100%)
 rename modules/{ => crypto}/des-tests (100%)
 rename modules/{ => crypto}/gc-arcfour (96%)
 rename modules/{ => crypto}/gc-arcfour-tests (100%)
 rename modules/{ => crypto}/gc-arctwo (96%)
 rename modules/{ => crypto}/gc-arctwo-tests (100%)
 rename modules/{ => crypto}/gc-des (96%)
 rename modules/{ => crypto}/gc-des-tests (100%)
 rename modules/{ => crypto}/gc-hmac-md5 (97%)
 rename modules/{ => crypto}/gc-hmac-md5-tests (100%)
 rename modules/{ => crypto}/gc-hmac-sha1 (97%)
 rename modules/{ => crypto}/gc-hmac-sha1-tests (100%)
 rename modules/{ => crypto}/gc-md2 (91%)
 rename modules/{ => crypto}/gc-md2-tests (100%)
 rename modules/{ => crypto}/gc-md4 (96%)
 rename modules/{ => crypto}/gc-md4-tests (100%)
 rename modules/{ => crypto}/gc-md5 (96%)
 rename modules/{ => crypto}/gc-md5-tests (100%)
 rename modules/{ => crypto}/gc-pbkdf2-sha1 (89%)
 rename modules/{ => crypto}/gc-pbkdf2-sha1-tests (100%)
 rename modules/{ => crypto}/gc-random (95%)
 rename modules/{ => crypto}/gc-rijndael (97%)
 rename modules/{ => crypto}/gc-rijndael-tests (100%)
 rename modules/{ => crypto}/gc-sha1 (96%)
 rename modules/{ => crypto}/gc-sha1-tests (100%)
 rename modules/{ => crypto}/gc-tests (100%)
 rename modules/{ => crypto}/hmac-md5 (95%)
 rename modules/{ => crypto}/hmac-md5-tests (100%)
 rename modules/{ => crypto}/hmac-sha1 (90%)
 rename modules/{ => crypto}/hmac-sha1-tests (100%)
 rename modules/{ => crypto}/md2 (100%)
 rename modules/{ => crypto}/md2-tests (100%)
 rename modules/{ => crypto}/md4 (100%)
 rename modules/{ => crypto}/md4-tests (100%)
 rename modules/{ => crypto}/md5 (100%)
 rename modules/{ => crypto}/md5-tests (100%)
 rename modules/{ => crypto}/memxor (100%)
 rename modules/{ => crypto}/rijndael (100%)
 rename modules/{ => crypto}/rijndael-tests (100%)
 rename modules/{ => crypto}/sha1 (100%)

diff --git a/ChangeLog b/ChangeLog
index d469ba8fe7..6012027761 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,50 @@
+2007-04-01  Simon Josefsson  <simon@josefsson.org>
+
+	* modules/crypto/arcfour: Moved from ../.
+	* modules/crypto/arcfour-tests: Moved from ../.
+	* modules/crypto/arctwo: Moved from ../.
+	* modules/crypto/arctwo-tests: Moved from ../.
+	* modules/crypto/des: Moved from ../.
+	* modules/crypto/des-tests: Moved from ../.
+	* modules/crypto/gc-arcfour: Moved from ../.
+	* modules/crypto/gc-arcfour-tests: Moved from ../.
+	* modules/crypto/gc-arctwo: Moved from ../.
+	* modules/crypto/gc-arctwo-tests: Moved from ../.
+	* modules/crypto/gc-des: Moved from ../.
+	* modules/crypto/gc-des-tests: Moved from ../.
+	* modules/crypto/gc-hmac-md5: Moved from ../.
+	* modules/crypto/gc-hmac-md5-tests: Moved from ../.
+	* modules/crypto/gc-hmac-sha1: Moved from ../.
+	* modules/crypto/gc-hmac-sha1-tests: Moved from ../.
+	* modules/crypto/gc-md2: Moved from ../.
+	* modules/crypto/gc-md2-tests: Moved from ../.
+	* modules/crypto/gc-md4: Moved from ../.
+	* modules/crypto/gc-md4-tests: Moved from ../.
+	* modules/crypto/gc-md5: Moved from ../.
+	* modules/crypto/gc-md5-tests: Moved from ../.
+	* modules/crypto/gc-pbkdf2-sha1: Moved from ../.
+	* modules/crypto/gc-pbkdf2-sha1-tests: Moved from ../.
+	* modules/crypto/gc-random: Moved from ../.
+	* modules/crypto/gc-rijndael: Moved from ../.
+	* modules/crypto/gc-rijndael-tests: Moved from ../.
+	* modules/crypto/gc-sha1: Moved from ../.
+	* modules/crypto/gc-sha1-tests: Moved from ../.
+	* modules/crypto/gc-tests: Moved from ../.
+	* modules/crypto/hmac-md5: Moved from ../.
+	* modules/crypto/hmac-md5-tests: Moved from ../.
+	* modules/crypto/hmac-sha1: Moved from ../.
+	* modules/crypto/hmac-sha1-tests: Moved from ../.
+	* modules/crypto/md2: Moved from ../.
+	* modules/crypto/md2-tests: Moved from ../.
+	* modules/crypto/md4: Moved from ../.
+	* modules/crypto/md4-tests: Moved from ../.
+	* modules/crypto/md5: Moved from ../.
+	* modules/crypto/md5-tests: Moved from ../.
+	* modules/crypto/memxor: Moved from ../.
+	* modules/crypto/rijndael: Moved from ../.
+	* modules/crypto/rijndael-tests: Moved from ../.
+	* modules/crypto/sha1: Moved from ../.
+
 2007-03-30  James Youngman  <jay@gnu.org>
 
 	* tests/test-stat-time.c (prepare_test): use chmod() rather than
diff --git a/modules/arcfour b/modules/crypto/arcfour
similarity index 100%
rename from modules/arcfour
rename to modules/crypto/arcfour
diff --git a/modules/arcfour-tests b/modules/crypto/arcfour-tests
similarity index 100%
rename from modules/arcfour-tests
rename to modules/crypto/arcfour-tests
diff --git a/modules/arctwo b/modules/crypto/arctwo
similarity index 100%
rename from modules/arctwo
rename to modules/crypto/arctwo
diff --git a/modules/arctwo-tests b/modules/crypto/arctwo-tests
similarity index 100%
rename from modules/arctwo-tests
rename to modules/crypto/arctwo-tests
diff --git a/modules/des b/modules/crypto/des
similarity index 100%
rename from modules/des
rename to modules/crypto/des
diff --git a/modules/des-tests b/modules/crypto/des-tests
similarity index 100%
rename from modules/des-tests
rename to modules/crypto/des-tests
diff --git a/modules/gc-arcfour b/modules/crypto/gc-arcfour
similarity index 96%
rename from modules/gc-arcfour
rename to modules/crypto/gc-arcfour
index 64136e36c1..8c7f1fe693 100644
--- a/modules/gc-arcfour
+++ b/modules/crypto/gc-arcfour
@@ -9,7 +9,7 @@ m4/arcfour.m4
 
 Depends-on:
 stdint
-gc
+crypto/gc
 
 configure.ac:
 gl_GC_ARCFOUR
diff --git a/modules/gc-arcfour-tests b/modules/crypto/gc-arcfour-tests
similarity index 100%
rename from modules/gc-arcfour-tests
rename to modules/crypto/gc-arcfour-tests
diff --git a/modules/gc-arctwo b/modules/crypto/gc-arctwo
similarity index 96%
rename from modules/gc-arctwo
rename to modules/crypto/gc-arctwo
index 1c764392bf..412ad6ccbc 100644
--- a/modules/gc-arctwo
+++ b/modules/crypto/gc-arctwo
@@ -9,7 +9,7 @@ m4/arctwo.m4
 
 Depends-on:
 stdint
-gc
+crypto/gc
 
 configure.ac:
 gl_GC_ARCTWO
diff --git a/modules/gc-arctwo-tests b/modules/crypto/gc-arctwo-tests
similarity index 100%
rename from modules/gc-arctwo-tests
rename to modules/crypto/gc-arctwo-tests
diff --git a/modules/gc-des b/modules/crypto/gc-des
similarity index 96%
rename from modules/gc-des
rename to modules/crypto/gc-des
index 49c3983540..1a2be0ed68 100644
--- a/modules/gc-des
+++ b/modules/crypto/gc-des
@@ -10,7 +10,7 @@ m4/des.m4
 Depends-on:
 stdint
 stdbool
-gc
+crypto/gc
 
 configure.ac:
 gl_GC_DES
diff --git a/modules/gc-des-tests b/modules/crypto/gc-des-tests
similarity index 100%
rename from modules/gc-des-tests
rename to modules/crypto/gc-des-tests
diff --git a/modules/gc-hmac-md5 b/modules/crypto/gc-hmac-md5
similarity index 97%
rename from modules/gc-hmac-md5
rename to modules/crypto/gc-hmac-md5
index 607c43b8b0..2b3f4b093e 100644
--- a/modules/gc-hmac-md5
+++ b/modules/crypto/gc-hmac-md5
@@ -15,7 +15,7 @@ m4/memxor.m4
 
 Depends-on:
 stdint
-gc
+crypto/gc
 
 configure.ac:
 gl_GC_HMAC_MD5
diff --git a/modules/gc-hmac-md5-tests b/modules/crypto/gc-hmac-md5-tests
similarity index 100%
rename from modules/gc-hmac-md5-tests
rename to modules/crypto/gc-hmac-md5-tests
diff --git a/modules/gc-hmac-sha1 b/modules/crypto/gc-hmac-sha1
similarity index 97%
rename from modules/gc-hmac-sha1
rename to modules/crypto/gc-hmac-sha1
index 4e855ac067..726e589d7c 100644
--- a/modules/gc-hmac-sha1
+++ b/modules/crypto/gc-hmac-sha1
@@ -15,7 +15,7 @@ m4/memxor.m4
 
 Depends-on:
 stdint
-gc
+crypto/gc
 
 configure.ac:
 gl_GC_HMAC_SHA1
diff --git a/modules/gc-hmac-sha1-tests b/modules/crypto/gc-hmac-sha1-tests
similarity index 100%
rename from modules/gc-hmac-sha1-tests
rename to modules/crypto/gc-hmac-sha1-tests
diff --git a/modules/gc-md2 b/modules/crypto/gc-md2
similarity index 91%
rename from modules/gc-md2
rename to modules/crypto/gc-md2
index 2a36a04466..737524746c 100644
--- a/modules/gc-md2
+++ b/modules/crypto/gc-md2
@@ -6,9 +6,9 @@ m4/gc-md2.m4
 
 Depends-on:
 stdint
-gc
 minmax
-md2
+crypto/gc
+crypto/md2
 
 configure.ac:
 gl_GC_MD2
diff --git a/modules/gc-md2-tests b/modules/crypto/gc-md2-tests
similarity index 100%
rename from modules/gc-md2-tests
rename to modules/crypto/gc-md2-tests
diff --git a/modules/gc-md4 b/modules/crypto/gc-md4
similarity index 96%
rename from modules/gc-md4
rename to modules/crypto/gc-md4
index e74c309df6..e3c555db7d 100644
--- a/modules/gc-md4
+++ b/modules/crypto/gc-md4
@@ -9,7 +9,7 @@ m4/md4.m4
 
 Depends-on:
 stdint
-gc
+crypto/gc
 
 configure.ac:
 gl_GC_MD4
diff --git a/modules/gc-md4-tests b/modules/crypto/gc-md4-tests
similarity index 100%
rename from modules/gc-md4-tests
rename to modules/crypto/gc-md4-tests
diff --git a/modules/gc-md5 b/modules/crypto/gc-md5
similarity index 96%
rename from modules/gc-md5
rename to modules/crypto/gc-md5
index 4a5c190026..da73ab9340 100644
--- a/modules/gc-md5
+++ b/modules/crypto/gc-md5
@@ -9,7 +9,7 @@ m4/md5.m4
 
 Depends-on:
 stdint
-gc
+crypto/gc
 
 configure.ac:
 gl_GC_MD5
diff --git a/modules/gc-md5-tests b/modules/crypto/gc-md5-tests
similarity index 100%
rename from modules/gc-md5-tests
rename to modules/crypto/gc-md5-tests
diff --git a/modules/gc-pbkdf2-sha1 b/modules/crypto/gc-pbkdf2-sha1
similarity index 89%
rename from modules/gc-pbkdf2-sha1
rename to modules/crypto/gc-pbkdf2-sha1
index 431e054208..e1c430fc2e 100644
--- a/modules/gc-pbkdf2-sha1
+++ b/modules/crypto/gc-pbkdf2-sha1
@@ -6,8 +6,8 @@ lib/gc-pbkdf2-sha1.c
 m4/gc-pbkdf2-sha1.m4
 
 Depends-on:
-gc
-gc-hmac-sha1
+crypto/gc
+crypto/gc-hmac-sha1
 
 configure.ac:
 gl_GC_PBKDF2_SHA1
diff --git a/modules/gc-pbkdf2-sha1-tests b/modules/crypto/gc-pbkdf2-sha1-tests
similarity index 100%
rename from modules/gc-pbkdf2-sha1-tests
rename to modules/crypto/gc-pbkdf2-sha1-tests
diff --git a/modules/gc-random b/modules/crypto/gc-random
similarity index 95%
rename from modules/gc-random
rename to modules/crypto/gc-random
index 668c8c394e..74b879c1e9 100644
--- a/modules/gc-random
+++ b/modules/crypto/gc-random
@@ -5,7 +5,7 @@ Files:
 m4/gc-random.m4
 
 Depends-on:
-gc
+crypto/gc
 
 configure.ac:
 gl_GC_RANDOM
diff --git a/modules/gc-rijndael b/modules/crypto/gc-rijndael
similarity index 97%
rename from modules/gc-rijndael
rename to modules/crypto/gc-rijndael
index c38f44128e..5cf1496c44 100644
--- a/modules/gc-rijndael
+++ b/modules/crypto/gc-rijndael
@@ -11,7 +11,7 @@ m4/rijndael.m4
 
 Depends-on:
 stdint
-gc
+crypto/gc
 
 configure.ac:
 gl_GC_RIJNDAEL
diff --git a/modules/gc-rijndael-tests b/modules/crypto/gc-rijndael-tests
similarity index 100%
rename from modules/gc-rijndael-tests
rename to modules/crypto/gc-rijndael-tests
diff --git a/modules/gc-sha1 b/modules/crypto/gc-sha1
similarity index 96%
rename from modules/gc-sha1
rename to modules/crypto/gc-sha1
index 8f7e210215..7db6c1db1e 100644
--- a/modules/gc-sha1
+++ b/modules/crypto/gc-sha1
@@ -9,7 +9,7 @@ m4/sha1.m4
 
 Depends-on:
 stdint
-gc
+crypto/gc
 
 configure.ac:
 gl_GC_SHA1
diff --git a/modules/gc-sha1-tests b/modules/crypto/gc-sha1-tests
similarity index 100%
rename from modules/gc-sha1-tests
rename to modules/crypto/gc-sha1-tests
diff --git a/modules/gc-tests b/modules/crypto/gc-tests
similarity index 100%
rename from modules/gc-tests
rename to modules/crypto/gc-tests
diff --git a/modules/hmac-md5 b/modules/crypto/hmac-md5
similarity index 95%
rename from modules/hmac-md5
rename to modules/crypto/hmac-md5
index acfce4b4bd..daa84b4f79 100644
--- a/modules/hmac-md5
+++ b/modules/crypto/hmac-md5
@@ -8,7 +8,7 @@ m4/hmac-md5.m4
 
 Depends-on:
 memxor
-md5
+crypto/md5
 
 configure.ac:
 gl_HMAC_MD5
diff --git a/modules/hmac-md5-tests b/modules/crypto/hmac-md5-tests
similarity index 100%
rename from modules/hmac-md5-tests
rename to modules/crypto/hmac-md5-tests
diff --git a/modules/hmac-sha1 b/modules/crypto/hmac-sha1
similarity index 90%
rename from modules/hmac-sha1
rename to modules/crypto/hmac-sha1
index 9b630c5aea..f7a4c83402 100644
--- a/modules/hmac-sha1
+++ b/modules/crypto/hmac-sha1
@@ -7,8 +7,8 @@ lib/hmac-sha1.c
 m4/hmac-sha1.m4
 
 Depends-on:
-memxor
-sha1
+crypto/memxor
+crypto/sha1
 
 configure.ac:
 gl_HMAC_SHA1
diff --git a/modules/hmac-sha1-tests b/modules/crypto/hmac-sha1-tests
similarity index 100%
rename from modules/hmac-sha1-tests
rename to modules/crypto/hmac-sha1-tests
diff --git a/modules/md2 b/modules/crypto/md2
similarity index 100%
rename from modules/md2
rename to modules/crypto/md2
diff --git a/modules/md2-tests b/modules/crypto/md2-tests
similarity index 100%
rename from modules/md2-tests
rename to modules/crypto/md2-tests
diff --git a/modules/md4 b/modules/crypto/md4
similarity index 100%
rename from modules/md4
rename to modules/crypto/md4
diff --git a/modules/md4-tests b/modules/crypto/md4-tests
similarity index 100%
rename from modules/md4-tests
rename to modules/crypto/md4-tests
diff --git a/modules/md5 b/modules/crypto/md5
similarity index 100%
rename from modules/md5
rename to modules/crypto/md5
diff --git a/modules/md5-tests b/modules/crypto/md5-tests
similarity index 100%
rename from modules/md5-tests
rename to modules/crypto/md5-tests
diff --git a/modules/memxor b/modules/crypto/memxor
similarity index 100%
rename from modules/memxor
rename to modules/crypto/memxor
diff --git a/modules/rijndael b/modules/crypto/rijndael
similarity index 100%
rename from modules/rijndael
rename to modules/crypto/rijndael
diff --git a/modules/rijndael-tests b/modules/crypto/rijndael-tests
similarity index 100%
rename from modules/rijndael-tests
rename to modules/crypto/rijndael-tests
diff --git a/modules/sha1 b/modules/crypto/sha1
similarity index 100%
rename from modules/sha1
rename to modules/crypto/sha1
-- 
2.30.2