Unverified Commit fccc2ac3 authored by kladko's avatar kladko

SKALE-2895-fix-build-and-docs

parent 461d4baf
......@@ -217,20 +217,20 @@ void logMsg(log_level _level, const char* _msg) {
}
EXTERNC void LOG_INFO(char* _msg) {
EXTERNC void LOG_INFO(const char* _msg) {
logMsg(L_INFO, _msg);
};
EXTERNC void LOG_WARN(char* _msg) {
EXTERNC void LOG_WARN(const char* _msg) {
logMsg(L_WARNING, _msg);
};
EXTERNC void LOG_ERROR(char* _msg) {
EXTERNC void LOG_ERROR(const char* _msg) {
logMsg(L_ERROR, _msg);
};
EXTERNC void LOG_DEBUG(char* _msg) {
EXTERNC void LOG_DEBUG(const char* _msg) {
logMsg(L_DEBUG, _msg);
};
EXTERNC void LOG_TRACE(char* _msg) {
EXTERNC void LOG_TRACE(const char* _msg) {
logMsg(L_TRACE, _msg);
};
......@@ -47,11 +47,11 @@ EXTERNC void enclave_init();
void get_global_random(unsigned char* _randBuff);
EXTERNC void LOG_INFO(char* msg);
EXTERNC void LOG_WARN(char* _msg);
EXTERNC void LOG_ERROR(char* _msg);
EXTERNC void LOG_DEBUG(char* _msg);
EXTERNC void LOG_TRACE(char* _msg);
EXTERNC void LOG_INFO(const char* msg);
EXTERNC void LOG_WARN(const char* _msg);
EXTERNC void LOG_ERROR(const char* _msg);
EXTERNC void LOG_DEBUG(const char* _msg);
EXTERNC void LOG_TRACE(const char* _msg);
extern uint32_t globalLogLevel_;
......
......@@ -37,6 +37,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <string.h>
#include <stdio.h>
#include <stdbool.h>
#include <assert.h>
#include "secure_enclave_t.h"
#include "sgx_tcrypto.h"
......@@ -130,10 +131,11 @@ void *reallocate_function(void *ptr, size_t osize, size_t nsize) {
void get_global_random(unsigned char* _randBuff) {
sgx_sha_state_handle_t shaStateHandle;
sgx_sha256_init(&shaStateHandle);
sgx_sha256_update(globalRandom, 32, shaStateHandle);
sgx_sha256_get_hash(shaStateHandle, globalRandom);
sgx_sha256_close(shaStateHandle);
assert(sgx_sha256_init(&shaStateHandle) == SGX_SUCCESS);
assert(sgx_sha256_update(globalRandom, 32, shaStateHandle) == SGX_SUCCESS);
assert(sgx_sha256_get_hash(shaStateHandle, globalRandom) == SGX_SUCCESS);
assert(sgx_sha256_get_hash(shaStateHandle, globalRandom) == SGX_SUCCESS);
assert(sgx_sha256_close(shaStateHandle) == SGX_SUCCESS);
memcpy(_randBuff, globalRandom, 32);
}
......
Subproject commit 2331e6810cd4a8434f70ac3b81fe10f5d7e5d641
Subproject commit 77003edb2d443ce1f581866a110dbdf37be51352
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment