[*] Resolve conflicts
[+] Release dap_rand/random_bytes for windows platform"
Showing
- core/dap_common.c 43 additions, 9 deletionscore/dap_common.c
- core/dap_common.h 7 additions, 5 deletionscore/dap_common.h
- crypto/CMakeLists.txt 1 addition, 3 deletionscrypto/CMakeLists.txt
- crypto/dap_enc.c 2 additions, 0 deletionscrypto/dap_enc.c
- crypto/rand/dap_rand.c 10 additions, 3 deletionscrypto/rand/dap_rand.c
- test/core/dap_config_test.c 2 additions, 2 deletionstest/core/dap_config_test.c
- test/crypto/dap_enc_iaes_test.c 1 addition, 1 deletiontest/crypto/dap_enc_iaes_test.c
- test/crypto/main.c 1 addition, 0 deletionstest/crypto/main.c
- test/libdap-test 1 addition, 1 deletiontest/libdap-test
Loading
Please register or sign in to comment