Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-19 15:03:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

missed a couple warnings

Browse source
This commit is contained in:
David Kelly 2017-08-15 11:44:15 -07:00
parent a6390edf46
commit 0f7db74ef1
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/src/commerce/Wallet.cpp
View file

@ -115,7 +115,6 @@ QPair<QByteArray*, QByteArray*> generateRSAKeypair() {
return retval;
}
char pwd[] = "pwd";
if (!PEM_write_RSAPrivateKey(fp, keyPair, EVP_des_ede3_cbc(), NULL, 0, passwordCallback, NULL)) {
fclose(fp);
qCDebug(commerce) << "failed to write private key";
@ -144,7 +143,7 @@ QByteArray readPublicKey(const char* filename) {
if ((fp = fopen(filename, "r"))) {
// file opened successfully
qCDebug(commerce) << "opened key file" << filename;
if (key = PEM_read_RSAPublicKey(fp, NULL, NULL, NULL)) {
if ((key = PEM_read_RSAPublicKey(fp, NULL, NULL, NULL))) {
// file read successfully
unsigned char* publicKeyDER = NULL;
int publicKeyLength = i2d_RSAPublicKey(key, &publicKeyDER);
@ -177,12 +176,11 @@ RSA* readPrivateKey(const char* filename) {
if ((fp = fopen(filename, "r"))) {
// file opened successfully
qCDebug(commerce) << "opened key file" << filename;
if (key = PEM_read_RSAPrivateKey(fp, &key, passwordCallback, NULL)) {
if ((key = PEM_read_RSAPrivateKey(fp, &key, passwordCallback, NULL))) {
// cleanup
fclose(fp);
qCDebug(commerce) << "parsed private key file successfully";
return key;
} else {
qCDebug(commerce) << "couldn't parse" << filename;
@ -191,7 +189,7 @@ RSA* readPrivateKey(const char* filename) {
} else {
qCDebug(commerce) << "couldn't open" << filename;
}
return false;
return key;
}
bool Wallet::createIfNeeded() {