aboutsummaryrefslogtreecommitdiff
path: root/plugins/signal-protocol
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2019-01-16 23:02:23 +0100
committerMarvin W <git@larma.de>2019-01-16 23:02:23 +0100
commit8e14ac6d714b7f88e16de31a6c795e811dc27417 (patch)
treed31e1e15ee9a6538bd21ffb328f1c83c44a36176 /plugins/signal-protocol
parent16329411a879a7f85e8f91c4df06a8f54ce8ac38 (diff)
downloaddino-8e14ac6d714b7f88e16de31a6c795e811dc27417.tar.gz
dino-8e14ac6d714b7f88e16de31a6c795e811dc27417.zip
Rewrite OMEMO crypt buffer logic to fix #474
Diffstat (limited to 'plugins/signal-protocol')
-rw-r--r--plugins/signal-protocol/src/signal_helper.c56
1 files changed, 43 insertions, 13 deletions
diff --git a/plugins/signal-protocol/src/signal_helper.c b/plugins/signal-protocol/src/signal_helper.c
index 91fcefbd..3630d6d6 100644
--- a/plugins/signal-protocol/src/signal_helper.c
+++ b/plugins/signal-protocol/src/signal_helper.c
@@ -228,9 +228,17 @@ int signal_vala_encrypt(signal_buffer **output,
if (gcry_cipher_open(&ctx, algo, mode, 0)) return SG_ERR_UNKNOWN;
+ signal_buffer* padded = 0;
+ signal_buffer* out_buf = 0;
goto no_error;
error:
gcry_cipher_close(ctx);
+ if (padded != 0) {
+ signal_buffer_bzero_free(padded);
+ }
+ if (out_buf != 0) {
+ signal_buffer_free(out_buf);
+ }
return SG_ERR_UNKNOWN;
no_error:
@@ -255,19 +263,30 @@ no_error:
}
size_t padded_len = plaintext_len + pad_len;
- uint8_t padded[padded_len];
- memset(padded + plaintext_len, pad_len, pad_len);
- memcpy(padded, plaintext, plaintext_len);
+ padded = signal_buffer_alloc(padded_len);
+ if (padded == 0) {
+ goto error;
+ }
- uint8_t out_buf[padded_len + tag_len];
+ memset(signal_buffer_data(padded) + plaintext_len, pad_len, pad_len);
+ memcpy(signal_buffer_data(padded), plaintext, plaintext_len);
+
+ out_buf = signal_buffer_alloc(padded_len + tag_len);
+ if (out_buf == 0) {
+ goto error;
+ }
- if (gcry_cipher_encrypt(ctx, out_buf, padded_len, padded, padded_len)) goto error;
+ if (gcry_cipher_encrypt(ctx, signal_buffer_data(out_buf), padded_len, signal_buffer_data(padded), padded_len)) goto error;
if (tag_len > 0) {
- if (gcry_cipher_gettag(ctx, out_buf + padded_len, tag_len)) goto error;
+ if (gcry_cipher_gettag(ctx, signal_buffer_data(out_buf) + padded_len, tag_len)) goto error;
}
- *output = signal_buffer_create(out_buf, padded_len + tag_len);
+ *output = out_buf;
+ out_buf = 0;
+
+ signal_buffer_bzero_free(padded);
+ padded = 0;
gcry_cipher_close(ctx);
return SG_SUCCESS;
@@ -280,6 +299,7 @@ int signal_vala_decrypt(signal_buffer **output,
const uint8_t *ciphertext, size_t ciphertext_len,
void *user_data) {
int algo, mode;
+ *output = 0;
if (aes_cipher(cipher, key_len, &algo, &mode)) return SG_ERR_UNKNOWN;
if (ciphertext_len == 0) return SG_ERR_UNKNOWN;
@@ -289,9 +309,13 @@ int signal_vala_decrypt(signal_buffer **output,
if (gcry_cipher_open(&ctx, algo, mode, 0)) return SG_ERR_UNKNOWN;
+ signal_buffer* out_buf = 0;
goto no_error;
error:
gcry_cipher_close(ctx);
+ if (out_buf != 0) {
+ signal_buffer_bzero_free(output);
+ }
return SG_ERR_UNKNOWN;
no_error:
@@ -312,24 +336,30 @@ no_error:
tag_len = 16;
break;
default:
- return SG_ERR_UNKNOWN;
+ goto error;
}
size_t padded_len = ciphertext_len - tag_len;
- uint8_t out_buf[padded_len];
+ out_buf = signal_buffer_alloc(padded_len);
+ if (out_buf == 0) {
+ goto error;
+ }
- if (gcry_cipher_decrypt(ctx, out_buf, padded_len, ciphertext, padded_len)) goto error;
+ if (gcry_cipher_decrypt(ctx, signal_buffer_data(out_buf), signal_buffer_len(out_buf), ciphertext, padded_len)) goto error;
if (tag_len > 0) {
if (gcry_cipher_checktag(ctx, ciphertext + padded_len, tag_len)) goto error;
}
if (pkcs_pad) {
- uint8_t pad_len = out_buf[padded_len - 1];
+ uint8_t pad_len = signal_buffer_data(out_buf)[padded_len - 1];
if (pad_len > 16 || pad_len > padded_len) goto error;
- *output = signal_buffer_create(out_buf, padded_len - pad_len);
+ *output = signal_buffer_create(signal_buffer_data(out_buf), padded_len - pad_len);
+ signal_buffer_bzero_free(out_buf);
+ out_buf = 0;
} else {
- *output = signal_buffer_create(out_buf, padded_len);
+ *output = out_buf;
+ out_buf = 0;
}
gcry_cipher_close(ctx);