diff options
| author | jsorg71 <jay.sorg@gmail.com> | 2016-08-05 14:38:41 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 14:38:41 -0700 |
| commit | 8353baab3d361bcdebb32f1677dd066e0b255dc9 (patch) | |
| tree | 38bd74dc119bdc115d5876383d7a65ff3e19debd /common/ssl_calls.h | |
| parent | 81fe939dd346420d41eb2afcd6c8c05a422a9e7b (diff) | |
| parent | ace7d2c822937a9cb0637946f85d1fbd63562c44 (diff) | |
| download | xrdp-proprietary-8353baab3d361bcdebb32f1677dd066e0b255dc9.tar.gz xrdp-proprietary-8353baab3d361bcdebb32f1677dd066e0b255dc9.zip | |
Merge pull request #390 from proski/june21
Cleanups and C++ compatibility
Diffstat (limited to 'common/ssl_calls.h')
| -rw-r--r-- | common/ssl_calls.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/common/ssl_calls.h b/common/ssl_calls.h index 6cfe73a3..aa7cffb1 100644 --- a/common/ssl_calls.h +++ b/common/ssl_calls.h @@ -41,7 +41,7 @@ ssl_sha1_info_delete(void* sha1_info); void APP_CC ssl_sha1_clear(void* sha1_info); void APP_CC -ssl_sha1_transform(void* sha1_info, char* data, int len); +ssl_sha1_transform(void* sha1_info, const char *data, int len); void APP_CC ssl_sha1_complete(void* sha1_info, char* data); void* APP_CC @@ -84,8 +84,8 @@ ssl_gen_key_xrdp1(int key_size_in_bits, char* exp, int exp_len, /* ssl_tls */ struct ssl_tls { - void *ssl; /* SSL * */ - void *ctx; /* SSL_CTX * */ + struct ssl_st *ssl; /* SSL * */ + struct ssl_ctx_st *ctx; /* SSL_CTX * */ char *cert; char *key; struct trans *trans; |