From 0f7db74ef12d16debc448016b3ce31ad7cb6917f Mon Sep 17 00:00:00 2001 From: David Kelly Date: Tue, 15 Aug 2017 11:44:15 -0700 Subject: [PATCH] missed a couple warnings --- interface/src/commerce/Wallet.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/interface/src/commerce/Wallet.cpp b/interface/src/commerce/Wallet.cpp index 8a81faec49..7a980528ce 100644 --- a/interface/src/commerce/Wallet.cpp +++ b/interface/src/commerce/Wallet.cpp @@ -115,7 +115,6 @@ QPair 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() {