Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Secure usage of Emscripten heap #495

Merged
merged 8 commits into from
Jul 11, 2019
Merged

Secure usage of Emscripten heap #495

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a550382
Heap utilities
ilammy Jul 9, 2019
03caffa
Use heap securely in key generation
ilammy Jul 9, 2019
22a25ca
Merge branch 'master' into wasm-zeroization
ilammy Jul 9, 2019
b4719ef
Use heap securely in Secure Cell
ilammy Jul 9, 2019
5a16bce
Use heap securely in Secure Message
ilammy Jul 9, 2019
927aca7
Use heap securely in Secure Comparator
ilammy Jul 9, 2019
3fb6bd7
Use heap securely in Secure Session
ilammy Jul 9, 2019
f8dd4e7
Avoid NULL dereference
ilammy Jul 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 24 additions & 26 deletions src/wrappers/themis/wasm/src/secure_cell_context_imprint.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,16 +62,16 @@ module.exports = class SecureCellContextImprint {
let result_length_ptr = libthemis.allocate(4, 'i32', libthemis.ALLOC_STACK)
let master_key_ptr, message_ptr, context_ptr, result_ptr, result_length
try {
master_key_ptr = libthemis._malloc(this.masterKey.length)
message_ptr = libthemis._malloc(message.length)
context_ptr = libthemis._malloc(context.length)
master_key_ptr = utils.heapAlloc(this.masterKey.length)
message_ptr = utils.heapAlloc(message.length)
context_ptr = utils.heapAlloc(context.length)
if (!master_key_ptr || !message_ptr || !context_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}

libthemis.writeArrayToMemory(this.masterKey, master_key_ptr)
libthemis.writeArrayToMemory(message, message_ptr)
libthemis.writeArrayToMemory(context, context_ptr)
utils.heapPutArray(this.masterKey, master_key_ptr)
utils.heapPutArray(message, message_ptr)
utils.heapPutArray(context, context_ptr)

status = libthemis._themis_secure_cell_encrypt_context_imprint(
master_key_ptr, this.masterKey.length,
Expand All @@ -84,7 +84,7 @@ module.exports = class SecureCellContextImprint {
}

result_length = libthemis.getValue(result_length_ptr, 'i32')
result_ptr = libthemis._malloc(result_length)
result_ptr = utils.heapAlloc(result_length)
if (!result_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}
Expand All @@ -101,14 +101,13 @@ module.exports = class SecureCellContextImprint {

result_length = libthemis.getValue(result_length_ptr, 'i32')

return libthemis.HEAPU8.slice(result_ptr, result_ptr + result_length)
return utils.heapGetArray(result_ptr, result_length)
}
finally {
libthemis._memset(master_key_ptr, 0, this.masterKey.length)
libthemis._free(master_key_ptr)
libthemis._free(message_ptr)
libthemis._free(context_ptr)
libthemis._free(result_ptr)
utils.heapFree(master_key_ptr, this.masterKey.length)
utils.heapFree(message_ptr, message.length)
utils.heapFree(context_ptr, context.length)
utils.heapFree(result_ptr, result_length)
}
}

Expand Down Expand Up @@ -138,16 +137,16 @@ module.exports = class SecureCellContextImprint {
let result_length_ptr = libthemis.allocate(4, 'i32', libthemis.ALLOC_STACK)
let master_key_ptr, message_ptr, context_ptr, result_ptr, result_length
try {
master_key_ptr = libthemis._malloc(this.masterKey.length)
message_ptr = libthemis._malloc(message.length)
context_ptr = libthemis._malloc(context.length)
master_key_ptr = utils.heapAlloc(this.masterKey.length)
message_ptr = utils.heapAlloc(message.length)
context_ptr = utils.heapAlloc(context.length)
if (!master_key_ptr || !message_ptr || !context_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}

libthemis.writeArrayToMemory(this.masterKey, master_key_ptr)
libthemis.writeArrayToMemory(message, message_ptr)
libthemis.writeArrayToMemory(context, context_ptr)
utils.heapPutArray(this.masterKey, master_key_ptr)
utils.heapPutArray(message, message_ptr)
utils.heapPutArray(context, context_ptr)

status = libthemis._themis_secure_cell_decrypt_context_imprint(
master_key_ptr, this.masterKey.length,
Expand All @@ -160,7 +159,7 @@ module.exports = class SecureCellContextImprint {
}

result_length = libthemis.getValue(result_length_ptr, 'i32')
result_ptr = libthemis._malloc(result_length)
result_ptr = utils.heapAlloc(result_length)
if (!result_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}
Expand All @@ -177,14 +176,13 @@ module.exports = class SecureCellContextImprint {

result_length = libthemis.getValue(result_length_ptr, 'i32')

return libthemis.HEAPU8.slice(result_ptr, result_ptr + result_length)
return utils.heapGetArray(result_ptr, result_length)
}
finally {
libthemis._memset(master_key_ptr, 0, this.masterKey.length)
libthemis._free(master_key_ptr)
libthemis._free(message_ptr)
libthemis._free(context_ptr)
libthemis._free(result_ptr)
utils.heapFree(master_key_ptr, this.masterKey.length)
utils.heapFree(message_ptr, message.length)
utils.heapFree(context_ptr, context.length)
utils.heapFree(result_ptr, result_length)
}
}
}
50 changes: 24 additions & 26 deletions src/wrappers/themis/wasm/src/secure_cell_seal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,16 @@ module.exports = class SecureCellSeal {
let result_length_ptr = libthemis.allocate(4, 'i32', libthemis.ALLOC_STACK)
let master_key_ptr, message_ptr, context_ptr, result_ptr, result_length
try {
master_key_ptr = libthemis._malloc(this.masterKey.length)
message_ptr = libthemis._malloc(message.length)
context_ptr = libthemis._malloc(context.length)
master_key_ptr = utils.heapAlloc(this.masterKey.length)
message_ptr = utils.heapAlloc(message.length)
context_ptr = utils.heapAlloc(context.length)
if (!master_key_ptr || !message_ptr || !context_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}

libthemis.writeArrayToMemory(this.masterKey, master_key_ptr)
libthemis.writeArrayToMemory(message, message_ptr)
libthemis.writeArrayToMemory(context, context_ptr)
utils.heapPutArray(this.masterKey, master_key_ptr)
utils.heapPutArray(message, message_ptr)
utils.heapPutArray(context, context_ptr)

status = libthemis._themis_secure_cell_encrypt_seal(
master_key_ptr, this.masterKey.length,
Expand All @@ -77,7 +77,7 @@ module.exports = class SecureCellSeal {
}

result_length = libthemis.getValue(result_length_ptr, 'i32')
result_ptr = libthemis._malloc(result_length)
result_ptr = utils.heapAlloc(result_length)
if (!result_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}
Expand All @@ -94,14 +94,13 @@ module.exports = class SecureCellSeal {

result_length = libthemis.getValue(result_length_ptr, 'i32')

return libthemis.HEAPU8.slice(result_ptr, result_ptr + result_length)
return utils.heapGetArray(result_ptr, result_length)
}
finally {
libthemis._memset(master_key_ptr, 0, this.masterKey.length)
libthemis._free(master_key_ptr)
libthemis._free(message_ptr)
libthemis._free(context_ptr)
libthemis._free(result_ptr)
utils.heapFree(master_key_ptr, this.masterKey.length)
utils.heapFree(message_ptr, message.length)
utils.heapFree(context_ptr, context.length)
utils.heapFree(result_ptr, result_length)
}
}

Expand All @@ -124,16 +123,16 @@ module.exports = class SecureCellSeal {
let result_length_ptr = libthemis.allocate(4, 'i32', libthemis.ALLOC_STACK)
let master_key_ptr, message_ptr, context_ptr, result_ptr, result_length
try {
master_key_ptr = libthemis._malloc(this.masterKey.length)
message_ptr = libthemis._malloc(message.length)
context_ptr = libthemis._malloc(context.length)
master_key_ptr = utils.heapAlloc(this.masterKey.length)
message_ptr = utils.heapAlloc(message.length)
context_ptr = utils.heapAlloc(context.length)
if (!master_key_ptr || !message_ptr || !context_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}

libthemis.writeArrayToMemory(this.masterKey, master_key_ptr)
libthemis.writeArrayToMemory(message, message_ptr)
libthemis.writeArrayToMemory(context, context_ptr)
utils.heapPutArray(this.masterKey, master_key_ptr)
utils.heapPutArray(message, message_ptr)
utils.heapPutArray(context, context_ptr)

status = libthemis._themis_secure_cell_decrypt_seal(
master_key_ptr, this.masterKey.length,
Expand All @@ -146,7 +145,7 @@ module.exports = class SecureCellSeal {
}

result_length = libthemis.getValue(result_length_ptr, 'i32')
result_ptr = libthemis._malloc(result_length)
result_ptr = utils.heapAlloc(result_length)
if (!result_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}
Expand All @@ -163,14 +162,13 @@ module.exports = class SecureCellSeal {

result_length = libthemis.getValue(result_length_ptr, 'i32')

return libthemis.HEAPU8.slice(result_ptr, result_ptr + result_length)
return utils.heapGetArray(result_ptr, result_length)
}
finally {
libthemis._memset(master_key_ptr, 0, this.masterKey.length)
libthemis._free(master_key_ptr)
libthemis._free(message_ptr)
libthemis._free(context_ptr)
libthemis._free(result_ptr)
utils.heapFree(master_key_ptr, this.masterKey.length)
utils.heapFree(message_ptr, message.length)
utils.heapFree(context_ptr, context.length)
utils.heapFree(result_ptr, result_length)
}
}
}
62 changes: 30 additions & 32 deletions src/wrappers/themis/wasm/src/secure_cell_token_protect.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,16 +56,16 @@ module.exports = class SecureCellTokenProtect {
let token_length_ptr = libthemis.allocate(4, 'i32', libthemis.ALLOC_STACK)
let master_key_ptr, message_ptr, context_ptr, result_ptr, result_length, token_ptr, token_length
try {
master_key_ptr = libthemis._malloc(this.masterKey.length)
message_ptr = libthemis._malloc(message.length)
context_ptr = libthemis._malloc(context.length)
master_key_ptr = utils.heapAlloc(this.masterKey.length)
message_ptr = utils.heapAlloc(message.length)
context_ptr = utils.heapAlloc(context.length)
if (!master_key_ptr || !message_ptr || !context_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}

libthemis.writeArrayToMemory(this.masterKey, master_key_ptr)
libthemis.writeArrayToMemory(message, message_ptr)
libthemis.writeArrayToMemory(context, context_ptr)
utils.heapPutArray(this.masterKey, master_key_ptr)
utils.heapPutArray(message, message_ptr)
utils.heapPutArray(context, context_ptr)

status = libthemis._themis_secure_cell_encrypt_token_protect(
master_key_ptr, this.masterKey.length,
Expand All @@ -80,8 +80,8 @@ module.exports = class SecureCellTokenProtect {

result_length = libthemis.getValue(result_length_ptr, 'i32')
token_length = libthemis.getValue(token_length_ptr, 'i32')
result_ptr = libthemis._malloc(result_length)
token_ptr = libthemis._malloc(token_length)
result_ptr = utils.heapAlloc(result_length)
token_ptr = utils.heapAlloc(token_length)
if (!result_ptr || !token_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}
Expand All @@ -101,17 +101,16 @@ module.exports = class SecureCellTokenProtect {
token_length = libthemis.getValue(token_length_ptr, 'i32')

return {
data: libthemis.HEAPU8.slice(result_ptr, result_ptr + result_length),
token: libthemis.HEAPU8.slice(token_ptr, token_ptr + token_length)
data: utils.heapGetArray(result_ptr, result_length),
token: utils.heapGetArray(token_ptr, token_length)
}
}
finally {
libthemis._memset(master_key_ptr, 0, this.masterKey.length)
libthemis._free(master_key_ptr)
libthemis._free(message_ptr)
libthemis._free(context_ptr)
libthemis._free(result_ptr)
libthemis._free(token_ptr)
utils.heapFree(master_key_ptr, this.masterKey.length)
utils.heapFree(message_ptr, message.length)
utils.heapFree(context_ptr, context.length)
utils.heapFree(result_ptr, result_length)
utils.heapFree(token_ptr, token_length)
}
}

Expand Down Expand Up @@ -140,18 +139,18 @@ module.exports = class SecureCellTokenProtect {
let result_length_ptr = libthemis.allocate(4, 'i32', libthemis.ALLOC_STACK)
let master_key_ptr, message_ptr, context_ptr, token_ptr, result_ptr, result_length
try {
master_key_ptr = libthemis._malloc(this.masterKey.length)
message_ptr = libthemis._malloc(message.length)
context_ptr = libthemis._malloc(context.length)
token_ptr = libthemis._malloc(token.length)
master_key_ptr = utils.heapAlloc(this.masterKey.length)
message_ptr = utils.heapAlloc(message.length)
context_ptr = utils.heapAlloc(context.length)
token_ptr = utils.heapAlloc(token.length)
if (!master_key_ptr || !message_ptr || !context_ptr || !token_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}

libthemis.writeArrayToMemory(this.masterKey, master_key_ptr)
libthemis.writeArrayToMemory(message, message_ptr)
libthemis.writeArrayToMemory(context, context_ptr)
libthemis.writeArrayToMemory(token, token_ptr)
utils.heapPutArray(this.masterKey, master_key_ptr)
utils.heapPutArray(message, message_ptr)
utils.heapPutArray(context, context_ptr)
utils.heapPutArray(token, token_ptr)

status = libthemis._themis_secure_cell_decrypt_token_protect(
master_key_ptr, this.masterKey.length,
Expand All @@ -165,7 +164,7 @@ module.exports = class SecureCellTokenProtect {
}

result_length = libthemis.getValue(result_length_ptr, 'i32')
result_ptr = libthemis._malloc(result_length)
result_ptr = utils.heapAlloc(result_length)
if (!result_ptr) {
throw new ThemisError(cryptosystem_name, ThemisErrorCode.NO_MEMORY)
}
Expand All @@ -183,15 +182,14 @@ module.exports = class SecureCellTokenProtect {

result_length = libthemis.getValue(result_length_ptr, 'i32')

return libthemis.HEAPU8.slice(result_ptr, result_ptr + result_length)
return utils.heapGetArray(result_ptr, result_length)
}
finally {
libthemis._memset(master_key_ptr, 0, this.masterKey.length)
libthemis._free(master_key_ptr)
libthemis._free(message_ptr)
libthemis._free(context_ptr)
libthemis._free(token_ptr)
libthemis._free(result_ptr)
utils.heapFree(master_key_ptr, this.masterKey.length)
utils.heapFree(message_ptr, message.length)
utils.heapFree(context_ptr, context.length)
utils.heapFree(result_ptr, result_length)
utils.heapFree(token_ptr, token.length)
}
}
}
Loading