diff options
| author | Marvin W <git@larma.de> | 2020-01-15 19:22:25 +0100 |
|---|---|---|
| committer | Marvin W <git@larma.de> | 2020-01-15 23:45:00 +0100 |
| commit | 41f98271660827be6528d275bbbbee43c216fbbf (patch) | |
| tree | 2b5982db3357702eff39689530cdf80d4fe9ac32 /plugins/signal-protocol/src | |
| parent | 3cfe0d60f679aec81343f12bb846e7805ecad2f2 (diff) | |
| download | dino-41f98271660827be6528d275bbbbee43c216fbbf.tar.gz dino-41f98271660827be6528d275bbbbee43c216fbbf.zip | |
Improve log messages for OMEMO sending issues
Diffstat (limited to 'plugins/signal-protocol/src')
| -rw-r--r-- | plugins/signal-protocol/src/signal_helper.c | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/plugins/signal-protocol/src/signal_helper.c b/plugins/signal-protocol/src/signal_helper.c index a9a96a76..74019410 100644 --- a/plugins/signal-protocol/src/signal_helper.c +++ b/plugins/signal-protocol/src/signal_helper.c @@ -208,14 +208,14 @@ int signal_vala_encrypt(signal_buffer **output, const uint8_t *iv, size_t iv_len, const uint8_t *plaintext, size_t plaintext_len, void *user_data) { - int algo, mode; - if (aes_cipher(cipher, key_len, &algo, &mode)) return SG_ERR_UNKNOWN; + int algo, mode, error_code = SG_ERR_UNKNOWN; + if (aes_cipher(cipher, key_len, &algo, &mode)) return SG_ERR_INVAL; - if (iv_len != 16 && iv_len != 12) return SG_ERR_UNKNOWN; + if (iv_len != 16 && iv_len != 12) return SG_ERR_INVAL; gcry_cipher_hd_t ctx = {0}; - if (gcry_cipher_open(&ctx, algo, mode, 0)) return SG_ERR_UNKNOWN; + if (gcry_cipher_open(&ctx, algo, mode, 0)) return SG_ERR_NOMEM; signal_buffer* padded = 0; signal_buffer* out_buf = 0; @@ -228,7 +228,7 @@ error: if (out_buf != 0) { signal_buffer_free(out_buf); } - return SG_ERR_UNKNOWN; + return error_code; no_error: if (gcry_cipher_setkey(ctx, key, key_len)) goto error; @@ -254,6 +254,7 @@ no_error: size_t padded_len = plaintext_len + pad_len; padded = signal_buffer_alloc(padded_len); if (padded == 0) { + error_code = SG_ERR_NOMEM; goto error; } @@ -262,6 +263,7 @@ no_error: out_buf = signal_buffer_alloc(padded_len + tag_len); if (out_buf == 0) { + error_code = SG_ERR_NOMEM; goto error; } @@ -287,16 +289,16 @@ int signal_vala_decrypt(signal_buffer **output, const uint8_t *iv, size_t iv_len, const uint8_t *ciphertext, size_t ciphertext_len, void *user_data) { - int algo, mode; + int algo, mode, error_code = SG_ERR_UNKNOWN; *output = 0; - if (aes_cipher(cipher, key_len, &algo, &mode)) return SG_ERR_UNKNOWN; - if (ciphertext_len == 0) return SG_ERR_UNKNOWN; + if (aes_cipher(cipher, key_len, &algo, &mode)) return SG_ERR_INVAL; + if (ciphertext_len == 0) return SG_ERR_INVAL; - if (iv_len != 16 && iv_len != 12) return SG_ERR_UNKNOWN; + if (iv_len != 16 && iv_len != 12) return SG_ERR_INVAL; gcry_cipher_hd_t ctx = {0}; - if (gcry_cipher_open(&ctx, algo, mode, 0)) return SG_ERR_UNKNOWN; + if (gcry_cipher_open(&ctx, algo, mode, 0)) return SG_ERR_NOMEM; signal_buffer* out_buf = 0; goto no_error; @@ -305,7 +307,7 @@ error: if (out_buf != 0) { signal_buffer_bzero_free(out_buf); } - return SG_ERR_UNKNOWN; + return error_code; no_error: if (gcry_cipher_setkey(ctx, key, key_len)) goto error; @@ -331,6 +333,7 @@ no_error: size_t padded_len = ciphertext_len - tag_len; out_buf = signal_buffer_alloc(padded_len); if (out_buf == 0) { + error_code = SG_ERR_NOMEM; goto error; } |