Merge branch 'master' into '2917'
# Conflicts: # dap-sdk/core/src/dap_common.c
No related branches found
No related tags found
Showing
- dap-sdk/core/CMakeLists.txt 1 addition, 1 deletiondap-sdk/core/CMakeLists.txt
- dap-sdk/core/include/dap_strfuncs.h 1 addition, 1 deletiondap-sdk/core/include/dap_strfuncs.h
- dap-sdk/core/src/dap_common.c 15 additions, 6 deletionsdap-sdk/core/src/dap_common.c
- dap-sdk/core/src/dap_strfuncs.c 1 addition, 1 deletiondap-sdk/core/src/dap_strfuncs.c
- dap-sdk/crypto/CMakeLists.txt 1 addition, 1 deletiondap-sdk/crypto/CMakeLists.txt
- dap-sdk/crypto/src/GOST/28147_14.c 3 additions, 3 deletionsdap-sdk/crypto/src/GOST/28147_14.c
- dap-sdk/crypto/src/GOST/28147_14.h 2 additions, 2 deletionsdap-sdk/crypto/src/GOST/28147_14.h
- dap-sdk/crypto/src/GOST/28147_89.c 6 additions, 6 deletionsdap-sdk/crypto/src/GOST/28147_89.c
- dap-sdk/crypto/src/GOST/28147_89.h 5 additions, 5 deletionsdap-sdk/crypto/src/GOST/28147_89.h
- dap-sdk/crypto/src/GOST/GOST.pri 0 additions, 2 deletionsdap-sdk/crypto/src/GOST/GOST.pri
- dap-sdk/crypto/src/GOST/block_cipher.c 18 additions, 18 deletionsdap-sdk/crypto/src/GOST/block_cipher.c
- dap-sdk/crypto/src/GOST/block_cipher.h 7 additions, 7 deletionsdap-sdk/crypto/src/GOST/block_cipher.h
- dap-sdk/crypto/src/GOST/callback_print.h 2 additions, 2 deletionsdap-sdk/crypto/src/GOST/callback_print.h
- dap-sdk/crypto/src/GOST/test_data.inc 0 additions, 313 deletionsdap-sdk/crypto/src/GOST/test_data.inc
- dap-sdk/crypto/src/GOST/testgost.c 0 additions, 906 deletionsdap-sdk/crypto/src/GOST/testgost.c
- dap-sdk/crypto/src/rand/dap_rand.c 3 additions, 3 deletionsdap-sdk/crypto/src/rand/dap_rand.c
- dap-sdk/crypto/src/ringct20/poly.c 5 additions, 8 deletionsdap-sdk/crypto/src/ringct20/poly.c
- dap-sdk/crypto/src/ringct20/poly.h 2 additions, 2 deletionsdap-sdk/crypto/src/ringct20/poly.h
- dap-sdk/crypto/src/ringct20/ring.c 51 additions, 54 deletionsdap-sdk/crypto/src/ringct20/ring.c
- dap-sdk/crypto/src/ringct20/ring.h 27 additions, 27 deletionsdap-sdk/crypto/src/ringct20/ring.h
Loading
Please register or sign in to comment