diff options
| author | Karsten Heimrich <karsten.heimrich@qt.io> | 2019-02-07 16:33:11 +0100 |
|---|---|---|
| committer | Karsten Heimrich <karsten.heimrich@qt.io> | 2019-02-11 13:12:21 +0000 |
| commit | c26fe1ae9f9044845a925417bc9d7d27cb2ab61a (patch) | |
| tree | cc406a235949ea50267624b921edc5f5dcec2ce0 | |
| parent | a366e72e2e171591e3e1c13cc0bd6f6606b4bc4c (diff) | |
Remove now obsolete function, since Qt provides it already
Change-Id: Id670936b447f27585218068006f448e018fa82df
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Reviewed-by: Karsten Heimrich <karsten.heimrich@qt.io>
| -rw-r--r-- | src/knx/ssl/qsslsocket_openssl11_symbols_p.h | 2 | ||||
| -rw-r--r-- | src/knx/ssl/qsslsocket_openssl_symbols.cpp | 3 |
2 files changed, 0 insertions, 5 deletions
diff --git a/src/knx/ssl/qsslsocket_openssl11_symbols_p.h b/src/knx/ssl/qsslsocket_openssl11_symbols_p.h index d8b8b3b..0fe4ad3 100644 --- a/src/knx/ssl/qsslsocket_openssl11_symbols_p.h +++ b/src/knx/ssl/qsslsocket_openssl11_symbols_p.h @@ -151,7 +151,5 @@ int q_EVP_PKEY_get_raw_private_key(const EVP_PKEY *pkey, unsigned char *priv, si EVP_PKEY *q_EVP_PKEY_new_raw_private_key(int type, ENGINE *e, const unsigned char *priv, size_t len); const EVP_CIPHER *q_EVP_aes_128_cbc(void); -int q_PKCS5_PBKDF2_HMAC(const char *pass, int passlen, const unsigned char *salt, int saltlen, - int iter, const EVP_MD *digest, int keylen, unsigned char *out); #endif diff --git a/src/knx/ssl/qsslsocket_openssl_symbols.cpp b/src/knx/ssl/qsslsocket_openssl_symbols.cpp index 7502dee..23bcb9d 100644 --- a/src/knx/ssl/qsslsocket_openssl_symbols.cpp +++ b/src/knx/ssl/qsslsocket_openssl_symbols.cpp @@ -579,8 +579,6 @@ DEFINEFUNC(void, PKCS12_free, PKCS12 *pkcs12, pkcs12, return, DUMMYARG) DEFINEFUNC(const EVP_CIPHER *, EVP_aes_128_cbc, DUMMYARG, DUMMYARG, return nullptr, return) DEFINEFUNC2(int, EVP_CIPHER_CTX_set_padding, EVP_CIPHER_CTX *x, x, int padding, padding, return 0, return) - DEFINEFUNC8(int, PKCS5_PBKDF2_HMAC, const char *pass, pass, int passlen, passlen, const unsigned char *salt, salt, \ - int saltlen, saltlen, int iter, iter, const EVP_MD *digest, digest, int keylen, keylen, unsigned char *out, out, return 0, return) DEFINEFUNC(const EVP_MD *, EVP_sha256, DUMMYARG, DUMMYARG, return nullptr, return) #endif @@ -1304,7 +1302,6 @@ bool q_resolveOpenSslSymbols() RESOLVEFUNC(EVP_aes_128_cbc) RESOLVEFUNC(EVP_CIPHER_CTX_set_padding) - RESOLVEFUNC(PKCS5_PBKDF2_HMAC) RESOLVEFUNC(EVP_sha256) #endif |