QuasarApp/Heart
4
1
Fork 0
mirror of https://github.com/QuasarApp/Heart.git synced 2025-05-10 16:39:41 +00:00
Code Issues Projects Releases Wiki Activity

drop support ssl 3.0 (still not ready for working)

Browse Source
This commit is contained in:
Andrei Yankovich 2022-05-31 00:32:39 +03:00
parent afbc4bfd51
commit c2e57633cf
2 changed files with 18 additions and 19 deletions
Heart
AbstractSpace
abstractnode.cpp
DataBaseSpace
sqldbwriter.cpp

32
Heart/AbstractSpace/abstractnode.cpp

@ -316,29 +316,29 @@ bool AbstractNode::generateRSAforSSL(EVP_PKEY *pkey) const {
return false;
}
#if OPENSSL_VERSION_MAJOR >= 3
//#if OPENSSL_VERSION_MAJOR >= 3
EVP_PKEY_CTX *pctx =
EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL);
// EVP_PKEY_CTX *pctx =
// EVP_PKEY_CTX_new_from_name(NULL, "RSA", NULL);
unsigned int primes = 3;
unsigned int bits = 4096;
OSSL_PARAM params[3];
// unsigned int primes = 3;
// unsigned int bits = 4096;
// OSSL_PARAM params[3];
pkey = EVP_RSA_gen(4096);
// pkey = EVP_RSA_gen(4096);
EVP_PKEY_keygen_init(pctx);
// EVP_PKEY_keygen_init(pctx);
params[0] = OSSL_PARAM_construct_uint("bits", &bits);
params[1] = OSSL_PARAM_construct_uint("primes", &primes);
params[2] = OSSL_PARAM_construct_end();
EVP_PKEY_CTX_set_params(pctx, params);
// params[0] = OSSL_PARAM_construct_uint("bits", &bits);
// params[1] = OSSL_PARAM_construct_uint("primes", &primes);
// params[2] = OSSL_PARAM_construct_end();
// EVP_PKEY_CTX_set_params(pctx, params);
EVP_PKEY_generate(pctx, &pkey);
EVP_PKEY_CTX_free(pctx);
// EVP_PKEY_generate(pctx, &pkey);
// EVP_PKEY_CTX_free(pctx);
#else
//#else
BIGNUM * bn = BN_new();
int rc = BN_set_word(bn, RSA_F4);
@ -357,7 +357,7 @@ bool AbstractNode::generateRSAforSSL(EVP_PKEY *pkey) const {
q_check_ptr(rsa);
if (EVP_PKEY_assign_RSA(pkey, rsa) <= 0)
return false;
#endif
//#endif
return true;
}

5
Heart/DataBaseSpace/sqldbwriter.cpp

@ -137,9 +137,8 @@ bool SqlDBWriter::doQueryPrivate(const QString &query, QSqlQuery* result) const
return false;
}
QSqlQuery q(query, *db());
if (!q.exec()) {
QSqlQuery q(*db());
if (!q.exec(query)) {
QuasarAppUtils::Params::log("request error : " + q.lastError().text(),
QuasarAppUtils::Error);
return false;