diff --git "a/cmake/modules/QcaMacro.cmake" "b/cmake/modules/QcaMacro.cmake" index 5d86e4725..62568626b 100644 --- "a/cmake/modules/QcaMacro.cmake" +++ "b/cmake/modules/QcaMacro.cmake" @@ -61,15 +61,6 @@ macro(add_qca_test TARGET DESCRIPTION) endmacro(add_qca_test) macro(install_pdb TARGET INSTALL_PATH) - if(MSVC) - get_target_property(LOCATION ${TARGET} LOCATION_DEBUG) - string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") - install(FILES ${LOCATION} DESTINATION ${INSTALL_PATH} CONFIGURATIONS Debug) - - get_target_property(LOCATION ${TARGET} LOCATION_RELWITHDEBINFO) - string(REGEX REPLACE "\\.[^.]*$" ".pdb" LOCATION "${LOCATION}") - install(FILES ${LOCATION} DESTINATION ${INSTALL_PATH} CONFIGURATIONS RelWithDebInfo) - endif() endmacro(install_pdb) macro(normalize_path PATH) diff --git "a/plugins/qca-ossl/qca-ossl.cpp" "b/plugins/qca-ossl/qca-ossl.cpp" index ee872d721..fa3e2c414 100644 --- "a/plugins/qca-ossl/qca-ossl.cpp" +++ "b/plugins/qca-ossl/qca-ossl.cpp" @@ -6910,6 +6910,7 @@ public: else if ( type == QLatin1String("aes256-ccm") ) return new opensslCipherContext( EVP_aes_256_ccm(), 0, this, type); #endif +#ifndef OPENSSL_NO_BF else if ( type == QLatin1String("blowfish-ecb") ) return new opensslCipherContext( EVP_bf_ecb(), 0, this, type); else if ( type == QLatin1String("blowfish-cfb") ) @@ -6920,6 +6921,8 @@ public: return new opensslCipherContext( EVP_bf_cbc(), 0, this, type); else if ( type == QLatin1String("blowfish-cbc-pkcs7") ) return new opensslCipherContext( EVP_bf_cbc(), 1, this, type); +#endif +#ifndef OPENSSL_NO_DES else if ( type == QLatin1String("tripledes-ecb") ) return new opensslCipherContext( EVP_des_ede3(), 0, this, type); else if ( type == QLatin1String("tripledes-cbc") ) @@ -6936,6 +6939,8 @@ public: return new opensslCipherContext( EVP_des_cfb(), 0, this, type); else if ( type == QLatin1String("des-ofb") ) return new opensslCipherContext( EVP_des_ofb(), 0, this, type); +#endif +#ifndef OPENSSL_NO_CAST else if ( type == QLatin1String("cast5-ecb") ) return new opensslCipherContext( EVP_cast5_ecb(), 0, this, type); else if ( type == QLatin1String("cast5-cbc") ) @@ -6946,6 +6951,7 @@ public: return new opensslCipherContext( EVP_cast5_cfb(), 0, this, type); else if ( type == QLatin1String("cast5-ofb") ) return new opensslCipherContext( EVP_cast5_ofb(), 0, this, type); +#endif else if ( type == QLatin1String("pkey") ) return new MyPKeyContext( this ); else if ( type == QLatin1String("dlgroup") )