haiwen/seafile-server
1
0
Fork 0
mirror of https://github.com/haiwen/seafile-server.git synced 2025-09-12 13:28:30 +00:00
Code Issues Releases Wiki Activity

Fix compilation with openssl 1.1.0.

Browse Source
This commit is contained in:
ly1217
2018-05-13 23:48:36 -07:00
parent c4a6722937
commit 1fe121082d
8 changed files with 87 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
common/block-tx-utils.h
View File

@@ -68,12 +68,12 @@ blocktx_generate_encrypt_key (unsigned char *session_key, int sk_len,
unsigned char *key, unsigned char *iv);
int
blocktx_encrypt_init (EVP_CIPHER_CTX *ctx,
blocktx_encrypt_init (EVP_CIPHER_CTX **ctx,
const unsigned char *key,
const unsigned char *iv);
int
blocktx_decrypt_init (EVP_CIPHER_CTX *ctx,
blocktx_decrypt_init (EVP_CIPHER_CTX **ctx,
const unsigned char *key,
const unsigned char *iv);
@@ -112,7 +112,7 @@ typedef struct _FrameParser {
unsigned char key[ENC_KEY_SIZE];
unsigned char iv[ENC_BLOCK_SIZE];
gboolean enc_init;
EVP_CIPHER_CTX ctx;
EVP_CIPHER_CTX *ctx;
unsigned char key_v2[ENC_KEY_SIZE];
unsigned char iv_v2[ENC_BLOCK_SIZE];