diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-29 01:00:09 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-05-29 01:00:09 +0200 |
| commit | 875731368af013568bb24a6cda7a2836c723dc82 (patch) | |
| tree | 993d494f25151c1290ea9809e978a096b7431f9b /src/network/ssl/qsslsocket_openssl_symbols_p.h | |
| parent | 2843c58e5f0447e553d0f29614177b3b1d1884dc (diff) | |
| parent | 42e4a6531d89601499e5d3d419216a4bbacf6670 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I8d8b03ea46c537b091b72dc7b68aa6aa3a627ba6
Diffstat (limited to 'src/network/ssl/qsslsocket_openssl_symbols_p.h')
| -rw-r--r-- | src/network/ssl/qsslsocket_openssl_symbols_p.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/network/ssl/qsslsocket_openssl_symbols_p.h b/src/network/ssl/qsslsocket_openssl_symbols_p.h index 65823e3f3e..386ca746cf 100644 --- a/src/network/ssl/qsslsocket_openssl_symbols_p.h +++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h @@ -267,9 +267,13 @@ int q_EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type, const unsigned int q_EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc); int q_EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl, const unsigned char *in, int inl); int q_EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl); +#ifndef OPENSSL_NO_DES const EVP_CIPHER *q_EVP_des_cbc(); const EVP_CIPHER *q_EVP_des_ede3_cbc(); +#endif +#ifndef OPENSSL_NO_RC2 const EVP_CIPHER *q_EVP_rc2_cbc(); +#endif const EVP_MD *q_EVP_sha1(); int q_EVP_PKEY_assign(EVP_PKEY *a, int b, char *c); Q_AUTOTEST_EXPORT int q_EVP_PKEY_set1_RSA(EVP_PKEY *a, RSA *b); |