commit 00b073b1bc909d2d2a30a3c1ddd5abd5e670da80 Merge: b804d5bc4 d83c299eb Author: George Kadianakis <desnacked@riseup.net> Date: Thu Feb 14 18:01:07 2019 +0200 Merge branch 'maint-0.3.5' changes/ticket29026 | 4 ++++ src/lib/crypt_ops/aes_openssl.c | 2 +- src/lib/crypt_ops/crypto_hkdf.c | 1 + src/lib/crypt_ops/crypto_openssl_mgt.h | 2 +- src/lib/crypt_ops/crypto_rand.c | 1 + src/lib/crypt_ops/crypto_rsa.c | 4 ++++ src/lib/tls/x509_openssl.c | 3 +++ 7 files changed, 15 insertions(+), 2 deletions(-)