Move crypto files

There will be more, so give them subdirectory.

diff --git a/Makefile b/Makefile
index af353aa212e8e3d730ede7ca974d6d12aa294dd7..9efdbc42d6a58b5f0ad0d30c98bd44eb1cdfabf5 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,9 @@ libusual_la_SOURCES = usual/config.h.in \
        usual/cbtree.h usual/cbtree.c \
        usual/cfparser.h usual/cfparser.c \
        usual/crc32.h usual/crc32.c \
+       usual/crypto/hmac.h usual/crypto/hmac.c \
+       usual/crypto/md5.h usual/crypto/md5.c \
+       usual/crypto/sha1.h usual/crypto/sha1.c \
        usual/ctype.h \
        usual/cxalloc.h usual/cxalloc.c \
        usual/cxextra.h usual/cxextra.c \
@@ -29,12 +32,10 @@ libusual_la_SOURCES = usual/config.h.in \
        usual/getopt.h usual/getopt.c \
        usual/hashtab-impl.h \
        usual/heap.h usual/heap.c \
-       usual/hmac.h usual/hmac.c \
        usual/list.h usual/list.c \
        usual/logging.h usual/logging.c \
        usual/lookup3.h usual/lookup3.c \
        usual/mbuf.h usual/mbuf.c \
-       usual/md5.h usual/md5.c \
        usual/mdict.h usual/mdict.c \
        usual/mempool.h usual/mempool.c \
        usual/misc.h \
@@ -43,7 +44,6 @@ libusual_la_SOURCES = usual/config.h.in \
        usual/pthread.h usual/pthread.c \
        usual/regex.h usual/regex.c \
        usual/safeio.h usual/safeio.c \
-       usual/sha1.h usual/sha1.c \
        usual/shlist.h \
        usual/signal.h usual/signal.c \
        usual/slab.h usual/slab.c \

diff --git a/doc/mainpage.dox b/doc/mainpage.dox
index 9a52091bff3119ba1e2aabf163946b022a92ebff..d2eac13bb1b6d0e8b0145de374ffd1316c161972 100644 (file)
--- a/doc/mainpage.dox
+++ b/doc/mainpage.dox
@@ -57,14 +57,15 @@
  * <tr><td>  <usual/cfparser.h>      </td><td>  Config parser   </td></tr>
  * <tr><td>  <usual/crc32.h>         </td><td>  CRC32   </td></tr>
  * <tr><td>  <usual/endian.h>        </td><td>  Endianess conversion   </td></tr>
- * <tr><td>  <usual/hmac.h>          </td><td>  HMAC-SHA1   </td></tr>
  * <tr><td>  <usual/lookup3.h>       </td><td>  Jenkins' lookup3 hash   </td></tr>
  * <tr><td>  <usual/misc.h>          </td><td>  Misc arithmetic   </td></tr>
- * <tr><td>  <usual/md5.h>           </td><td>  MD5 hash   </td></tr>
- * <tr><td>  <usual/sha1.h>          </td><td>  SHA1 hash   </td></tr>
  * <tr><td>  <usual/regex.h>         </td><td>  POSIX regex compat   </td></tr>
  * <tr><td>  <usual/pgutil.h>        </td><td>  PostgreSQL data formats   </td></tr>
  * <tr><td>  <usual/utf8.h>          </td><td>  Low-level UTF8 handling   </td></tr>
+ * <tr><th colspan=2>  Cryptography  </th></tr>
+ * <tr><td>  <usual/crypto/hmac.h>   </td><td>  HMAC-SHA1 </td></tr>
+ * <tr><td>  <usual/crypto/md5.h>    </td><td>  MD5 hash  </td></tr>
+ * <tr><td>  <usual/crypto/sha1.h>   </td><td>  SHA1 hash  </td></tr>
  * <tr><th colspan=2>  Memory Allocation  </th></tr>
  * <tr><td>  <usual/cxalloc.h>       </td><td>  Context Allocator framework   </td></tr>
  * <tr><td>  <usual/cxextra.h>       </td><td>  Extra allocators   </td></tr>

diff --git a/test/compile.c b/test/compile.c
index a306513729a2cac7b8c03ea512d6a7fb722003ac..ac1c76bac8809bd477c370f9b785124bac700433 100644 (file)
--- a/test/compile.c
+++ b/test/compile.c
@@ -14,7 +14,7 @@
 #include <usual/logging.h>
 #include <usual/lookup3.h>
 #include <usual/mbuf.h>
-#include <usual/md5.h>
+#include <usual/crypto/md5.h>
 #include <usual/misc.h>
 //#include <usual/pgsocket.h>
 #include <usual/safeio.h>

diff --git a/test/test_crypto.c b/test/test_crypto.c
index 5c9fa2516872f8b7a6ec03e50ceefd81f6c80fa5..3b0cdd1a4d73880b7d4535158920cb835e962090 100644 (file)
--- a/test/test_crypto.c
+++ b/test/test_crypto.c
@@ -6,9 +6,9 @@
 
 #define str_check(a, b) tt_str_op(a, ==, b)
 
-#include <usual/hmac.h>
-#include <usual/md5.h>
-#include <usual/sha1.h>
+#include <usual/crypto/hmac.h>
+#include <usual/crypto/md5.h>
+#include <usual/crypto/sha1.h>
 
 static const char *mkhex(const uint8_t *src, int len)
 {

diff --git a/usual/hmac.c b/usual/crypto/hmac.c
similarity index 97%
rename from usual/hmac.c
rename to usual/crypto/hmac.c
index 732f46eee4046aa8b9f5e91b132c01c6af6d1a2c..c2990e3b0b7eafd108ca11c79b165901a35480b1 100644 (file)
--- a/usual/hmac.c
+++ b/usual/crypto/hmac.c
@@ -16,8 +16,8 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <usual/hmac.h>
-#include <usual/sha1.h>
+#include <usual/crypto/hmac.h>
+#include <usual/crypto/sha1.h>
 
 #include <string.h>
 

diff --git a/usual/hmac.h b/usual/crypto/hmac.h
similarity index 93%
rename from usual/hmac.h
rename to usual/crypto/hmac.h
index 09b20b4bc2c1ef3645214016e5ec83f18329c319..0c7296fa991d0a477108fa5b9678634d130ca54b 100644 (file)
--- a/usual/hmac.h
+++ b/usual/crypto/hmac.h
@@ -21,12 +21,12 @@
  * HMAC-SHA1 implementation (RFC2104).
  */
 
-#ifndef _USUAL_HMAC_H_
-#define _USUAL_HMAC_H_
+#ifndef _USUAL_CRYPTO_HMAC_H_
+#define _USUAL_CRYPTO_HMAC_H_
 
 #include <usual/base.h>
 
-#include <usual/sha1.h>
+#include <usual/crypto/sha1.h>
 
 /** HMAC-SHA1 Context */
 struct hmac_sha1_ctx {

diff --git a/usual/md5.c b/usual/crypto/md5.c
similarity index 99%
rename from usual/md5.c
rename to usual/crypto/md5.c
index bb3ef4ef7234ab69c299e5f51d2c0ccde5e9ef14..56211120c45ec1bc6cdf3d807dd090d0f3efe7a6 100644 (file)
--- a/usual/md5.c
+++ b/usual/crypto/md5.c
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <usual/md5.h>
+#include <usual/crypto/md5.h>
 
 #include <usual/endian.h>
 #include <usual/bits.h>

diff --git a/usual/md5.h b/usual/crypto/md5.h
similarity index 96%
rename from usual/md5.h
rename to usual/crypto/md5.h
index 4ba03f3d2fca66f178aed3b47da30ae19f789d2b..dde433db0215506e81e33f199b7e4db23b24702d 100644 (file)
--- a/usual/md5.h
+++ b/usual/crypto/md5.h
@@ -22,8 +22,8 @@
  * MD5 cryptographic hash.
  */
 
-#ifndef _USUAL_MD5_H_
-#define _USUAL_MD5_H_
+#ifndef _USUAL_CRYPTO_MD5_H_
+#define _USUAL_CRYPTO_MD5_H_
 
 #include <usual/base.h>
 

diff --git a/usual/sha1.c b/usual/crypto/sha1.c
similarity index 99%
rename from usual/sha1.c
rename to usual/crypto/sha1.c
index eea7c8a0b0de101c5b320fea94d96a0f1c40fb2b..50df21551d2abcf0720ce0fba37b2e2034a6361d 100644 (file)
--- a/usual/sha1.c
+++ b/usual/crypto/sha1.c
@@ -16,7 +16,7 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
-#include <usual/sha1.h>
+#include <usual/crypto/sha1.h>
 
 #include <usual/endian.h>
 #include <usual/bits.h>

diff --git a/usual/sha1.h b/usual/crypto/sha1.h
similarity index 96%
rename from usual/sha1.h
rename to usual/crypto/sha1.h
index 09dbdf3c1ef23b3b0ac6c1440dab179ef0aecb53..76b6f9d270cf1e58a76410d3fcc6c0debaa5aa8b 100644 (file)
--- a/usual/sha1.h
+++ b/usual/crypto/sha1.h
@@ -22,8 +22,8 @@
  * SHA1 implementation.
  */
 
-#ifndef _USUAL_SHA1_H_
-#define _USUAL_SHA1_H_
+#ifndef _USUAL_CRYPTO_SHA1_H_
+#define _USUAL_CRYPTO_SHA1_H_
 
 #include <usual/base.h>