Merge branch 'master' into develop

2017-12-11 21:10:25 -05:00
parent 1bc2d58ae1 cf94610f46
commit 28ad6ed552
24 changed files with 254 additions and 264 deletions
--- a/src/crypto/SymmetricCipherGcrypt.cpp
+++ b/src/crypto/SymmetricCipherGcrypt.cpp
@@ -88,6 +88,8 @@ bool SymmetricCipherGcrypt::init()

    gcry_error_t error;

+    if(m_ctx != nullptr)
+        gcry_cipher_close(m_ctx);
    error = gcry_cipher_open(&m_ctx, m_algo, m_mode, 0);
    if (error != 0) {
        setErrorString(error);