switch to cmake

Author: exiledkingcc

CMakeLists.txt

@@ -0,0 +1,13 @@
+cmake_minimum_required(VERSION 3.0.0)
+project(zcrypto VERSION 0.1.0)
+
+include(CTest)
+enable_testing()
+
+add_compile_options(-Wall -Wextra -Wuninitialized -Wsign-conversion)
+set(CMAKE_C_STANDARD 17)
+set(CMAKE_CXX_STANDARD 17)
+
+include_directories(include)
+add_subdirectory(src)
+add_subdirectory(tests)

Makefile

@@ -1,20 +1,21 @@
 # code: utf-8
 
 import os
+import pathlib
 from distutils.core import setup, Extension
 
 name = "zcrypto"
 ver = "0.1"
 
-pydir = os.path.dirname(os.path.abspath(__file__))
-rootdir = os.path.dirname(pydir)
-libdir = os.path.join(rootdir, name)
-src = ["../{}/{}".format(name, x) for x in os.listdir(libdir) if x.endswith(".c")]
-src.extend([x for x in os.listdir(pydir) if x.endswith(".c")])
-print(src)
+pydir = pathlib.Path(os.path.abspath(__file__)).parent
+rootdir = pydir.parent
+inc_dir = rootdir / "include"
+src_dir = rootdir / "src"
+src = [pydir / "ext.c", src_dir / "sm3.c", src_dir / "sm4.c"]
+src = [str(x) for x in src]
 
 setup(
     name = name,
 	version = ver,
-	ext_modules = [Extension(name, src, include_dirs=[rootdir])]
+	ext_modules = [Extension(name, src, include_dirs=[inc_dir])]
 )

zcrypto/aes.h renamed to include/zcrypto/aes.h

@@ -0,0 +1,16 @@
+
+set(sources
+    aes.c
+    base64.c
+    hash.c
+    hashlib.c
+    md5.c
+    oaep.c
+    rsa.c
+    sha1.c
+    sha256.c
+    sm3.c
+    sm4.c
+)
+
+add_library(zcrypto STATIC ${sources})

zcrypto/base64.h renamed to include/zcrypto/base64.h

@@ -1,5 +1,5 @@
-#include "aes.h"
-#include "utils.h"
+#include "zcrypto/aes.h"
+#include "zcrypto/utils.h"
 
 static const uint8_t RCBOX[11] = {
     0x00, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36

zcrypto/hash.h renamed to include/zcrypto/hash.h

@@ -1,5 +1,5 @@
 #include <stdint.h>
-#include "base64.h"
+#include "zcrypto/base64.h"
 
 static const uint8_t ASCII[] = {
     "ABCDEFGHIJKLMNOP"

zcrypto/hashlib.h renamed to include/zcrypto/hashlib.h

@@ -1,6 +1,6 @@
 #include <assert.h>
-#include "hash.h"
-#include "utils.h"
+#include "zcrypto/hash.h"
+#include "zcrypto/utils.h"
 
 void _hash_update(hash_blk_update_func blk_update, uint32_t *hash, uint8_t *blk, const uint8_t *data, size_t len, uint64_t *total) {
     size_t offset = *total % HASH_BLK_SIZE;

zcrypto/md5.h renamed to include/zcrypto/md5.h

@@ -1,11 +1,11 @@
 #include <assert.h>
-#include "hash.h"
-#include "hashlib.h"
-#include "sm3.h"
-#include "md5.h"
-#include "sha1.h"
-#include "sha256.h"
-#include "utils.h"
+#include "zcrypto/hash.h"
+#include "zcrypto/hashlib.h"
+#include "zcrypto/sm3.h"
+#include "zcrypto/md5.h"
+#include "zcrypto/sha1.h"
+#include "zcrypto/sha256.h"
+#include "zcrypto/utils.h"
 
 void hash_init(hash_ctx_t *ctx, int alg) {
     assert(alg == HASH_ALG_SM3 || alg == HASH_ALG_MD5 || alg == HASH_ALG_SHA1 || alg == HASH_ALG_SHA256);

zcrypto/oaep.h renamed to include/zcrypto/oaep.h

@@ -1,6 +1,6 @@
-#include "md5.h"
-#include "hash.h"
-#include "utils.h"
+#include "zcrypto/md5.h"
+#include "zcrypto/hash.h"
+#include "zcrypto/utils.h"
 
 static const uint32_t TT[] = {
     0xd76aa478, 0xe8c7b756, 0x242070db, 0xc1bdceee,

zcrypto/rsa.h renamed to include/zcrypto/rsa.h

@@ -1,5 +1,5 @@
-#include "sha256.h"
-#include "oaep.h"
+#include "zcrypto/sha256.h"
+#include "zcrypto/oaep.h"
 
 static void bytes2num(uint32_t *num, const uint8_t *bytes, size_t len) {
     for (size_t j = 0; j < len; j += 4) {

zcrypto/sha1.h renamed to include/zcrypto/sha1.h

@@ -1,6 +1,6 @@
 #include <string.h>
-#include "rsa.h"
-#include "utils.h"
+#include "zcrypto/rsa.h"
+#include "zcrypto/utils.h"
 
 #define DEBUG_DUMP 0
 #if DEBUG_DUMP

zcrypto/sha256.h renamed to include/zcrypto/sha256.h

@@ -1,6 +1,6 @@
-#include "sha1.h"
-#include "hash.h"
-#include "utils.h"
+#include "zcrypto/sha1.h"
+#include "zcrypto/hash.h"
+#include "zcrypto/utils.h"
 
 static inline uint32_t _f0(uint32_t B, uint32_t C, uint32_t D) {
     return (B & C) | (~B & D);

zcrypto/sm3.h renamed to include/zcrypto/sm3.h

@@ -1,6 +1,6 @@
-#include "sha256.h"
-#include "hash.h"
-#include "utils.h"
+#include "zcrypto/sha256.h"
+#include "zcrypto/hash.h"
+#include "zcrypto/utils.h"
 
 static inline uint32_t CH(uint32_t X, uint32_t Y, uint32_t Z) {
     return (X & Y) ^ (~X & Z);

zcrypto/sm4.h renamed to include/zcrypto/sm4.h

@@ -1,6 +1,6 @@
-#include "sm3.h"
-#include "hash.h"
-#include "utils.h"
+#include "zcrypto/sm3.h"
+#include "zcrypto/hash.h"
+#include "zcrypto/utils.h"
 
 #define T0 0x79cc4519ul
 #define T1 0x7a879d8aul

zcrypto/utils.h renamed to include/zcrypto/utils.h

@@ -1,5 +1,5 @@
-#include "sm4.h"
-#include "utils.h"
+#include "zcrypto/sm4.h"
+#include "zcrypto/utils.h"
 
 static const uint8_t SBOX[256] = {
 	0xd6, 0x90, 0xe9, 0xfe, 0xcc, 0xe1, 0x3d, 0xb7,

python/setup.py

@@ -0,0 +1,19 @@
+
+add_executable(test_aes test_aes.c)
+target_link_libraries(test_aes zcrypto)
+
+add_executable(test_base64 test_base64.c)
+target_link_libraries(test_base64 zcrypto)
+
+add_executable(test_hash test_hash.c)
+target_link_libraries(test_hash zcrypto)
+
+add_executable(test_oaep test_oaep.c)
+target_link_libraries(test_oaep zcrypto)
+
+add_executable(test_rsa test_rsa.c)
+target_link_libraries(test_rsa zcrypto)
+
+add_executable(test_sm4 test_sm4.c)
+target_link_libraries(test_sm4 zcrypto)
+